safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 21:27:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #49 from glyptodon/home-button

Browse Source 
GUAC-973: Replace back button with home button where necessary.
This commit is contained in:
James Muehlner
2015-01-04 14:36:52 -08:00
parent 02eec645f7 0e7fed21f7
commit a484d77d25
7 changed files with 17 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
guacamole/src/main/webapp/app/client/controllers/clientController.js
View File

@@ -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 ]
});
}

2
guacamole/src/main/webapp/app/client/templates/client.html
View File

@@ -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>

6
guacamole/src/main/webapp/app/index/styles/buttons.css
View File

@@ -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');
}

19
guacamole/src/main/webapp/app/index/styles/ui.css
View File

@@ -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');
}

2
guacamole/src/main/webapp/app/manage/templates/manage.html
View File

@@ -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>

BIN
guacamole/src/main/webapp/images/action-icons/guac-home.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 874 B

5
guacamole/src/main/webapp/translations/en_US.json
View File

@@ -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",