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

GUAC-1053: Only display one link for settings within the user menu.

Browse Source
This commit is contained in:
Michael Jumper
2015-04-16 22:18:34 -07:00
parent 38250acf40
commit fbe177231d
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
guacamole/src/main/webapp/app/navigation/services/userPageService.js
View File

@@ -274,8 +274,14 @@ angular.module('navigation').factory('userPageService', ['$injector',
if (homePage === SYSTEM_HOME_PAGE) if (homePage === SYSTEM_HOME_PAGE)
pages.push(homePage); pages.push(homePage);
// Add any settings pages // Add generic link to the first-available settings page
pages = pages.concat(generateSettingsPages(permissions)); var settingsPages = generateSettingsPages(permissions);
if (settingsPages.length) {
pages.push(new Page(
'USER_MENU.ACTION_MANAGE_SETTINGS',
settingsPages[0].url
));
}
return pages; return pages;
}; };

12
guacamole/src/main/webapp/app/navigation/styles/user-menu.css
View File

@@ -195,16 +195,10 @@
background-image: url('images/action-icons/guac-home-dark.png'); background-image: url('images/action-icons/guac-home-dark.png');
} }
.user-menu .options li a[href="#/manage/modules/users/"] { .user-menu .options li a[href="#/manage/modules/users/"],
background-image: url('images/user-icons/guac-user.png'); .user-menu .options li a[href="#/manage/modules/connections/"],
}
.user-menu .options li a[href="#/manage/modules/connections/"] {
background-image: url('images/protocol-icons/guac-monitor.png');
}
.user-menu .options li a[href="#/manage/modules/sessions/"] { .user-menu .options li a[href="#/manage/modules/sessions/"] {
background-image: url('images/protocol-icons/guac-plug.png'); background-image: url('images/action-icons/guac-config-dark.png');
} }
.user-menu .options li a.change-password { .user-menu .options li a.change-password {

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

@@ -11,6 +11,7 @@
"ACTION_LOGIN" : "Login", "ACTION_LOGIN" : "Login",
"ACTION_LOGOUT" : "Logout", "ACTION_LOGOUT" : "Logout",
"ACTION_MANAGE_CONNECTIONS" : "Manage Connections", "ACTION_MANAGE_CONNECTIONS" : "Manage Connections",
"ACTION_MANAGE_SETTINGS" : "Settings",
"ACTION_MANAGE_SESSIONS" : "Active Sessions", "ACTION_MANAGE_SESSIONS" : "Active Sessions",
"ACTION_MANAGE_USERS" : "Users", "ACTION_MANAGE_USERS" : "Users",
"ACTION_NAVIGATE_BACK" : "Back", "ACTION_NAVIGATE_BACK" : "Back",
@@ -422,6 +423,7 @@
"ACTION_LOGOUT" : "@:APP.ACTION_LOGOUT", "ACTION_LOGOUT" : "@:APP.ACTION_LOGOUT",
"ACTION_MANAGE_CONNECTIONS" : "@:APP.ACTION_MANAGE_CONNECTIONS", "ACTION_MANAGE_CONNECTIONS" : "@:APP.ACTION_MANAGE_CONNECTIONS",
"ACTION_MANAGE_SESSIONS" : "@:APP.ACTION_MANAGE_SESSIONS", "ACTION_MANAGE_SESSIONS" : "@:APP.ACTION_MANAGE_SESSIONS",
"ACTION_MANAGE_SETTINGS" : "@:APP.ACTION_MANAGE_SETTINGS",
"ACTION_MANAGE_USERS" : "@:APP.ACTION_MANAGE_USERS", "ACTION_MANAGE_USERS" : "@:APP.ACTION_MANAGE_USERS",
"ACTION_NAVIGATE_HOME" : "@:APP.ACTION_NAVIGATE_HOME", "ACTION_NAVIGATE_HOME" : "@:APP.ACTION_NAVIGATE_HOME",
"ACTION_SAVE" : "@:APP.ACTION_SAVE", "ACTION_SAVE" : "@:APP.ACTION_SAVE",