projects / guacamole.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f7ef63f)
UI cleanup, removing unused images.
authorMichael Jumper <zhangmaike@users.sourceforge.net>
Thu, 30 Jun 2011 17:00:34 +0000 (10:00 -0700)
committerMichael Jumper <zhangmaike@users.sourceforge.net>
Thu, 30 Jun 2011 17:00:34 +0000 (10:00 -0700)
15 files changed:
src/main/webapp/images/checker.png [deleted file] patch | blob | history
src/main/webapp/images/guacamole-64-icon.png [deleted file] patch | blob | history
src/main/webapp/images/guacamole-icon-64.png [deleted file] patch | blob | history
src/main/webapp/images/guacamole-logo-24.png [new file with mode: 0644] patch | blob
src/main/webapp/images/guacamole-logo-64.png [new file with mode: 0644] patch | blob
src/main/webapp/images/guacamole-logo.png [deleted file] patch | blob | history
src/main/webapp/images/login-logo.png [deleted file] patch | blob | history
src/main/webapp/images/noguacamole-logo-24.png [new file with mode: 0644] patch | blob
src/main/webapp/images/noguacamole-logo.png [deleted file] patch | blob | history
src/main/webapp/images/noimage.png [new file with mode: 0644] patch | blob
src/main/webapp/images/noimage92.png [deleted file] patch | blob | history
src/main/webapp/images/spinner.gif [new file with mode: 0644] patch | blob
src/main/webapp/images/spinner92.gif [deleted file] patch | blob | history
src/main/webapp/index.html patch | blob | history
src/main/webapp/styles/guacamole.css patch | blob | history

diff --git a/src/main/webapp/images/checker.png b/src/main/webapp/images/checker.png
deleted file mode 100644 (file)
index 06f8903..0000000
Binary files a/src/main/webapp/images/checker.png and /dev/null differ
diff --git a/src/main/webapp/images/guacamole-64-icon.png b/src/main/webapp/images/guacamole-64-icon.png
deleted file mode 100644 (file)
index 02897db..0000000
Binary files a/src/main/webapp/images/guacamole-64-icon.png and /dev/null differ
diff --git a/src/main/webapp/images/guacamole-icon-64.png b/src/main/webapp/images/guacamole-icon-64.png
deleted file mode 100644 (file)
index 02897db..0000000
Binary files a/src/main/webapp/images/guacamole-icon-64.png and /dev/null differ
diff --git a/src/main/webapp/images/guacamole-logo-24.png b/src/main/webapp/images/guacamole-logo-24.png
new file mode 100644 (file)
index 0000000..3652598
Binary files /dev/null and b/src/main/webapp/images/guacamole-logo-24.png differ
diff --git a/src/main/webapp/images/guacamole-logo-64.png b/src/main/webapp/images/guacamole-logo-64.png
new file mode 100644 (file)
index 0000000..99aaf3e
Binary files /dev/null and b/src/main/webapp/images/guacamole-logo-64.png differ
diff --git a/src/main/webapp/images/guacamole-logo.png b/src/main/webapp/images/guacamole-logo.png
deleted file mode 100644 (file)
index 3652598..0000000
Binary files a/src/main/webapp/images/guacamole-logo.png and /dev/null differ
diff --git a/src/main/webapp/images/login-logo.png b/src/main/webapp/images/login-logo.png
deleted file mode 100644 (file)
index d20a2e7..0000000
Binary files a/src/main/webapp/images/login-logo.png and /dev/null differ
diff --git a/src/main/webapp/images/noguacamole-logo-24.png b/src/main/webapp/images/noguacamole-logo-24.png
new file mode 100644 (file)
index 0000000..2245bfd
Binary files /dev/null and b/src/main/webapp/images/noguacamole-logo-24.png differ
diff --git a/src/main/webapp/images/noguacamole-logo.png b/src/main/webapp/images/noguacamole-logo.png
deleted file mode 100644 (file)
index 2245bfd..0000000
Binary files a/src/main/webapp/images/noguacamole-logo.png and /dev/null differ
diff --git a/src/main/webapp/images/noimage.png b/src/main/webapp/images/noimage.png
new file mode 100644 (file)
index 0000000..657d85e
Binary files /dev/null and b/src/main/webapp/images/noimage.png differ
diff --git a/src/main/webapp/images/noimage92.png b/src/main/webapp/images/noimage92.png
deleted file mode 100644 (file)
index 657d85e..0000000
Binary files a/src/main/webapp/images/noimage92.png and /dev/null differ
diff --git a/src/main/webapp/images/spinner.gif b/src/main/webapp/images/spinner.gif
new file mode 100644 (file)
index 0000000..0dfe069
Binary files /dev/null and b/src/main/webapp/images/spinner.gif differ
diff --git a/src/main/webapp/images/spinner92.gif b/src/main/webapp/images/spinner92.gif
deleted file mode 100644 (file)
index 0dfe069..0000000
Binary files a/src/main/webapp/images/spinner92.gif and /dev/null differ
diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
index 6bd09bd..8ceeabe 100644 (file)
--- a/src/main/webapp/index.html
+++ b/src/main/webapp/index.html
@@ -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,27 +32,26 @@
         <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">
-                            <tr>
-                                <th>Username</th>
-                                <td><input type="text" name="username" id="username"/></td>
-                            </tr>
-                            <tr>
-                                <th>Password</th>
-                                <td><input type="password" name="password" id="password"/></td>
-                            </tr>
-                        </table>
+
+                        <div id="login-fields">
+                            <table>
+                                <tr>
+                                    <th>Username</th>
+                                    <td><input type="text" name="username" id="username"/></td>
+                                </tr>
+                                <tr>
+                                    <th>Password</th>
+                                    <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">
                             <input type="submit" name="login" id="login" value="Login"/>
@@ -61,7 +60,9 @@
                     </form>
                 </div>
 
-                <div id="version-dialog">Guacamole ${project.version}</div>
+                <div id="version-dialog">
+                    Guacamole ${project.version}
+                </div>
 
             </div>
         </div>
@@ -86,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 ${project.version}"/>
+                <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>
@@ -176,7 +177,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");
@@ -219,7 +220,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;
diff --git a/src/main/webapp/styles/guacamole.css b/src/main/webapp/styles/guacamole.css
index 9f9c612..ba73194 100644 (file)
--- a/src/main/webapp/styles/guacamole.css
+++ b/src/main/webapp/styles/guacamole.css
@@ -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,47 @@ 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 {
@@ -97,6 +119,7 @@ div#login-ui #version-dialog {
     right: 0;
     bottom: 0;
     text-align: right;
+
     font-style: italic;
     font-size: 0.75em;
     color: black;
@@ -246,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;
 }
Alex Bligh guacamole tree