safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Filter webapp/* so we don't have to hard-code the version number. Display version number in login UI.

Browse Source
This commit is contained in:
Michael Jumper
2011-06-29 16:43:23 -07:00
parent 31fcba137b
commit b1e0148c1e
3 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
guacamole/pom.xml
View File

@@ -29,6 +29,16 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<configuration> <configuration>
<!-- Filter webapp dir -->
<webResources>
<resource>
<directory>src/main/webapp</directory>
<filtering>true</filtering>
</resource>
</webResources>
<!-- Add guacamole-common-js -->
<overlays> <overlays>
<overlay> <overlay>
<groupId>net.sourceforge.guacamole</groupId> <groupId>net.sourceforge.guacamole</groupId>
@@ -36,6 +46,7 @@
<type>zip</type> <type>zip</type>
</overlay> </overlay>
</overlays> </overlays>
</configuration> </configuration>
</plugin> </plugin>

5
guacamole/src/main/webapp/index.html
View File

@@ -57,9 +57,12 @@
<div id="buttons"> <div id="buttons">
<input type="submit" name="login" id="login" value="Login"/> <input type="submit" name="login" id="login" value="Login"/>
</div> </div>
</form> </form>
</div> </div>
<div id="version-dialog">Guacamole ${project.version}</div>
</div> </div>
</div> </div>
@@ -83,7 +86,7 @@
<button id="CtrlAltDelete">Ctrl-Alt-Delete</button> <button id="CtrlAltDelete">Ctrl-Alt-Delete</button>
<!-- Logo and status --> <!-- Logo and status -->
<img id="logo" src="images/guacamole-logo.png" alt="Guacamole" title="Guacamole 0.4.0"/> <img id="logo" src="images/guacamole-logo.png" alt="Guacamole" title="Guacamole ${project.version}"/>
<span id="state"></span> <span id="state"></span>
<a href="agpl-3.0-standalone.html"><img id="license" src="images/agpl-logo.png" alt="AGPLv3"/></a> <a href="agpl-3.0-standalone.html"><img id="license" src="images/agpl-logo.png" alt="AGPLv3"/></a>

12
guacamole/src/main/webapp/styles/guacamole.css
View File

@@ -92,6 +92,17 @@ div#login-dialog #login-fields {
padding-bottom: 0.5em; padding-bottom: 0.5em;
} }
div#login-ui #version-dialog {
position: fixed;
right: 0;
bottom: 0;
text-align: right;
font-style: italic;
font-size: 0.75em;
color: black;
padding: 0.25em;
}
div.errorDialogOuter { div.errorDialogOuter {
display: table; display: table;
height: 100%; height: 100%;
@@ -185,7 +196,6 @@ img {
} }
img#license { img#license {
border: none;
float: right; float: right;
margin: 2px; margin: 2px;
} }