UI cleanup, removing unused images.

This commit is contained in:
Michael Jumper
2011-06-30 10:00:34 -07:00
parent b1e0148c1e
commit 238850a8f3
11 changed files with 64 additions and 40 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 208 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.4 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

View File

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

View File

@@ -21,7 +21,7 @@
<html> <html>
<head> <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/guacamole.css"/>
<link rel="stylesheet" type="text/css" href="styles/keyboard.css"/> <link rel="stylesheet" type="text/css" href="styles/keyboard.css"/>
<title>Guacamole</title> <title>Guacamole</title>
@@ -32,27 +32,26 @@
<div id="login-ui"> <div id="login-ui">
<div id="login-dialog-middle"> <div id="login-dialog-middle">
<div id="login-logo">
<img src="images/login-logo.png" alt="\_GUAC_/"/>
</div>
<div id="login-dialog"> <div id="login-dialog">
<h1>Guacamole Login</h1>
<p id="login-error"></p> <p id="login-error"></p>
<form id="login-form" action="#" method="post"> <form id="login-form" action="#" method="post">
<table id="login-fields">
<tr> <div id="login-fields">
<th>Username</th> <table>
<td><input type="text" name="username" id="username"/></td> <tr>
</tr> <th>Username</th>
<tr> <td><input type="text" name="username" id="username"/></td>
<th>Password</th> </tr>
<td><input type="password" name="password" id="password"/></td> <tr>
</tr> <th>Password</th>
</table> <td><input type="password" name="password" id="password"/></td>
</tr>
</table>
<img class="logo" src="images/guacamole-logo-64.png" alt=""/>
</div>
<div id="buttons"> <div id="buttons">
<input type="submit" name="login" id="login" value="Login"/> <input type="submit" name="login" id="login" value="Login"/>
@@ -61,7 +60,9 @@
</form> </form>
</div> </div>
<div id="version-dialog">Guacamole ${project.version}</div> <div id="version-dialog">
Guacamole ${project.version}
</div>
</div> </div>
</div> </div>
@@ -86,7 +87,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 ${project.version}"/> <img id="status-logo" class="logo" src="images/guacamole-logo-24.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>
@@ -176,7 +177,7 @@
document.getElementById("main-guacamole-ui").style.display = "block"; document.getElementById("main-guacamole-ui").style.display = "block";
var menu = document.getElementById("menu"); var menu = document.getElementById("menu");
var logo = document.getElementById("logo"); var logo = document.getElementById("status-logo");
var errorDialog = document.getElementById("errorDialog"); var errorDialog = document.getElementById("errorDialog");
var errorDialogText = document.getElementById("errorText"); var errorDialogText = document.getElementById("errorText");
@@ -219,7 +220,7 @@
// Cache error image (might not be available when error occurs) // Cache error image (might not be available when error occurs)
var guacErrorImage = new Image(); var guacErrorImage = new Image();
guacErrorImage.src = "images/noguacamole-logo.png"; guacErrorImage.src = "images/noguacamole-logo-24.png";
guac.setNameHandler(function(name) { guac.setNameHandler(function(name) {
document.title = name; document.title = name;

View File

@@ -25,7 +25,7 @@ body {
} }
div#login-ui { div#login-ui {
background: silver; background: #BCA;
height: 100%; height: 100%;
width: 100%; width: 100%;
position: fixed; position: fixed;
@@ -57,17 +57,6 @@ div#login-dialog-middle {
div#login-dialog { 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%; max-width: 75%;
text-align: left; text-align: left;
@@ -82,14 +71,47 @@ div#login-dialog h1 {
div#login-dialog #buttons { div#login-dialog #buttons {
padding-top: 0.5em; 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 { div#login-dialog #login-fields {
border-top: 1px solid silver;
border-bottom: 1px solid silver; background: #CDB;
padding-top: 0.5em; vertical-align: middle;
padding-bottom: 0.5em;
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 { div#login-ui #version-dialog {
@@ -97,6 +119,7 @@ div#login-ui #version-dialog {
right: 0; right: 0;
bottom: 0; bottom: 0;
text-align: right; text-align: right;
font-style: italic; font-style: italic;
font-size: 0.75em; font-size: 0.75em;
color: black; color: black;
@@ -246,14 +269,14 @@ div#clipboardDiv textarea {
.guac-display.guac-loading { .guac-display.guac-loading {
border: 1px dotted gray; border: 1px dotted gray;
background-image: url('../images/spinner92.gif'); background-image: url('../images/spinner.gif');
background-position: center; background-position: center;
background-repeat: no-repeat; background-repeat: no-repeat;
} }
.guac-display.guac-error { .guac-display.guac-error {
border: 1px dotted red; border: 1px dotted red;
background-image: url('../images/noimage92.png'); background-image: url('../images/noimage.png');
background-position: center; background-position: center;
background-repeat: no-repeat; background-repeat: no-repeat;
} }