From 3efd88db9a4aff42e25c9b6821a1a59b02d2849d Mon Sep 17 00:00:00 2001
From: Michael Jumper <zhangmaike@users.sourceforge.net>
Date: Thu, 22 Nov 2012 15:58:20 -0800
Subject: [PATCH] Restore error message styling.

---
 .../src/main/webapp/scripts/client-ui.js      | 11 ++++++++---
 guacamole/src/main/webapp/styles/client.css   | 19 ++++++-------------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/guacamole/src/main/webapp/scripts/client-ui.js b/guacamole/src/main/webapp/scripts/client-ui.js
index d72485041..3e1af977a 100644
--- a/guacamole/src/main/webapp/scripts/client-ui.js
+++ b/guacamole/src/main/webapp/scripts/client-ui.js
@@ -448,7 +448,7 @@ GuacUI.StateManager.setState(GuacUI.Client.states.INTERACTIVE);
  * @constructor
  * @augments GuacUI.Component
  */
-GuacUI.Client.ModalStatus = function(text) {
+GuacUI.Client.ModalStatus = function(text, classname) {
 
     // Create element hierarchy
     var outer  = GuacUI.createElement("div", "dialogOuter");
@@ -456,6 +456,10 @@ GuacUI.Client.ModalStatus = function(text) {
     var dialog = GuacUI.createChildElement(middle, "div", "dialog");
     var status = GuacUI.createChildElement(dialog, "p", "status");
 
+    // Set classname if given
+    if (classname)
+        GuacUI.addClass(outer, classname);
+
     // Set status text
     status.textContent = text;
 
@@ -573,7 +577,8 @@ GuacUI.Client.showStatus = function(status) {
 GuacUI.Client.showError = function(status) {
     GuacUI.Client.hideStatus();
 
-    GuacUI.Client.visibleStatus = new GuacUI.Client.ModalStatus(status);
+    GuacUI.Client.visibleStatus =
+        new GuacUI.Client.ModalStatus(status, "guac-error");
     GuacUI.Client.visibleStatus.show();
 }
 
@@ -703,7 +708,7 @@ GuacUI.Client.attach = function(guac) {
 
     // Mouse
     var mouse = new Guacamole.Mouse(guac_display);
-    var touch = new Guacamole.Mouse.Touchpad(document);
+    var touch = new Guacamole.Mouse.Touchpad(guac_display);
     touch.onmousedown = touch.onmouseup = touch.onmousemove =
     mouse.onmousedown = mouse.onmouseup = mouse.onmousemove =
         function(mouseState) {
diff --git a/guacamole/src/main/webapp/styles/client.css b/guacamole/src/main/webapp/styles/client.css
index bf5d0d837..c339382a3 100644
--- a/guacamole/src/main/webapp/styles/client.css
+++ b/guacamole/src/main/webapp/styles/client.css
@@ -72,7 +72,6 @@ div.dialog {
     text-align: left;
 
     display: inline-block;
-    visibility: visible;
 }
 
 div.dialog h1 {
@@ -131,17 +130,6 @@ div.dialog p {
     margin: 0;
 }
 
-#statusText {
-    text-shadow: 0 0 0.25em black, 0 0 0.25em black, 0 0 0.25em black, 0 0 0.25em black;
-    font-size: xx-large;
-    color: white;
-}
-
-.guac-error #statusText {
-    text-shadow: 0 0 0.25em black, 0 0 0.25em black, 0 0 0.25em black, 0 0 0.25em black;
-    color: #D44;
-}
-
 div.displayOuter {
     height: 100%;
     width: 100%;
@@ -191,7 +179,7 @@ div.magnifier {
 }
 
 .pan-overlay {
-    position: absolute;
+    position: fixed;
     left: 0;
     top: 0;
     width: 100%;
@@ -270,3 +258,8 @@ div#viewportClone {
     color: white;
 }
 
+.guac-error .status {
+    text-shadow: 0 0 0.25em black, 0 0 0.25em black, 0 0 0.25em black, 0 0 0.25em black;
+    color: #D44;
+}
+