You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by jm...@apache.org on 2016/08/05 04:01:33 UTC
[3/9] incubator-guacamole-client git commit: GUACAMOLE-5: Correct and
simply guacGroupList styling/structure.
GUACAMOLE-5: Correct and simply guacGroupList styling/structure.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/85f15b7c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/85f15b7c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/85f15b7c
Branch: refs/heads/master
Commit: 85f15b7cd1378ff4572e05567c1b09d87e1a0331
Parents: da9ddf7
Author: Michael Jumper <mj...@apache.org>
Authored: Thu Aug 4 17:50:33 2016 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Thu Aug 4 19:48:58 2016 -0700
----------------------------------------------------------------------
.../webapp/app/home/templates/connection.html | 24 +++++------
.../src/main/webapp/app/index/styles/lists.css | 15 ++-----
.../src/main/webapp/app/index/styles/ui.css | 42 ++++++++++++--------
.../templates/connectionGroupPermission.html | 6 +++
.../manage/templates/connectionPermission.html | 6 +--
.../app/settings/templates/connection.html | 24 +++++------
6 files changed, 58 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/85f15b7c/guacamole/src/main/webapp/app/home/templates/connection.html
----------------------------------------------------------------------
diff --git a/guacamole/src/main/webapp/app/home/templates/connection.html b/guacamole/src/main/webapp/app/home/templates/connection.html
index 01f58bb..8e8ccc2 100644
--- a/guacamole/src/main/webapp/app/home/templates/connection.html
+++ b/guacamole/src/main/webapp/app/home/templates/connection.html
@@ -1,19 +1,15 @@
-<a ng-href="#/client/{{context.getClientIdentifier(item)}}">
+<a ng-href="#/client/{{context.getClientIdentifier(item)}}"
+ ng-class="{active: item.getActiveConnections()}">
- <div class="caption" ng-class="{active: item.getActiveConnections()}">
+ <!-- Connection icon -->
+ <div class="icon type" ng-class="item.protocol"></div>
- <!-- Connection icon -->
- <div class="protocol">
- <div class="icon type" ng-class="item.protocol"></div>
- </div>
+ <!-- Connection name -->
+ <span class="name">{{item.name}}</span>
- <!-- Connection name -->
- <span class="name">{{item.name}}</span>
-
- <!-- Active user count -->
- <span class="activeUserCount" ng-show="item.getActiveConnections()"
- translate="HOME.INFO_ACTIVE_USER_COUNT"
- translate-values="{USERS: item.getActiveConnections()}"></span>
+ <!-- Active user count -->
+ <span class="activeUserCount" ng-show="item.getActiveConnections()"
+ translate="HOME.INFO_ACTIVE_USER_COUNT"
+ translate-values="{USERS: item.getActiveConnections()}"></span>
- </div>
</a>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/85f15b7c/guacamole/src/main/webapp/app/index/styles/lists.css
----------------------------------------------------------------------
diff --git a/guacamole/src/main/webapp/app/index/styles/lists.css b/guacamole/src/main/webapp/app/index/styles/lists.css
index 536169f..5ce162a 100644
--- a/guacamole/src/main/webapp/app/index/styles/lists.css
+++ b/guacamole/src/main/webapp/app/index/styles/lists.css
@@ -44,15 +44,16 @@
color: black;
}
-.connection:hover {
+.recent-connections .connection:hover {
background: #CDA;
}
-.connection .thumbnail {
+.recent-connections .connection .thumbnail {
+ display: block;
margin: 0.5em;
}
-.connection .thumbnail > * {
+.recent-connections .connection .thumbnail > * {
border: 1px solid black;
background: black;
box-shadow: 1px 1px 5px black;
@@ -60,14 +61,6 @@
display: inline-block;
}
-div.recent-connections .connection .thumbnail {
- display: block;
-}
-
-div.recent-connections .protocol {
- display: none;
-}
-
.caption * {
vertical-align: middle;
}
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/85f15b7c/guacamole/src/main/webapp/app/index/styles/ui.css
----------------------------------------------------------------------
diff --git a/guacamole/src/main/webapp/app/index/styles/ui.css b/guacamole/src/main/webapp/app/index/styles/ui.css
index d91becf..f324e3d 100644
--- a/guacamole/src/main/webapp/app/index/styles/ui.css
+++ b/guacamole/src/main/webapp/app/index/styles/ui.css
@@ -164,14 +164,11 @@ div.section {
background-image: url('images/action-icons/guac-monitor-add.png');
}
-.protocol {
+.connection .icon,
+.connection-group .icon {
display: inline-block;
-}
-
-.protocol .icon {
width: 24px;
height: 24px;
- background-image: url('images/protocol-icons/guac-plug.png');
background-size: 16px 16px;
-moz-background-size: 16px 16px;
-webkit-background-size: 16px 16px;
@@ -180,44 +177,57 @@ div.section {
background-position: center center;
}
-.protocol .icon.ssh,
-.protocol .icon.telnet {
+.group .icon {
+ background-image: url('images/folder-closed.png');
+}
+
+.group.expanded .icon {
+ background-image: url('images/folder-open.png');
+}
+
+.connection .icon {
+ background-image: url('images/protocol-icons/guac-plug.png');
+}
+
+.connection .icon.ssh,
+.connection .icon.telnet {
background-image: url('images/protocol-icons/guac-text.png');
}
-.protocol .icon.vnc,
-.protocol .icon.rdp {
+.connection .icon.vnc,
+.connection .icon.rdp {
background-image: url('images/protocol-icons/guac-monitor.png');
}
+
/*
* Groups
*/
-.group > .children {
+.expandable > .children {
margin-left: 13px;
- padding-left: 6px;
+ padding-left: 13px;
}
-.group .icon.group.type.empty.balancer {
+.group.empty.balancer .icon {
opacity: 1;
background-image: url('images/protocol-icons/guac-monitor.png');
}
-.group.expanded > .children {
+.expandable.expanded > .children {
display: block;
border-left: 1px dotted rgba(0, 0, 0, 0.25);
}
-.group > .caption .icon.group {
+.expandable > .caption .icon.expand {
opacity: 0.75;
background-image: url('images/group-icons/guac-closed.png');
}
-.group .icon.type.group.expanded {
+.expandable.expanded .icon.expand {
background-image: url('images/group-icons/guac-open.png');
}
-.group .icon.type.group.empty {
+.expandable.empty .icon.expand {
opacity: 0.25;
background-image: url('images/group-icons/guac-open.png');
}
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/85f15b7c/guacamole/src/main/webapp/app/manage/templates/connectionGroupPermission.html
----------------------------------------------------------------------
diff --git a/guacamole/src/main/webapp/app/manage/templates/connectionGroupPermission.html b/guacamole/src/main/webapp/app/manage/templates/connectionGroupPermission.html
index b43376b..6b27055 100644
--- a/guacamole/src/main/webapp/app/manage/templates/connectionGroupPermission.html
+++ b/guacamole/src/main/webapp/app/manage/templates/connectionGroupPermission.html
@@ -1,7 +1,13 @@
<div class="choice">
+ <!-- Connection group icon -->
+ <div class="icon type"></div>
+
+ <!-- Permission checkbox -->
<input type="checkbox" ng-model="context.getPermissionFlags().connectionGroupPermissions.READ[item.identifier]"
ng-change="context.connectionGroupPermissionChanged(item.identifier)"/>
+ <!-- Connection group name -->
<span class="name">{{item.name}}</span>
+
</div>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/85f15b7c/guacamole/src/main/webapp/app/manage/templates/connectionPermission.html
----------------------------------------------------------------------
diff --git a/guacamole/src/main/webapp/app/manage/templates/connectionPermission.html b/guacamole/src/main/webapp/app/manage/templates/connectionPermission.html
index 8ccaf44..8f1bb8b 100644
--- a/guacamole/src/main/webapp/app/manage/templates/connectionPermission.html
+++ b/guacamole/src/main/webapp/app/manage/templates/connectionPermission.html
@@ -1,11 +1,9 @@
<div class="choice">
<!-- Connection icon -->
- <div class="protocol">
- <div class="icon type" ng-class="item.protocol"></div>
- </div>
+ <div class="icon type" ng-class="item.protocol"></div>
- <!-- Checkbox -->
+ <!-- Permission checkbox -->
<input type="checkbox" ng-model="context.getPermissionFlags().connectionPermissions.READ[item.identifier]"
ng-change="context.connectionPermissionChanged(item.identifier)"/>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/85f15b7c/guacamole/src/main/webapp/app/settings/templates/connection.html
----------------------------------------------------------------------
diff --git a/guacamole/src/main/webapp/app/settings/templates/connection.html b/guacamole/src/main/webapp/app/settings/templates/connection.html
index 0a6001c..7db6835 100644
--- a/guacamole/src/main/webapp/app/settings/templates/connection.html
+++ b/guacamole/src/main/webapp/app/settings/templates/connection.html
@@ -1,19 +1,15 @@
-<a ng-href="#/manage/{{item.dataSource}}/connections/{{item.identifier}}">
+<a ng-href="#/manage/{{item.dataSource}}/connections/{{item.identifier}}"
+ ng-class="{active: item.getActiveConnections()}">
- <div class="caption" ng-class="{active: item.getActiveConnections()}">
+ <!-- Connection icon -->
+ <div class="icon type" ng-class="item.protocol"></div>
- <!-- Connection icon -->
- <div class="protocol">
- <div class="icon type" ng-class="item.protocol"></div>
- </div>
+ <!-- Connection name -->
+ <span class="name">{{item.name}}</span>
- <!-- Connection name -->
- <span class="name">{{item.name}}</span>
+ <!-- Active user count -->
+ <span class="activeUserCount" ng-show="item.getActiveConnections()"
+ translate="SETTINGS_CONNECTIONS.INFO_ACTIVE_USER_COUNT"
+ translate-values="{USERS: item.getActiveConnections()}"></span>
- <!-- Active user count -->
- <span class="activeUserCount" ng-show="item.getActiveConnections()"
- translate="SETTINGS_CONNECTIONS.INFO_ACTIVE_USER_COUNT"
- translate-values="{USERS: item.getActiveConnections()}"></span>
-
- </div>
</a>