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

GUAC-1099: Paginate management interface. Remove styles from ui.css where possible/relevant.

Browse Source
This commit is contained in:
Michael Jumper
2015-02-26 17:42:55 -08:00
parent ac3ee41699
commit 1f9356100b
7 changed files with 54 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
guacamole/src/main/webapp/app/manage/manageModule.js
View File

@@ -23,5 +23,5 @@
/**
* The module for the administration functionality.
*/
angular.module('manage', ['groupList', 'locale', 'rest']);
angular.module('manage', ['groupList', 'locale', 'pager', 'rest']);

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

@@ -20,6 +20,12 @@
* THE SOFTWARE.
*/
button.add-user,
a.button.add-connection,
a.button.add-connection-group {
font-size: 0.8em;
}
button.add-user {
background-image: url('images/action-icons/guac-user-add.png');

9
guacamole/src/main/webapp/app/manage/styles/forms.css
View File

@@ -30,3 +30,12 @@
text-align: center;
margin-bottom: 1em;
}
.manage .user-add-form {
margin-bottom: 0.5em;
}
.manage .user-add-form input.name {
max-width: 80%;
width: 20em;
}

31
guacamole/src/main/webapp/app/manage/styles/lists.css Normal file
View File

@@ -0,0 +1,31 @@
/*
* 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.
*/
.manage .connection-list .group-list-page,
.manage .user-list {
border: 1px solid rgba(0, 0, 0, 0.25);
min-height: 15em;
-moz-border-radius: 0.2em;
-webkit-border-radius: 0.2em;
-khtml-border-radius: 0.2em;
border-radius: 0.2em;
}

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

@@ -44,7 +44,7 @@ THE SOFTWARE.
<!-- List of users this user has access to -->
<div class="user-list">
<div ng-repeat="user in users | orderBy : 'username'" class="user list-item">
<div ng-repeat="user in userPage" class="user list-item">
<a ng-href="#/manage/users/{{user.username}}">
<div class="caption">
<div class="icon user"></div>
@@ -53,6 +53,10 @@ THE SOFTWARE.
</a>
</div>
</div>
<!-- Pager controls for user list -->
<guac-pager page="userPage" items="users | orderBy : 'username'"></guac-pager>
</div>
</div>

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

@@ -68,7 +68,8 @@ THE SOFTWARE.
context="groupListContext"
connection-group="rootGroup"
connection-template="'app/manage/templates/connectionPermission.html'"
connection-group-template="'app/manage/templates/connectionGroupPermission.html'"/>
connection-group-template="'app/manage/templates/connectionGroupPermission.html'"
page-size="20"/>
</div>
<!-- Form action buttons -->