From 0e7fed21f798a79407db7d1127f84774de6ecbcf Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Sun, 4 Jan 2015 13:00:24 -0800
Subject: [PATCH] GUAC-973: Replace back button with home button where
 necessary.

---
 .../client/controllers/clientController.js    |  14 ++++++-------
 .../webapp/app/client/templates/client.html   |   2 +-
 .../main/webapp/app/index/styles/buttons.css  |   6 +++++-
 .../src/main/webapp/app/index/styles/ui.css   |  19 ------------------
 .../webapp/app/manage/templates/manage.html   |   2 +-
 .../webapp/images/action-icons/guac-home.png  | Bin 0 -> 874 bytes
 .../src/main/webapp/translations/en_US.json   |   5 +++--
 7 files changed, 17 insertions(+), 31 deletions(-)
 create mode 100644 guacamole/src/main/webapp/images/action-icons/guac-home.png

diff --git a/guacamole/src/main/webapp/app/client/controllers/clientController.js b/guacamole/src/main/webapp/app/client/controllers/clientController.js
index cb4c09745..1614524b9 100644
--- a/guacamole/src/main/webapp/app/client/controllers/clientController.js
+++ b/guacamole/src/main/webapp/app/client/controllers/clientController.js
@@ -126,10 +126,10 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
     /**
      * Action which returns the user to the home screen.
      */
-    var NAVIGATE_BACK_ACTION = {
-        name      : "CLIENT.ACTION_NAVIGATE_BACK",
-        className : "back button",
-        callback  : function navigateBackCallback() {
+    var NAVIGATE_HOME_ACTION = {
+        name      : "CLIENT.ACTION_NAVIGATE_HOME",
+        className : "home button",
+        callback  : function navigateHomeCallback() {
             $location.path('/');
         }
     };
@@ -415,7 +415,7 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
                 title: "CLIENT.DIALOG_HEADER_CONNECTION_ERROR",
                 text: "CLIENT.ERROR_CLIENT_" + errorName,
                 countdown: countdown,
-                actions: [ NAVIGATE_BACK_ACTION, RECONNECT_ACTION ]
+                actions: [ NAVIGATE_HOME_ACTION, RECONNECT_ACTION ]
             });
 
         }
@@ -435,7 +435,7 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
                 title: "CLIENT.DIALOG_HEADER_CONNECTION_ERROR",
                 text: "CLIENT.ERROR_TUNNEL_" + errorName,
                 countdown: countdown,
-                actions: [ NAVIGATE_BACK_ACTION, RECONNECT_ACTION ]
+                actions: [ NAVIGATE_HOME_ACTION, RECONNECT_ACTION ]
             });
 
         }
@@ -445,7 +445,7 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
             $scope.showStatus({
                 title: "CLIENT.DIALOG_HEADER_DISCONNECTED",
                 text: "CLIENT.TEXT_CLIENT_STATUS_" + connectionState.toUpperCase(),
-                actions: [ NAVIGATE_BACK_ACTION, RECONNECT_ACTION ]
+                actions: [ NAVIGATE_HOME_ACTION, RECONNECT_ACTION ]
             });
         }
 
diff --git a/guacamole/src/main/webapp/app/client/templates/client.html b/guacamole/src/main/webapp/app/client/templates/client.html
index 8f4e3687e..55781ec8a 100644
--- a/guacamole/src/main/webapp/app/client/templates/client.html
+++ b/guacamole/src/main/webapp/app/client/templates/client.html
@@ -56,7 +56,7 @@
 <div ng-class="{open: menuShown}" id="menu" guac-touch-drag="menuDrag" guac-scroll="menuScrollState">
 
     <div class="logout-panel">
-        <a class="back button" href="#/">{{'CLIENT.ACTION_NAVIGATE_BACK' | translate}}</a>
+        <a class="home button" href="#/">{{'CLIENT.ACTION_NAVIGATE_HOME' | translate}}</a>
         <a class="disconnect danger button" ng-click="disconnect()">{{'CLIENT.ACTION_DISCONNECT' | translate}}</a>
     </div>
     <h2>{{client.name}}</h2>
