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

GUACAMOLE-292: Display user attributes within user menu.

Browse Source
This commit is contained in:
Michael Jumper
2017-02-22 01:26:11 -08:00
parent 6327fa3a17
commit e9549fbb3b
4 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
guacamole/src/main/webapp/app/navigation/directives/guacUserMenu.js
View File

@@ -47,6 +47,8 @@ angular.module('navigation').directive('guacUserMenu', [function guacUserMenu()
var $location = $injector.get('$location'); var $location = $injector.get('$location');
var $route = $injector.get('$route'); var $route = $injector.get('$route');
var authenticationService = $injector.get('authenticationService'); var authenticationService = $injector.get('authenticationService');
var schemaService = $injector.get('schemaService');
var userService = $injector.get('userService');
var userPageService = $injector.get('userPageService'); var userPageService = $injector.get('userPageService');
/** /**
@@ -56,6 +58,18 @@ angular.module('navigation').directive('guacUserMenu', [function guacUserMenu()
*/ */
$scope.username = authenticationService.getCurrentUsername(); $scope.username = authenticationService.getCurrentUsername();
// Pull user attribute schema
schemaService.getUserAttributes(authenticationService.getDataSource())
.success(function attributesReceived(attributes) {
$scope.attributes = attributes;
});
// Pull user data
userService.getUser(authenticationService.getDataSource(), $scope.username)
.success(function userRetrieved(user) {
$scope.user = user;
});
/** /**
* The available main pages for the current user. * The available main pages for the current user.
* *

1
guacamole/src/main/webapp/app/navigation/navigationModule.js
View File

@@ -22,6 +22,7 @@
*/ */
angular.module('navigation', [ angular.module('navigation', [
'auth', 'auth',
'form',
'notification', 'notification',
'rest' 'rest'
]); ]);

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

@@ -82,3 +82,15 @@
.user-menu .menu-dropdown .menu-contents li a.logout { .user-menu .menu-dropdown .menu-contents li a.logout {
background-image: url('images/action-icons/guac-logout-dark.png'); background-image: url('images/action-icons/guac-logout-dark.png');
} }
.user-menu .menu-dropdown .menu-contents .profile {
margin: 1em;
padding-bottom: 1em;
border-bottom: 1px solid rgba(0, 0, 0, 0.25);
width: 2in;
}
.user-menu .menu-dropdown .menu-contents .profile span.field-header,
.user-menu .menu-dropdown .menu-contents .profile h3 {
display: none;
}

7
guacamole/src/main/webapp/app/navigation/templates/guacUserMenu.html
View File

@@ -1,6 +1,13 @@
<div class="user-menu" ng-show="!isAnonymous()"> <div class="user-menu" ng-show="!isAnonymous()">
<guac-menu menu-title="username"> <guac-menu menu-title="username">
<!-- User profile view -->
<div class="profile">
<guac-form namespace="'USER_ATTRIBUTES'" content="attributes"
model="user.attributes" values-only="true"
read-only="true"></guac-form>
</div>
<!-- Local actions --> <!-- Local actions -->
<ul class="action-list"> <ul class="action-list">
<li ng-repeat="action in localActions"> <li ng-repeat="action in localActions">