From 54d952d6bcb8ebd9945585e6434cf40a8ddcd8de Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Thu, 15 Aug 2013 03:15:31 -0700 Subject: [PATCH] Style balancing groups differently. --- guacamole/src/main/webapp/scripts/guac-ui.js | 8 ++++++-- guacamole/src/main/webapp/styles/ui.css | 9 +++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/guacamole/src/main/webapp/scripts/guac-ui.js b/guacamole/src/main/webapp/scripts/guac-ui.js index 51c4cd63a..74eb1e58e 100644 --- a/guacamole/src/main/webapp/scripts/guac-ui.js +++ b/guacamole/src/main/webapp/scripts/guac-ui.js @@ -832,7 +832,7 @@ GuacUI.Download = function(filename) { * A grouping component. Child elements can be added via the addElement() * function. By default, groups display as collapsed. */ -GuacUI.ListGroup = function(caption, icon) { +GuacUI.ListGroup = function(caption) { /** * Reference to this group. @@ -854,7 +854,7 @@ GuacUI.ListGroup = function(caption, icon) { // Create connection display elements var caption_element = GuacUI.createChildElement(element, "div", "caption"); var caption_icon = GuacUI.createChildElement(caption_element, "div", "icon group"); - if (icon) GuacUI.createChildElement(caption_element, "div", "icon " + icon); + GuacUI.createChildElement(caption_element, "div", "icon type"); GuacUI.createChildElement(caption_element, "span", "name").textContent = caption; /** @@ -1272,6 +1272,10 @@ GuacUI.GroupView = function(root_group, flags) { list_groups[group.id] = list_group; GuacUI.addClass(list_group.getElement(), "list-item"); + // Mark group as balancer if appropriate + if (group.type === GuacamoleService.ConnectionGroup.Type.BALANCING) + GuacUI.addClass(list_group.getElement(), "balancer"); + // Recursively add all children to the new element addGroupContents(group, list_group.addElement); diff --git a/guacamole/src/main/webapp/styles/ui.css b/guacamole/src/main/webapp/styles/ui.css index 1f87f3afe..430f8d4a9 100644 --- a/guacamole/src/main/webapp/styles/ui.css +++ b/guacamole/src/main/webapp/styles/ui.css @@ -429,6 +429,15 @@ div.section { border-left: 1px dotted rgba(0, 0, 0, 0.25); } +.group > .caption .icon.type { + display: none; +} + +.group.balancer > .caption .icon.type { + display: inline-block; + background-image: url('../images/protocol-icons/guac-monitor.png'); +} + .group > .caption .icon.group { opacity: 0.75; background-image: url('../images/group-icons/guac-closed.png');