safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-10-31 00:53:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Restore error message styling.

Browse Source
This commit is contained in:
Michael Jumper
2012-11-22 15:58:20 -08:00
parent 59c276e887
commit 3efd88db9a
2 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
guacamole/src/main/webapp/scripts/client-ui.js
View File

@@ -448,7 +448,7 @@ GuacUI.StateManager.setState(GuacUI.Client.states.INTERACTIVE);
* @constructor * @constructor
* @augments GuacUI.Component * @augments GuacUI.Component
*/ */
GuacUI.Client.ModalStatus = function(text) { GuacUI.Client.ModalStatus = function(text, classname) {
// Create element hierarchy // Create element hierarchy
var outer = GuacUI.createElement("div", "dialogOuter"); var outer = GuacUI.createElement("div", "dialogOuter");
@@ -456,6 +456,10 @@ GuacUI.Client.ModalStatus = function(text) {
var dialog = GuacUI.createChildElement(middle, "div", "dialog"); var dialog = GuacUI.createChildElement(middle, "div", "dialog");
var status = GuacUI.createChildElement(dialog, "p", "status"); var status = GuacUI.createChildElement(dialog, "p", "status");
// Set classname if given
if (classname)
GuacUI.addClass(outer, classname);
// Set status text // Set status text
status.textContent = text; status.textContent = text;
@@ -573,7 +577,8 @@ GuacUI.Client.showStatus = function(status) {
GuacUI.Client.showError = function(status) { GuacUI.Client.showError = function(status) {
GuacUI.Client.hideStatus(); 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(); GuacUI.Client.visibleStatus.show();
} }
@@ -703,7 +708,7 @@ GuacUI.Client.attach = function(guac) {
// Mouse // Mouse
var mouse = new Guacamole.Mouse(guac_display); 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 = touch.onmousedown = touch.onmouseup = touch.onmousemove =
mouse.onmousedown = mouse.onmouseup = mouse.onmousemove = mouse.onmousedown = mouse.onmouseup = mouse.onmousemove =
function(mouseState) { function(mouseState) {

19
guacamole/src/main/webapp/styles/client.css
View File

@@ -72,7 +72,6 @@ div.dialog {
text-align: left; text-align: left;
display: inline-block; display: inline-block;
visibility: visible;
} }
div.dialog h1 { div.dialog h1 {
@@ -131,17 +130,6 @@ div.dialog p {
margin: 0; 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 { div.displayOuter {
height: 100%; height: 100%;
width: 100%; width: 100%;
@@ -191,7 +179,7 @@ div.magnifier {
} }
.pan-overlay { .pan-overlay {
position: absolute; position: fixed;
left: 0; left: 0;
top: 0; top: 0;
width: 100%; width: 100%;
@@ -270,3 +258,8 @@ div#viewportClone {
color: white; 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;
}