From 3f22d1d09ab0caf7f1d836ea7d63ed729e79fc75 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Tue, 2 Aug 2016 14:24:37 -0700
Subject: [PATCH] GUACAMOLE-5: Use more semantically-sound "menu-contents"
 class.

---
 .../main/webapp/app/client/styles/client.css  |  2 +-
 .../webapp/app/navigation/styles/menu.css     | 20 +++++++++----------
 .../app/navigation/styles/user-menu.css       | 15 +++++++-------
 .../app/navigation/templates/guacMenu.html    |  4 ++--
 4 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/guacamole/src/main/webapp/app/client/styles/client.css b/guacamole/src/main/webapp/app/client/styles/client.css
index 17c7bf85a..9ec74b6b2 100644
--- a/guacamole/src/main/webapp/app/client/styles/client.css
+++ b/guacamole/src/main/webapp/app/client/styles/client.css
@@ -120,7 +120,7 @@ body.client {
     text-transform: none;
 }
 
-.client .user-menu .options li a.disconnect {
+.client .user-menu .menu-contents li a.disconnect {
     background-repeat: no-repeat;
     background-size: 1em;
     background-position: 0.75em center;
diff --git a/guacamole/src/main/webapp/app/navigation/styles/menu.css b/guacamole/src/main/webapp/app/navigation/styles/menu.css
index 4a7c13469..1e4e75e4f 100644
--- a/guacamole/src/main/webapp/app/navigation/styles/menu.css
+++ b/guacamole/src/main/webapp/app/navigation/styles/menu.css
@@ -91,7 +91,7 @@
 
 }
 
-.menu-dropdown .options {
+.menu-dropdown .menu-contents {
 
     visibility: hidden;
 
@@ -110,21 +110,21 @@
     
 }
 
-.menu-dropdown .options ul {
+.menu-dropdown .menu-contents ul {
     margin: 0;
     padding: 0;
 }
 
-.menu-dropdown.open .options {
+.menu-dropdown.open .menu-contents {
     visibility: visible;
 }
 
-.menu-dropdown .options li {
+.menu-dropdown .menu-contents li {
     padding: 0;
     list-style-type: none;
 }
 
-.menu-dropdown .options li a {
+.menu-dropdown .menu-contents li a {
 
     display: block;
     cursor: pointer;
@@ -134,23 +134,23 @@
 
 }
 
-.menu-dropdown .options li a:hover {
+.menu-dropdown .menu-contents li a:hover {
     background-color: #CDA;
 }
 
-.menu-dropdown .options li a.current,
-.menu-dropdown .options li a.current:hover {
+.menu-dropdown .menu-contents li a.current,
+.menu-dropdown .menu-contents li a.current:hover {
     background-color: transparent;
     cursor: default;
     opacity: 0.25;
 }
 
-.menu-dropdown .options li a.danger {
+.menu-dropdown .menu-contents li a.danger {
     color: white;
     font-weight: bold;
     background-color: #A43;
 }
 
-.menu-dropdown .options li a.danger:hover {
+.menu-dropdown .menu-contents li a.danger:hover {
     background-color: #C54;
 }
diff --git a/guacamole/src/main/webapp/app/navigation/styles/user-menu.css b/guacamole/src/main/webapp/app/navigation/styles/user-menu.css
index 9acecc871..b7fce98e6 100644
--- a/guacamole/src/main/webapp/app/navigation/styles/user-menu.css
+++ b/guacamole/src/main/webapp/app/navigation/styles/user-menu.css
@@ -58,7 +58,7 @@
 
 }
 
-.user-menu .menu-dropdown .options li a {
+.user-menu .menu-dropdown .menu-contents li a {
 
     background-repeat: no-repeat;
     background-size: 1em;
@@ -67,17 +67,18 @@
     background-image: url('images/protocol-icons/guac-monitor.png');
 
 }
-.user-menu .menu-dropdown .options li a[href="#/"] {
+
+.user-menu .menu-dropdown .menu-contents li a[href="#/"] {
     background-image: url('images/action-icons/guac-home-dark.png');
 }
 
-.user-menu .menu-dropdown .options li a[href="#/settings/users"],
-.user-menu .menu-dropdown .options li a[href="#/settings/connections"],
-.user-menu .menu-dropdown .options li a[href="#/settings/sessions"],
-.user-menu .menu-dropdown .options li a[href="#/settings/preferences"] {
+.user-menu .menu-dropdown .menu-contents li a[href="#/settings/users"],
+.user-menu .menu-dropdown .menu-contents li a[href="#/settings/connections"],
+.user-menu .menu-dropdown .menu-contents li a[href="#/settings/sessions"],
+.user-menu .menu-dropdown .menu-contents li a[href="#/settings/preferences"] {
     background-image: url('images/action-icons/guac-config-dark.png');
 }
 
-.user-menu .menu-dropdown .options li a.logout {
+.user-menu .menu-dropdown .menu-contents li a.logout {
     background-image: url('images/action-icons/guac-logout-dark.png');
 }
diff --git a/guacamole/src/main/webapp/app/navigation/templates/guacMenu.html b/guacamole/src/main/webapp/app/navigation/templates/guacMenu.html
index f1785cd9f..f7ddee974 100644
--- a/guacamole/src/main/webapp/app/navigation/templates/guacMenu.html
+++ b/guacamole/src/main/webapp/app/navigation/templates/guacMenu.html
@@ -2,6 +2,6 @@
     <div class="menu-title">{{menuTitle}}</div>
     <div class="menu-indicator"></div>
 
-    <!-- Menu options -->
-    <div class="options" ng-transclude></div>
+    <!-- Menu contents -->
+    <div class="menu-contents" ng-transclude></div>
 </div>