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

GUAC-1133: Apply common styling and form to management pages.

Browse Source
This commit is contained in:
Michael Jumper
2015-03-19 14:00:32 -07:00
parent 918c3c2677
commit 2eeed36797
6 changed files with 73 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
guacamole/src/main/webapp/app/index/styles/ui.css
View File

@@ -211,44 +211,6 @@ div.section {
background: inherit; background: inherit;
} }
/*
* List element fields (editing)
*/
.form .fields th,
.form .permissions th {
font-weight: normal;
vertical-align: middle;
text-align: left;
}
.form h2 {
border-top: none;
}
.form h3 {
font-size: 1em;
margin-bottom: 0.25em;
}
.form {
cursor: auto;
animation-name: fadein;
-webkit-animation-name: fadein;
animation-duration: 0.125s;
-webkit-animation-duration: 0.125s;
}
.object-buttons {
text-align: right;
border-top: 1px solid rgba(0, 0, 0, 0.1);
padding-top: 0.5em;
margin: 0.5em;
}
/* /*
* List element icons * List element icons
*/ */

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

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

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

@@ -28,13 +28,11 @@ THE SOFTWARE.
</div> </div>
<!-- Connection management --> <!-- Connection management -->
<div class="settings section" ng-show="canManageConnections"> <div class="settings section connections">
<div class="connections">
<p>{{'MANAGE_CONNECTION.HELP_CONNECTIONS' | translate}}</p> <p>{{'MANAGE_CONNECTION.HELP_CONNECTIONS' | translate}}</p>
<!-- Connection/group creation buttons --> <!-- Form action buttons -->
<div class="connection-add-form"> <div class="action-buttons">
<a class="add-connection button" <a class="add-connection button"
ng-show="canCreateConnections" ng-show="canCreateConnections"
@@ -55,6 +53,5 @@ THE SOFTWARE.
connection-group-template="'app/manage/templates/connectionGroup.html'"/> connection-group-template="'app/manage/templates/connectionGroup.html'"/>
</div> </div>
</div> </div>
</div>
</div> </div>

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

@@ -28,9 +28,7 @@ THE SOFTWARE.
</div> </div>
<!-- User Session management --> <!-- User Session management -->
<div class="settings section"> <div class="settings section sessions">
<div class="sessions">
<p>{{'MANAGE_SESSION.HELP_SESSIONS' | translate}}</p> <p>{{'MANAGE_SESSION.HELP_SESSIONS' | translate}}</p>
<!-- Form action buttons --> <!-- Form action buttons -->
@@ -43,18 +41,10 @@ THE SOFTWARE.
<thead> <thead>
<tr> <tr>
<th></th> <th></th>
<th> <th>{{'MANAGE_SESSION.TABLE_HEADER_SESSION_USERNAME' | translate}}</th>
{{'MANAGE_SESSION.TABLE_HEADER_SESSION_USERNAME' | translate}} <th>{{'MANAGE_SESSION.TABLE_HEADER_SESSION_STARTDATE' | translate}}</th>
</th> <th>{{'MANAGE_SESSION.TABLE_HEADER_SESSION_REMOTEHOST' | translate}}</th>
<th> <th>{{'MANAGE_SESSION.TABLE_HEADER_SESSION_CONNECTION_NAME' | translate}}</th>
{{'MANAGE_SESSION.TABLE_HEADER_SESSION_STARTDATE' | translate}}
</th>
<th>
{{'MANAGE_SESSION.TABLE_HEADER_SESSION_REMOTEHOST' | translate}}
</th>
<th>
{{'MANAGE_SESSION.TABLE_HEADER_SESSION_CONNECTION_NAME' | translate}}
</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -62,23 +52,16 @@ THE SOFTWARE.
<td> <td>
<input ng-change="wrapperSelectionChange(wrapper)" type="checkbox" ng-model="wrapper.checked" /> <input ng-change="wrapperSelectionChange(wrapper)" type="checkbox" ng-model="wrapper.checked" />
</td> </td>
<td> <td>{{wrapper.tunnel.username}}</td>
{{wrapper.tunnel.username}} <td>{{wrapper.tunnel.startDate | date:'short'}}</td>
</td> <td>{{wrapper.tunnel.remoteHost}}</td>
<td> <td>{{connections[wrapper.tunnel.identifier].name}}</td>
{{wrapper.tunnel.startDate | date:'short'}}
</td>
<td>
{{wrapper.tunnel.remoteHost}}
</td>
<td>
{{connections[wrapper.tunnel.identifier].name}}
</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<!-- Pager for session list -->
<guac-pager page="wrapperPage" page-size="25" items="wrappers | orderBy : 'username'"></guac-pager> <guac-pager page="wrapperPage" page-size="25" items="wrappers | orderBy : 'username'"></guac-pager>
</div> </div>
</div>
</div> </div>

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

@@ -28,13 +28,11 @@ THE SOFTWARE.
</div> </div>
<!-- User management --> <!-- User management -->
<div class="settings section" ng-show="canManageUsers"> <div class="settings section users">
<div class="users">
<p>{{'MANAGE_USER.HELP_USERS' | translate}}</p> <p>{{'MANAGE_USER.HELP_USERS' | translate}}</p>
<!-- User creation form --> <!-- Form action buttons -->
<div class="user-add-form" ng-show="canCreateUsers"> <div class="action-buttons" ng-show="canCreateUsers">
<input type="text" ng-model="newUsername" class="name username" autocorrect="off" autocapitalize="off"/> <input type="text" ng-model="newUsername" class="name username" autocorrect="off" autocapitalize="off"/>
<button class="add-user" ng-click="newUser()">{{'MANAGE_USER.ACTION_NEW_USER' | translate}}</button> <button class="add-user" ng-click="newUser()">{{'MANAGE_USER.ACTION_NEW_USER' | translate}}</button>
</div> </div>
@@ -53,8 +51,6 @@ THE SOFTWARE.
<!-- Pager controls for user list --> <!-- Pager controls for user list -->
<guac-pager page="userPage" page-size="25" items="users | orderBy : 'username'"></guac-pager> <guac-pager page="userPage" page-size="25" items="users | orderBy : 'username'"></guac-pager>
</div>
</div> </div>
</div> </div>

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

@@ -11,8 +11,8 @@
"ACTION_LOGIN" : "Login", "ACTION_LOGIN" : "Login",
"ACTION_LOGOUT" : "Logout", "ACTION_LOGOUT" : "Logout",
"ACTION_MANAGE_CONNECTIONS" : "Manage Connections", "ACTION_MANAGE_CONNECTIONS" : "Manage Connections",
"ACTION_MANAGE_SESSIONS" : "Manage Sessions", "ACTION_MANAGE_SESSIONS" : "Active Sessions",
"ACTION_MANAGE_USERS" : "Manage Users", "ACTION_MANAGE_USERS" : "Users",
"ACTION_NAVIGATE_BACK" : "Back", "ACTION_NAVIGATE_BACK" : "Back",
"ACTION_NAVIGATE_HOME" : "Home", "ACTION_NAVIGATE_HOME" : "Home",
"ACTION_SAVE" : "Save", "ACTION_SAVE" : "Save",