diff --git a/guacamole/src/main/webapp/app/index/styles/buttons.css b/guacamole/src/main/webapp/app/index/styles/buttons.css
index 97836b351..bc7648906 100644
--- a/guacamole/src/main/webapp/app/index/styles/buttons.css
+++ b/guacamole/src/main/webapp/app/index/styles/buttons.css
@@ -73,7 +73,7 @@ button.danger:active, a.button.danger:active {
     background: #932;
 }
 
-.button.logout, .button.manage, .button.back {
+.button.logout, .button.manage, .button.back, .button.home {
     background-repeat: no-repeat;
     background-size: 1em;
     background-position: 0.5em 0.45em;
@@ -91,3 +91,7 @@ button.danger:active, a.button.danger:active {
 .button.back {
     background-image: url('images/action-icons/guac-back.png');
 }
+
+.button.home {
+    background-image: url('images/action-icons/guac-home.png');
+}
diff --git a/guacamole/src/main/webapp/app/index/styles/ui.css b/guacamole/src/main/webapp/app/index/styles/ui.css
index d2d928f54..7c387182d 100644
--- a/guacamole/src/main/webapp/app/index/styles/ui.css
+++ b/guacamole/src/main/webapp/app/index/styles/ui.css
@@ -398,22 +398,3 @@ div.logout-panel {
     text-align: center;
     margin: 1em;
 }
-
-.button.logout, .button.manage, .button.back {
-    background-repeat: no-repeat;
-    background-size: 1em;
-    background-position: 0.5em 0.45em;
-    padding-left: 1.8em;
-}
-
-.button.logout {
-    background-image: url('images/action-icons/guac-logout.png');
-}
-
-.button.manage {
-    background-image: url('images/action-icons/guac-config.png');
-}
-
-.button.back {
-    background-image: url('images/action-icons/guac-back.png');
-}
diff --git a/guacamole/src/main/webapp/app/manage/templates/manage.html b/guacamole/src/main/webapp/app/manage/templates/manage.html
index 45c352da0..433516a9e 100644
--- a/guacamole/src/main/webapp/app/manage/templates/manage.html
+++ b/guacamole/src/main/webapp/app/manage/templates/manage.html
@@ -21,7 +21,7 @@ THE SOFTWARE.
 -->
 
 <div class="logout-panel">
-    <a class="back button" href="#/">{{'MANAGE.ACTION_NAVIGATE_BACK' | translate}}</a>
+    <a class="home button" href="#/">{{'MANAGE.ACTION_NAVIGATE_HOME' | translate}}</a>
     <a class="logout button" ng-click="logout()">{{'MANAGE.ACTION_LOGOUT' | translate}}</a>
 </div>
 
diff --git a/guacamole/src/main/webapp/images/action-icons/guac-home.png b/guacamole/src/main/webapp/images/action-icons/guac-home.png
new file mode 100644
index 0000000000000000000000000000000000000000..d5613d4d1197f5cc200bd13772363c6c1c684a08
GIT binary patch
literal 874
zcmV-w1C{)VP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10_RCYK~#90?b}bNRAm^)@z3}VB}9}iDh3K7YM>>EV2FaW2n4}}
zTtgQk1W^Rl>Qb8vf-Mqv3NAtrQBgM%gmA$>r6PtYv}xf=E$Q!~MMMN|i*v)cI_I2w
z?>pxioAZT%nR(y$IluQe?{m(3-uFx=rDTwq5iKB^)_`aM(X<9c3lOX!^58Gv6u!i=
zC=s2Y%iznnfVJbFf5u*nH7z7!1nk3YPdX1nxP;NhHKmlAdd*EK9Z%JarId!6($!Q7
zti*Y2s9FC94C8vw6phn_0lRPl3ntm_Z+wKqm?&}!UN32Tb^KLL4~N(6l+uwJL%xcO
zDW!!IVvkg`8Lg|cS0|j8a19@1h_w^nU}J_@Ptgkl-oRaK&KPqAZs47aF_G7R890b9
z@M6Ze|1t+hac2B|7G`CNvlyqbJyX0g_9!M!S;%3)R-DDs46*7mlq=A5QlNtoT-I#o
zvoh5Yum~ryBcqlOreeS*oWt_WT0)p?3cQD}^nd4P)~#4~Dm)*bVfR!OHO%*T4G*d+
z))@ioamVx1d5Q&=yK0=Hsth=QTUeDrRMRZN=QyM!CAy`+JRHORUMLIT8s5a?i3QIx
zV721jeO>Q$HOh|)6R!OC%ZVv4jIaIwI!`fOAH&CrNgSSxfH^pVcSEE#&n3m$<gcBS
z(h9|p@5%jkAM+5yos`lmSXfc{N=13U@)quwl>b$CBJ{lOp>M#wvI^6^9sUWQl$3v(
z;TROZ<fATSBiJ_O$Tb%ayYXE`yFY6!dsefi<QQj5+Pzw#uP-)7Lun0&77$HqK(v5p
zrhAE6p!|-p_R35JAL6$zW$ULCc;F{O1D^t|0nq}YX$^=L5KXS#;ktaQ*h?&9oo05K
z(YygS@qR^}w>4<Mz^6cKK(v5pS_7g5MAI4&Eg+iKfM@~H47>q#SA>>iI^G}ny`s)M
zlYg|n8^0(XyYEWWe}?*oflq<ffM@~H47>sV0H{9oiz5`5V*mgE07*qoM6N<$f>OVS
AqW}N^

literal 0
HcmV?d00001

diff --git a/guacamole/src/main/webapp/translations/en_US.json b/guacamole/src/main/webapp/translations/en_US.json
index 71ec4fe63..1e178c69f 100644
--- a/guacamole/src/main/webapp/translations/en_US.json
+++ b/guacamole/src/main/webapp/translations/en_US.json
@@ -9,6 +9,7 @@
         "ACTION_LOGOUT"        : "Logout",
         "ACTION_MANAGE"        : "Manage",
         "ACTION_NAVIGATE_BACK" : "Back",
+        "ACTION_NAVIGATE_HOME" : "Home",
         "ACTION_SAVE"          : "Save",
 
         "NAME" : "Guacamole ${project.version}"
@@ -20,7 +21,7 @@
         "ACTION_ACKNOWLEDGE"               : "@:APP.ACTION_ACKNOWLEDGE",
         "ACTION_CLEAR_COMPLETED_TRANSFERS" : "Clear Completed Transfers",
         "ACTION_DISCONNECT"                : "Disconnect",
-        "ACTION_NAVIGATE_BACK"             : "@:APP.ACTION_NAVIGATE_BACK",
+        "ACTION_NAVIGATE_HOME"             : "@:APP.ACTION_NAVIGATE_HOME",
         "ACTION_RECONNECT"                 : "Reconnect",
         "ACTION_SAVE_FILE"                 : "@:APP.ACTION_SAVE",
         "ACTION_UPLOAD_FILES"              : "Upload Files",
@@ -127,7 +128,7 @@
 
         "ACTION_ACKNOWLEDGE"          : "@:APP.ACTION_ACKNOWLEDGE",
         "ACTION_LOGOUT"               : "@:APP.ACTION_LOGOUT",
-        "ACTION_NAVIGATE_BACK"        : "@:APP.ACTION_NAVIGATE_BACK",
+        "ACTION_NAVIGATE_HOME"        : "@:APP.ACTION_NAVIGATE_HOME",
         "ACTION_NEW_USER"             : "New User",
         "ACTION_NEW_CONNECTION"       : "New Connection",
         "ACTION_NEW_CONNECTION_GROUP" : "New Group",