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

GUAC-1053: Split listing of page links from guacUserMenu into guacPageList.

Browse Source
This commit is contained in:
Michael Jumper
2015-04-17 15:12:49 -07:00
parent fbe177231d
commit e0a805cb6f
5 changed files with 130 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
guacamole/src/main/webapp/app/navigation/directives/guacPageList.js Normal file
View File

@@ -0,0 +1,74 @@
/*
* Copyright (C) 2015 Glyptodon LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
/**
* A directive which provides a list of links to specific pages.
*/
angular.module('navigation').directive('guacPageList', [function guacPageList() {
return {
restrict: 'E',
replace: true,
scope: {
/**
* The array of pages to display.
*
* @type Page[]
*/
pages : '='
},
templateUrl: 'app/navigation/templates/guacPageList.html',
controller: ['$scope', '$injector', function guacPageListController($scope, $injector) {
// Get required services
var $location = $injector.get('$location');
/**
* Navigate to the given page.
*
* @param {Page} page
* The page to navigate to.
*/
$scope.navigateToPage = function navigateToPage(page) {
$location.path(page.url);
};
/**
* Tests whether the given page is the page currently being viewed.
*
* @param {Page} page
* The page to test.
*
* @returns {Boolean}
* true if the given page is the current page, false otherwise.
*/
$scope.isCurrentPage = function isCurrentPage(page) {
return $location.url() === page.url;
};
}] // end controller
};
}]);

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

@@ -214,29 +214,6 @@ angular.module('navigation').directive('guacUserMenu', [function guacUserMenu()
};
/**
* Navigate to the given page.
*
* @param {Page} page
* The page to navigate to.
*/
$scope.navigateToPage = function navigateToPage(page) {
$location.path(page.url);
};
/**
* Tests whether the given page should be disabled.
*
* @param {Page} page
* The page to test.
*
* @returns {Boolean}
* true if the given page should be disabled, false otherwise.
*/
$scope.isPageDisabled = function isPageDisabled(page) {
return $location.url() === page.url;
};
/**
* Logs out the current user, redirecting them to back to the login
* screen after logout completes.

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

@@ -139,8 +139,6 @@
top: 100%;
right: 0;
left: -1px;
margin: 0;
padding: 0;
background: #EEE;
box-shadow: 0 2px 2px rgba(0, 0, 0, 0.125);
@@ -151,6 +149,11 @@
}
.user-menu .options ul {
margin: 0;
padding: 0;
}
.user-menu .user-menu-dropdown.open .options {
visibility: visible;
}
@@ -172,8 +175,8 @@
background-color: #CDA;
}
.user-menu .options li a.disabled,
.user-menu .options li a.disabled:hover {
.user-menu .options li a.current,
.user-menu .options li a.current:hover {
background-color: transparent;
cursor: default;
opacity: 0.25;

32
guacamole/src/main/webapp/app/navigation/templates/guacPageList.html Normal file
View File

@@ -0,0 +1,32 @@
<ul class="page-list">
<!--
Copyright (C) 2015 Glyptodon LLC
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
-->
<!-- Navigation links -->
<li ng-repeat="page in pages">
<a class="home" ng-click="navigateToPage(page)"
ng-class="{current: isCurrentPage(page)}" href="#{{page.url}}">
{{page.name | translate}}
</a>
</li>
</ul>

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

@@ -26,31 +26,30 @@
<div class="menu-indicator"></div>
<!-- Menu options -->
<ul class="options">
<div class="options">
<!-- Local actions -->
<li ng-repeat="action in localActions">
<a ng-class="action.className" ng-click="action.callback()">
{{action.name | translate}}
</a>
</li>
<ul class="action-list">
<li ng-repeat="action in localActions">
<a ng-class="action.className" ng-click="action.callback()">
{{action.name | translate}}
</a>
</li>
</ul>
<!-- Navigation links -->
<li ng-repeat="page in pages">
<a class="home" ng-click="navigateToPage(page)"
ng-class="{disabled: isPageDisabled(page)}" href="#{{page.url}}">
{{page.name | translate}}
</a>
</li>
<guac-page-list pages="pages"></guac-page-list>
<!-- Actions -->
<li ng-repeat="action in actions">
<a ng-class="action.className" ng-click="action.callback()">
{{action.name | translate}}
</a>
</li>
<ul class="action-list">
<li ng-repeat="action in actions">
<a ng-class="action.className" ng-click="action.callback()">
{{action.name | translate}}
</a>
</li>
</ul>
</ul>
</div>
</div>
<!-- Password dialog -->