From 26c35e127a1f957c936e00d5eca667b314918353 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Mon, 6 Apr 2015 22:36:31 -0700
Subject: [PATCH] GUAC-1126: Restore disconnect button within Guacamole menu.

---
 .../src/main/webapp/app/client/styles/menu.css |  17 +++++++++++++++++
 .../webapp/app/client/templates/client.html    |   1 +
 .../{action-icons/guac-close.png => x.png}     | Bin
 3 files changed, 18 insertions(+)
 rename guacamole/src/main/webapp/images/{action-icons/guac-close.png => x.png} (100%)

diff --git a/guacamole/src/main/webapp/app/client/styles/menu.css b/guacamole/src/main/webapp/app/client/styles/menu.css
index c35949f01..c6d18c844 100644
--- a/guacamole/src/main/webapp/app/client/styles/menu.css
+++ b/guacamole/src/main/webapp/app/client/styles/menu.css
@@ -81,6 +81,23 @@
     
 }
 
+.menu-content .header button.close {
+
+    margin: 0;
+    padding: 0;
+    min-width: 3em;
+
+    border: none;
+    box-shadow: none;
+    background: none;
+
+    background-image: url('images/x.png');
+    background-size: 1em;
+    background-repeat: no-repeat;
+    background-position: center;
+
+}
+
 .menu-body {
 
     -ms-flex: 1 1 auto;
diff --git a/guacamole/src/main/webapp/app/client/templates/client.html b/guacamole/src/main/webapp/app/client/templates/client.html
index 16d2b23ed..8aa77b9a1 100644
--- a/guacamole/src/main/webapp/app/client/templates/client.html
+++ b/guacamole/src/main/webapp/app/client/templates/client.html
@@ -59,6 +59,7 @@
             <!-- Stationary header -->
             <div class="header">
                 <h2>{{client.name}}</h2>
+                <button class="close" ng-click="disconnect()"></button>
                 <guac-user-menu></guac-user-menu>
             </div>
 
diff --git a/guacamole/src/main/webapp/images/action-icons/guac-close.png b/guacamole/src/main/webapp/images/x.png
similarity index 100%
rename from guacamole/src/main/webapp/images/action-icons/guac-close.png
rename to guacamole/src/main/webapp/images/x.png