projects / guacamole.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: c0c7ecc ed24d81)
Merge branch 'master' of ssh://guacamole.git.sourceforge.net/gitroot/guacamole/guacamole
authorMichael Jumper <zhangmaike@users.sourceforge.net>
Mon, 24 Jan 2011 22:16:10 +0000 (14:16 -0800)
committerMichael Jumper <zhangmaike@users.sourceforge.net>
Mon, 24 Jan 2011 22:16:10 +0000 (14:16 -0800)
1  2 
src/main/webapp/index.html patch | diff1 | diff2 | blob | history

diff --combined src/main/webapp/index.html
index 5b26ee3,47d0e9b..d4132f6
--- 1/src/main/webapp/index.html
--- 2/src/main/webapp/index.html
+++ b/src/main/webapp/index.html
@@@ -22,9 -22,8 +22,8 @@@
  
      <head>
          <link rel="icon" type="image/png" href="images/guacamole-icon-64.png"/>
-         <link rel="stylesheet" type="text/css" href="guacamole.css"/>
-         <link rel="stylesheet" type="text/css" href="guac-web-lib/css/guacamole.css"/>
-         <link rel="stylesheet" type="text/css" href="keyboard.css"/>
+         <link rel="stylesheet" type="text/css" href="styles/guacamole.css"/>
+         <link rel="stylesheet" type="text/css" href="styles/keyboard.css"/>
          <title>Guacamole</title>
      </head>
  
@@@ -112,12 -111,12 +111,12 @@@
  
  
          <!-- Scripts -->
-         <script type="text/javascript" src="guac-web-lib/javascript/keymap.js"></script>
-         <script type="text/javascript" src="guac-web-lib/javascript/keyboard.js"></script>
-         <script type="text/javascript" src="guac-web-lib/javascript/mouse.js"></script>
-         <script type="text/javascript" src="guac-web-lib/javascript/layer.js"></script>
-         <script type="text/javascript" src="guac-web-lib/javascript/guacamole.js"></script>
-         <script type="text/javascript" src="guac-web-lib/javascript/oskeyboard.js"></script>
+         <script type="text/javascript" src="guacamole-common-js/keymap.js"></script>
+         <script type="text/javascript" src="guacamole-common-js/keyboard.js"></script>
+         <script type="text/javascript" src="guacamole-common-js/mouse.js"></script>
+         <script type="text/javascript" src="guacamole-common-js/layer.js"></script>
+         <script type="text/javascript" src="guacamole-common-js/guacamole.js"></script>
+         <script type="text/javascript" src="guacamole-common-js/oskeyboard.js"></script>
  
          <!-- Init -->
          <script type="text/javascript"> /* <![CDATA[ */
@@@ -179,7 -178,7 +178,7 @@@
                  window.onresize();
  
                  // Instantiate client
-                 var guac = new GuacamoleClient(display);
+                 var guac = new GuacamoleClient(display, "tunnel");
  
                  var state = document.getElementById("state");
                  guac.setOnStateChangeHandler(function(clientState) {
@@@ -214,15 -213,15 +213,19 @@@
                  var guacErrorImage = new Image();
                  guacErrorImage.src = "images/noguacamole-logo.png";
  
 +                guac.setNameHandler(function(name) {
 +                    document.title = name;
 +                });
 +
                  guac.setErrorHandler(function(error) {
+ 
                      menu.className = "error";
+                     display.className += " guac-error";
+ 
                      logo.src = guacErrorImage.src;
                      errorDialogText.textContent = error;
                      errorDialog.style.visibility = "visible";
+ 
                  });
  
                  // Reconnect button
Alex Bligh guacamole tree