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-963: Add back and disconnect buttons.

Browse Source
This commit is contained in:
Michael Jumper
2014-12-29 21:24:37 -08:00
parent 17f272689b
commit 42f360a02b
4 changed files with 36 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
guacamole/src/main/webapp/app/client/controllers/clientController.js
View File

@@ -497,6 +497,20 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
return $scope.client.clientProperties.minZoom >= 1; return $scope.client.clientProperties.minZoom >= 1;
}; };
/**
* Immediately disconnects the currently-connected client, if any.
*/
$scope.disconnect = function disconnect() {
// Disconnect if client is available
if ($scope.client)
$scope.client.client.disconnect();
// Hide menu
$scope.menuShown = false;
};
/** /**
* Returns a progress object, as required by $scope.addNotification(), which * Returns a progress object, as required by $scope.addNotification(), which
* contains the given number of bytes as an appropriate combination of * contains the given number of bytes as an appropriate combination of

12
guacamole/src/main/webapp/app/client/styles/menu.css
View File

@@ -37,8 +37,12 @@
transition: left 0.125s, opacity 0.125s; transition: left 0.125s, opacity 0.125s;
} }
#menu h3 {
margin: 1em;
}
#menu .content { #menu .content {
padding: 1em; margin: 1em;
} }
#menu .content > * { #menu .content > * {
@@ -65,6 +69,7 @@
border-radius: 0.25em; border-radius: 0.25em;
white-space: pre; white-space: pre;
display: block; display: block;
font-size: 1em;
} }
#menu #mouse-settings .choice { #menu #mouse-settings .choice {
@@ -94,11 +99,6 @@
margin: 1em auto; margin: 1em auto;
} }
#menu h2 {
padding: 0.25em 0.5em;
font-size: 1em;
}
#menu #keyboard-settings .figure { #menu #keyboard-settings .figure {
float: right; float: right;
max-width: 30%; max-width: 30%;

15
guacamole/src/main/webapp/app/client/templates/client.html
View File

@@ -54,13 +54,20 @@
<!-- Menu --> <!-- Menu -->
<div ng-class="{open: menuShown}" id="menu" guac-touch-drag="menuDrag" guac-scroll="menuScrollState"> <div ng-class="{open: menuShown}" id="menu" guac-touch-drag="menuDrag" guac-scroll="menuScrollState">
<h2>{{'CLIENT.SECTION_HEADER_CLIPBOARD' | translate}}</h2>
<div class="logout-panel">
<a class="back button" href="#/">{{'CLIENT.ACTION_NAVIGATE_BACK' | translate}}</a>
<a class="disconnect danger button" ng-click="disconnect()">{{'CLIENT.ACTION_DISCONNECT' | translate}}</a>
</div>
<h2>NAME</h2>
<h3>{{'CLIENT.SECTION_HEADER_CLIPBOARD' | translate}}</h3>
<div class="content" id="clipboard-settings"> <div class="content" id="clipboard-settings">
<p class="description">{{'CLIENT.HELP_CLIPBOARD' | translate}}</p> <p class="description">{{'CLIENT.HELP_CLIPBOARD' | translate}}</p>
<textarea ng-model="client.clipboardData" rows="10" cols="40" id="clipboard"></textarea> <textarea ng-model="client.clipboardData" rows="10" cols="40" id="clipboard"></textarea>
</div> </div>
<h2>{{'CLIENT.SECTION_HEADER_INPUT_METHOD' | translate}}</h2> <h3>{{'CLIENT.SECTION_HEADER_INPUT_METHOD' | translate}}</h3>
<div class="content" id="keyboard-settings"> <div class="content" id="keyboard-settings">
<!-- No IME --> <!-- No IME -->
@@ -84,7 +91,7 @@
</div> </div>
<h2>{{'CLIENT.SECTION_HEADER_MOUSE_MODE' | translate}}</h2> <h3>{{'CLIENT.SECTION_HEADER_MOUSE_MODE' | translate}}</h3>
<div class="content" id="mouse-settings"> <div class="content" id="mouse-settings">
<p class="description">{{'CLIENT.HELP_MOUSE_MODE' | translate}}</p> <p class="description">{{'CLIENT.HELP_MOUSE_MODE' | translate}}</p>
@@ -108,7 +115,7 @@
</div> </div>
<h2>{{'CLIENT.SECTION_HEADER_DISPLAY' | translate}}</h2> <h3>{{'CLIENT.SECTION_HEADER_DISPLAY' | translate}}</h3>
<div class="content"> <div class="content">
<div id="zoom-settings"> <div id="zoom-settings">
<div ng-click="zoomOut()" id="zoom-out"><img src="images/settings/zoom-out.png" alt="-"/></div> <div ng-click="zoomOut()" id="zoom-out"><img src="images/settings/zoom-out.png" alt="-"/></div>

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

@@ -19,6 +19,8 @@
"ACTION_RECONNECT" : "Reconnect", "ACTION_RECONNECT" : "Reconnect",
"ACTION_ACKNOWLEDGE" : "@:APP.ACTION_ACKNOWLEDGE", "ACTION_ACKNOWLEDGE" : "@:APP.ACTION_ACKNOWLEDGE",
"ACTION_DISCONNECT" : "Disconnect",
"ACTION_NAVIGATE_BACK" : "@:APP.ACTION_NAVIGATE_BACK",
"ACTION_SAVE_FILE" : "@:APP.ACTION_SAVE", "ACTION_SAVE_FILE" : "@:APP.ACTION_SAVE",
"DIALOG_HEADER_CONNECTING" : "Connecting", "DIALOG_HEADER_CONNECTING" : "Connecting",