guacamole-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmuehl...@apache.org
Subject [2/7] incubator-guacamole-client git commit: GUACAMOLE-5: Add share icon.
Date Tue, 02 Aug 2016 22:56:54 GMT
GUACAMOLE-5: Add share icon.

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/e1cf5821
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/e1cf5821
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/e1cf5821

Branch: refs/heads/master
Commit: e1cf5821fc526113e13f09ee6dd62a5d179e2553
Parents: 91254f7
Author: Michael Jumper <mjumper@apache.org>
Authored: Tue Aug 2 11:50:32 2016 -0700
Committer: Michael Jumper <mjumper@apache.org>
Committed: Tue Aug 2 13:25:15 2016 -0700

----------------------------------------------------------------------
 .../webapp/app/client/styles/share-menu.css     |  58 +++++++++++++++++++
 .../webapp/app/client/templates/client.html     |  12 ++--
 guacamole/src/main/webapp/images/share.png      | Bin 0 -> 1112 bytes
 3 files changed, 65 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/e1cf5821/guacamole/src/main/webapp/app/client/styles/share-menu.css
----------------------------------------------------------------------
diff --git a/guacamole/src/main/webapp/app/client/styles/share-menu.css b/guacamole/src/main/webapp/app/client/styles/share-menu.css
new file mode 100644
index 0000000..6d6659b
--- /dev/null
+++ b/guacamole/src/main/webapp/app/client/styles/share-menu.css
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+.share-menu {
+
+    /* IE10 */
+    display: -ms-flexbox;
+    -ms-flex-align: stretch;
+    -ms-flex-direction: row;
+
+    /* Ancient Mozilla */
+    display: -moz-box;
+    -moz-box-align: stretch;
+    -moz-box-orient: horizontal;
+
+    /* Ancient WebKit */
+    display: -webkit-box;
+    -webkit-box-align: stretch;
+    -webkit-box-orient: horizontal;
+
+    /* Old WebKit */
+    display: -webkit-flex;
+    -webkit-align-items: stretch;
+    -webkit-flex-direction: row;
+
+    /* W3C */
+    display: flex;
+    align-items: stretch;
+    flex-direction: row;
+
+}
+
+.share-menu .menu-dropdown .menu-title {
+
+    padding-left: 2em;
+
+    background-repeat: no-repeat;
+    background-size: 1em;
+    background-position: 0.5em center;
+    background-image: url('images/share.png');
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/e1cf5821/guacamole/src/main/webapp/app/client/templates/client.html
----------------------------------------------------------------------
diff --git a/guacamole/src/main/webapp/app/client/templates/client.html b/guacamole/src/main/webapp/app/client/templates/client.html
index 8b55838..2214d58 100644
--- a/guacamole/src/main/webapp/app/client/templates/client.html
+++ b/guacamole/src/main/webapp/app/client/templates/client.html
@@ -43,11 +43,13 @@
             <!-- Stationary header -->
             <div class="header">
                 <h2>{{client.name}}</h2>
-                <guac-menu title="'CLIENT.ACTION_SHARE' | translate" ng-show="canShareConnection()">
-                    <ul ng-repeat="sharingProfile in sharingProfiles">
-                        <li><a ng-click="share(sharingProfile)">{{sharingProfile.name}}</a></li>
-                    </ul>
-                </guac-menu>
+                <div class="share-menu" ng-show="canShareConnection()">
+                    <guac-menu title="'CLIENT.ACTION_SHARE' | translate">
+                        <ul ng-repeat="sharingProfile in sharingProfiles">
+                            <li><a ng-click="share(sharingProfile)">{{sharingProfile.name}}</a></li>
+                        </ul>
+                    </guac-menu>
+                </div>
                 <guac-user-menu local-actions="clientMenuActions"></guac-user-menu>
             </div>
 

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/e1cf5821/guacamole/src/main/webapp/images/share.png
----------------------------------------------------------------------
diff --git a/guacamole/src/main/webapp/images/share.png b/guacamole/src/main/webapp/images/share.png
new file mode 100644
index 0000000..75dfde0
Binary files /dev/null and b/guacamole/src/main/webapp/images/share.png differ


Mime
View raw message