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

GUAC-1053: Fix styling of connection home pages (when needed).

Browse Source
This commit is contained in:
Michael Jumper
2015-04-17 21:38:26 -07:00
parent dbeb68cc1d
commit 9fa5a25aa9
2 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -268,14 +268,16 @@ angular.module('navigation').factory('userPageService', ['$injector',
var pages = []; var pages = [];
// Get home page and settings pages
var homePage = generateHomePage(rootGroup);
var settingsPages = generateSettingsPages(permissions);
// Only include the home page in the list of main pages if the user // Only include the home page in the list of main pages if the user
// can navigate elsewhere. // can navigate elsewhere.
var homePage = generateHomePage(rootGroup); if (homePage === SYSTEM_HOME_PAGE || settingsPages.length)
if (homePage === SYSTEM_HOME_PAGE)
pages.push(homePage); pages.push(homePage);
// Add generic link to the first-available settings page // Add generic link to the first-available settings page
var settingsPages = generateSettingsPages(permissions);
if (settingsPages.length) { if (settingsPages.length) {
pages.push(new Page( pages.push(new Page(
'USER_MENU.ACTION_MANAGE_SETTINGS', 'USER_MENU.ACTION_MANAGE_SETTINGS',

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

@@ -164,11 +164,19 @@
} }
.user-menu .options li a { .user-menu .options li a {
display: block; display: block;
cursor: pointer; cursor: pointer;
color: black; color: black;
text-decoration: none; text-decoration: none;
padding: 0.75em; padding: 0.75em;
background-repeat: no-repeat;
background-size: 1em;
background-position: 0.75em center;
padding-left: 2.5em;
background-image: url('images/protocol-icons/guac-monitor.png');
} }
.user-menu .options li a:hover { .user-menu .options li a:hover {
@@ -182,18 +190,6 @@
opacity: 0.25; opacity: 0.25;
} }
.user-menu .options li a.home,
.user-menu .options li a.manage-users,
.user-menu .options li a.manage-connections,
.user-menu .options li a.manage-sessions,
.user-menu .options li a.change-password,
.user-menu .options li a.logout {
background-repeat: no-repeat;
background-size: 1em;
background-position: 0.75em center;
padding-left: 2.5em;
}
.user-menu .options li a[href="#/"] { .user-menu .options li a[href="#/"] {
background-image: url('images/action-icons/guac-home-dark.png'); background-image: url('images/action-icons/guac-home-dark.png');
} }