Merge branch 'unstable' of ssh://guacamole.git.sourceforge.net/gitroot/guacamole...

[guacamole.git] / src / main / webapp / index.html
diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html

index 490564a..9cab99f 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,34 +32,38 @@
          <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"/>
                          </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;