Merge branch 'unstable' of ssh://guacamole.git.sourceforge.net/gitroot/guacamole/guacamole into unstable
Michael Jumper
@@ -29,6 +29,16 @@
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-war-plugin</artifactId>
|
||||
<configuration>
|
||||
|
||||
<!-- Filter webapp dir -->
|
||||
<webResources>
|
||||
<resource>
|
||||
<directory>src/main/webapp</directory>
|
||||
<filtering>true</filtering>
|
||||
</resource>
|
||||
</webResources>
|
||||
|
||||
<!-- Add guacamole-common-js -->
|
||||
<overlays>
|
||||
<overlay>
|
||||
<groupId>net.sourceforge.guacamole</groupId>
|
||||
@@ -36,6 +46,7 @@
|
||||
<type>zip</type>
|
||||
</overlay>
|
||||
</overlays>
|
||||
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
|
||||
|
Before Width: | Height: | Size: 208 B |
|
Before Width: | Height: | Size: 6.4 KiB |
|
Before Width: | Height: | Size: 6.4 KiB |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
BIN
guacamole/src/main/webapp/images/guacamole-logo-64.png
Normal file
|
After Width: | Height: | Size: 5.0 KiB |
|
Before Width: | Height: | Size: 26 KiB |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 23 KiB |
@@ -21,7 +21,7 @@
|
||||
<html>
|
||||
|
||||
<head>
|
||||
<link rel="icon" type="image/png" href="images/guacamole-icon-64.png"/>
|
||||
<link rel="icon" type="image/png" href="images/guacamole-logo-64.png"/>
|
||||
<link rel="stylesheet" type="text/css" href="styles/guacamole.css"/>
|
||||
<link rel="stylesheet" type="text/css" href="styles/keyboard.css"/>
|
||||
<title>Guacamole</title>
|
||||
@@ -32,18 +32,14 @@
|
||||
<div id="login-ui">
|
||||
<div id="login-dialog-middle">
|
||||
|
||||
<div id="login-logo">
|
||||
<img src="images/login-logo.png" alt="\_GUAC_/"/>
|
||||
</div>
|
||||
|
||||
<div id="login-dialog">
|
||||
|
||||
<h1>Guacamole Login</h1>
|
||||
|
||||
<p id="login-error"></p>
|
||||
|
||||
<form id="login-form" action="#" method="post">
|
||||
<table id="login-fields">
|
||||
|
||||
<div id="login-fields">
|
||||
<table>
|
||||
<tr>
|
||||
<th>Username</th>
|
||||
<td><input type="text" name="username" id="username"/></td>
|
||||
@@ -54,12 +50,20 @@
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<img class="logo" src="images/guacamole-logo-64.png" alt=""/>
|
||||
</div>
|
||||
|
||||
<div id="buttons">
|
||||
<input type="submit" name="login" id="login" value="Login"/>
|
||||
</div>
|
||||
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<div id="version-dialog">
|
||||
Guacamole ${project.version}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -83,7 +87,7 @@
|
||||
<button id="ctrlAltDelete">Ctrl-Alt-Delete</button>
|
||||
|
||||
<!-- Logo and status -->
|
||||
<img id="logo" src="images/guacamole-logo.png" alt="Guacamole" title="Guacamole 0.4.0"/>
|
||||
<img id="status-logo" class="logo" src="images/guacamole-logo-24.png" alt="Guacamole" title="Guacamole ${project.version}"/>
|
||||
<span id="state"></span>
|
||||
|
||||
<a href="agpl-3.0-standalone.html"><img id="license" src="images/agpl-logo.png" alt="AGPLv3"/></a>
|
||||
@@ -172,7 +176,7 @@
|
||||
document.getElementById("main-guacamole-ui").style.display = "block";
|
||||
|
||||
var menu = document.getElementById("menu");
|
||||
var logo = document.getElementById("logo");
|
||||
var logo = document.getElementById("status-logo");
|
||||
|
||||
var errorDialog = document.getElementById("errorDialog");
|
||||
var errorDialogText = document.getElementById("errorText");
|
||||
@@ -215,7 +219,7 @@
|
||||
|
||||
// Cache error image (might not be available when error occurs)
|
||||
var guacErrorImage = new Image();
|
||||
guacErrorImage.src = "images/noguacamole-logo.png";
|
||||
guacErrorImage.src = "images/noguacamole-logo-24.png";
|
||||
|
||||
guac.setNameHandler(function(name) {
|
||||
document.title = name;
|
||||
|
||||
@@ -25,7 +25,7 @@ body {
|
||||
}
|
||||
|
||||
div#login-ui {
|
||||
background: silver;
|
||||
background: #BCA;
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
position: fixed;
|
||||
@@ -57,17 +57,6 @@ div#login-dialog-middle {
|
||||
|
||||
div#login-dialog {
|
||||
|
||||
background: white;
|
||||
vertical-align: middle;
|
||||
|
||||
padding: 1em;
|
||||
border: 0.2em solid black;
|
||||
|
||||
-khtml-border-radius: 0.5em;
|
||||
-webkit-border-radius: 0.5em;
|
||||
-moz-border-radius: 0.5em;
|
||||
border-radius: 0.5em;
|
||||
|
||||
max-width: 75%;
|
||||
text-align: left;
|
||||
|
||||
@@ -82,14 +71,59 @@ div#login-dialog h1 {
|
||||
|
||||
div#login-dialog #buttons {
|
||||
padding-top: 0.5em;
|
||||
text-align: center;
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
div#login-dialog #buttons input {
|
||||
background: #9A8;
|
||||
border: 1px solid #676;
|
||||
color: black;
|
||||
padding: 0.25em;
|
||||
padding-right: 1em;
|
||||
padding-left: 1em;
|
||||
}
|
||||
|
||||
div#login-dialog #buttons input:hover {
|
||||
background: #CDB;
|
||||
border: 1px solid #9A8;
|
||||
}
|
||||
|
||||
div#login-dialog #buttons input:active {
|
||||
padding-top: 0.35em;
|
||||
padding-left: 1.1em;
|
||||
|
||||
padding-bottom: 0.15em;
|
||||
padding-right: 0.9em;
|
||||
}
|
||||
|
||||
div#login-dialog #login-fields {
|
||||
border-top: 1px solid silver;
|
||||
border-bottom: 1px solid silver;
|
||||
padding-top: 0.5em;
|
||||
padding-bottom: 0.5em;
|
||||
|
||||
background: #CDB;
|
||||
vertical-align: middle;
|
||||
|
||||
padding: 1em;
|
||||
border: 1px solid #676;
|
||||
|
||||
}
|
||||
|
||||
div#login-dialog #login-fields input {
|
||||
border: 1px solid #676;
|
||||
}
|
||||
|
||||
div#login-dialog #login-fields img.logo {
|
||||
float: left;
|
||||
}
|
||||
|
||||
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 {
|
||||
@@ -185,7 +219,6 @@ img {
|
||||
}
|
||||
|
||||
img#license {
|
||||
border: none;
|
||||
float: right;
|
||||
margin: 2px;
|
||||
}
|
||||
@@ -236,14 +269,14 @@ div#clipboardDiv textarea {
|
||||
|
||||
.guac-display.guac-loading {
|
||||
border: 1px dotted gray;
|
||||
background-image: url('../images/spinner92.gif');
|
||||
background-image: url('../images/spinner.gif');
|
||||
background-position: center;
|
||||
background-repeat: no-repeat;
|
||||
}
|
||||
|
||||
.guac-display.guac-error {
|
||||
border: 1px dotted red;
|
||||
background-image: url('../images/noimage92.png');
|
||||
background-image: url('../images/noimage.png');
|
||||
background-position: center;
|
||||
background-repeat: no-repeat;
|
||||
}
|
||||
|
||||