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 1/2] 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

From b3524b1a03b248b00d01507041cb2d37e157317a Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Tue, 7 Apr 2015 10:22:30 -0700
Subject: [PATCH 2/2] GUAC-1126: Use round, red "x" button for disconnect.

---
 .../main/webapp/app/client/styles/menu.css    |  28 +++++++++++++-----
 .../webapp/app/client/templates/client.html   |   2 +-
 guacamole/src/main/webapp/images/x-shadow.png | Bin 0 -> 839 bytes
 guacamole/src/main/webapp/images/x.png        | Bin 512 -> 0 bytes
 4 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100644 guacamole/src/main/webapp/images/x-shadow.png
 delete mode 100644 guacamole/src/main/webapp/images/x.png

diff --git a/guacamole/src/main/webapp/app/client/styles/menu.css b/guacamole/src/main/webapp/app/client/styles/menu.css
index c6d18c844..3895d6324 100644
--- a/guacamole/src/main/webapp/app/client/styles/menu.css
+++ b/guacamole/src/main/webapp/app/client/styles/menu.css
@@ -83,19 +83,33 @@
 
 .menu-content .header button.close {
 
-    margin: 0;
+    margin: 0 0.75em;
     padding: 0;
-    min-width: 3em;
-
-    border: none;
+    width: 1.5em;
+    height: 1.5em;
+    min-width: 0;
+    
     box-shadow: none;
-    background: none;
+    -moz-border-radius: 1.5em;
+    -webkit-border-radius: 1.5em;
+    -khtml-border-radius: 1.5em;
+    border-radius: 1.5em;
 
-    background-image: url('images/x.png');
-    background-size: 1em;
+    -moz-background-size: 0.75em;
+    -webkit-background-size: 0.75em;
+    -khtml-background-size: 0.75em;
+    background-size: 0.75em;
+
+    background-image: url('images/x-shadow.png');
     background-repeat: no-repeat;
     background-position: center;
 
+    vertical-align: middle;
+    -ms-flex-align-self: center;
+    -moz-align-self: center;
+    -webkit-align-self: center;
+    align-self: center;
+    
 }
 
 .menu-body {
diff --git a/guacamole/src/main/webapp/app/client/templates/client.html b/guacamole/src/main/webapp/app/client/templates/client.html
index 8aa77b9a1..8cb709c36 100644
--- a/guacamole/src/main/webapp/app/client/templates/client.html
+++ b/guacamole/src/main/webapp/app/client/templates/client.html
@@ -59,7 +59,7 @@
             <!-- Stationary header -->
             <div class="header">
                 <h2>{{client.name}}</h2>
-                <button class="close" ng-click="disconnect()"></button>
+                <button class="close danger" ng-click="disconnect()" title="{{'CLIENT.ACTION_DISCONNECT' | translate}}"></button>
                 <guac-user-menu></guac-user-menu>
             </div>
 
diff --git a/guacamole/src/main/webapp/images/x-shadow.png b/guacamole/src/main/webapp/images/x-shadow.png
new file mode 100644
index 0000000000000000000000000000000000000000..a274e6155282e46eb4d069b15598eacb6d73526c
GIT binary patch
literal 839
zcmV-N1GxN&P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy000McNliru-vkE`A|fdtK9>Lh0@O)F
zK~#9!?U}!e(_k3KziCp?MX<Oyic7I{y`epERI7i^anLbj=$O&rrrstvxHz|iTOg%_
zYam$<y4-oaOVYe93Fu)pKc4q}pFqA)XrblF=hKk9dA~rH(is96FgT7uek>$0OMY(z
z;3a_P0CoWO8sSd>JOj`NaHT@P2*8W{eNUr=0^Z6$Kc$dhR)B{_2@l~xC81XlzKG>{
z-Y4JpXBy!F0Jd#^2!h~(dguti$78R}X7g1DA(AAyl`LTZ;N7v~ux<N1j^n)$LWE&>
zsT975L<yzgi%>|Y1TRrSWq1k+wcsU4s14sl!mtTEp@hcpMWQHLk_;{jPauH|{<pY|
z4xlQ00|_$Vn@Ok(UqgaS_<9mN&-*M0QbK|X_#%t4E5V&<n#(jz8!vM$%X&N>kG~v|
z@V^z_tNDCx_xt@v1b3Dj0N*P8!uS1Ik|ej1&IFbJ{Iw9`w3aqW650VTOM>G#XRU#k
zAt8?Ay=~j)t$|k|fjzuT39W&bbWONVlH|TM@G>N{4xXU|_3(@&=!0h<K|j1k34Gv-
zwY}pwXN0#iW$-2iJb;tcYPGX0>&Ij=d2O1eB}w!RfcJ)BeCHzIk4M_|dVM8P0y%tB
z0e^j-FC<K-(>J|dkKznNmSuN_VZ5b=$Fa?brgar{vMlRux7#OdE_e!`=T$UN{NcGs
z&<d|x0t<Lu5?H~jmcSBTl?2xCvL&<vUX}!9@Q1@;PqigRB|&*<A-RF#4X>z%;|<S6
z!jMB<MJXXo)1Os0PDUK+D&p<6>)H}@Ha6NNaHy-aN(h4Bg2M(Tv4lmX;b9nFa@f5k
zlHk@F-arEB)^$S(ZlmEfBuFVOYD#cPhF6dvwXvxv!6h9YMbVN&UFG}!EMMfPgD)b4
za5;2!LWt9RraJh4NYGML9+BXx8t!svX&*>%RS#cqsHk%Z3v}tyrAwFU`2`NYLUYGi
RS*rj5002ovPDHLkV1kasbS3}*

literal 0
HcmV?d00001

diff --git a/guacamole/src/main/webapp/images/x.png b/guacamole/src/main/webapp/images/x.png
deleted file mode 100644
index 5ac7edb2dd7c1c579f200ae9e804a8d213a392c3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 512
zcmV+b0{{JqP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy000McNliru-3tr`C@3=*Q5paM0gXvS
zK~#9!?VG`E!!Qg*KYPwdULeRsoxsOT(+#pw3t!obdMRMUqA7m@`T}%}r2mpg<d<mf
zj+xsBCT{{D00IzeX11Ey!WLj=i<zzA0o=X219$>(0N((X$QT(Nz|z*>0G^>SPKb9V
zgn!~a3gN7H3WOc;AqW}bFNN?%d^dzF@s~h2D836qrud-{I>jG`kS%@)grN9C5Jrek
zg>X{*TL^oTt|uo<fsiErudh7-GA9l}xM~gb1+eEXvk=ytwZ07o@G3t^)?co~rbOLu
z*gG@(#9^P!TkE{zwm^VF4Y*JwO5;VF1>$sSzJVgi3NP6zkgihGZ4}Abd0s;S*M{mg
zp@?<Gv)Trlms_IvZIszM{oSDc0@?(13@Q*(D6C{i>97nDSz<CpWsB=#L|0?F9M$#s
zd=Dh{43P(bTY}y21K{rNuYgbS0&s6*oNc$J>9`>>^&=@glhZ><J(bmCX+4)$!NeRT
zGZw8JZG}o-ksv3#XbQl?-9JO0SLv+k1_eL>W^TXr8@v1Xkp}$$0000<MNUMnLSTYt
CY1NMa