-
diff --git a/guacamole/src/main/webapp/app/settings/controllers/settingsController.js b/guacamole/src/main/webapp/app/settings/controllers/settingsController.js
index ce1a26aef..7608f5f9a 100644
--- a/guacamole/src/main/webapp/app/settings/controllers/settingsController.js
+++ b/guacamole/src/main/webapp/app/settings/controllers/settingsController.js
@@ -46,6 +46,17 @@ angular.module('manage').controller('settingsController', ['$scope', '$injector'
*/
$scope.activeTab = $routeParams.tab;
+ /**
+ * Returns whether the list of all available settings tabs should be shown.
+ *
+ * @returns {Boolean}
+ * true if the list of available settings tabs should be shown, false
+ * otherwise.
+ */
+ $scope.showAvailableTabs = function showAvailableTabs() {
+ return !!$scope.settingsPages && $scope.settingsPages.length > 1;
+ };
+
// Retrieve settings pages
userPageService.getSettingsPages()
.then(function settingsPagesRetrieved(pages) {
diff --git a/guacamole/src/main/webapp/app/settings/directives/guacSettingsPreferences.js b/guacamole/src/main/webapp/app/settings/directives/guacSettingsPreferences.js
new file mode 100644
index 000000000..4a5e0e194
--- /dev/null
+++ b/guacamole/src/main/webapp/app/settings/directives/guacSettingsPreferences.js
@@ -0,0 +1,167 @@
+/*
+ * 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 for managing preferences local to the current user.
+ */
+angular.module('settings').directive('guacSettingsPreferences', [function guacSettingsPreferences() {
+
+ return {
+ // Element only
+ restrict: 'E',
+ replace: true,
+
+ scope: {
+ },
+
+ templateUrl: 'app/settings/templates/settingsPreferences.html',
+ controller: ['$scope', '$injector', function settingsPreferencesController($scope, $injector) {
+
+ // Get required types
+ var PermissionSet = $injector.get('PermissionSet');
+
+ // Required services
+ var authenticationService = $injector.get('authenticationService');
+ var guacNotification = $injector.get('guacNotification');
+ var userService = $injector.get('userService');
+ var permissionService = $injector.get('permissionService');
+ var preferenceService = $injector.get('preferenceService');
+
+ /**
+ * An action to be provided along with the object sent to
+ * showStatus which closes the currently-shown status dialog.
+ */
+ var ACKNOWLEDGE_ACTION = {
+ name : 'SETTINGS_PREFERENCES.ACTION_ACKNOWLEDGE',
+ // Handle action
+ callback : function acknowledgeCallback() {
+ guacNotification.showStatus(false);
+ }
+ };
+
+ /**
+ * The username of the current user.
+ *
+ * @type String
+ */
+ var username = authenticationService.getCurrentUserID();
+
+ /**
+ * All currently-set preferences, or their defaults if not yet set.
+ *
+ * @type Object.
+ */
+ $scope.preferences = preferenceService.preferences;
+
+ /**
+ * The new password for the user.
+ *
+ * @type String
+ */
+ $scope.newPassword = null;
+
+ /**
+ * The password match for the user. The update password action will
+ * fail if $scope.newPassword !== $scope.passwordMatch.
+ *
+ * @type String
+ */
+ $scope.newPasswordMatch = null;
+
+ /**
+ * Whether the current user can change their own password, or null
+ * if this is not yet known.
+ *
+ * @type Boolean
+ */
+ $scope.canChangePassword = null;
+
+ /**
+ * Update the current user's password to the password currently set within
+ * the password change dialog.
+ */
+ $scope.updatePassword = function updatePassword() {
+
+ // Verify passwords match
+ if ($scope.newPasswordMatch !== $scope.newPassword) {
+ guacNotification.showStatus({
+ className : 'error',
+ title : 'SETTINGS_PREFERENCES.DIALOG_HEADER_ERROR',
+ text : 'SETTINGS_PREFERENCES.ERROR_PASSWORD_MISMATCH',
+ actions : [ ACKNOWLEDGE_ACTION ]
+ });
+ return;
+ }
+
+ // Verify that the new password is not blank
+ if (!$scope.newPassword) {
+ guacNotification.showStatus({
+ className : 'error',
+ title : 'SETTINGS_PREFERENCES.DIALOG_HEADER_ERROR',
+ text : 'SETTINGS_PREFERENCES.ERROR_PASSWORD_BLANK',
+ actions : [ ACKNOWLEDGE_ACTION ]
+ });
+ return;
+ }
+
+ // Save the user with the new password
+ userService.updateUserPassword(username, $scope.oldPassword, $scope.newPassword)
+ .success(function passwordUpdated() {
+
+ // Clear the password fields
+ $scope.oldPassword = null;
+ $scope.newPassword = null;
+ $scope.newPasswordMatch = null;
+
+ // Indicate that the password has been changed
+ guacNotification.showStatus({
+ text : 'SETTINGS_PREFERENCES.INFO_PASSWORD_CHANGED',
+ actions : [ ACKNOWLEDGE_ACTION ]
+ });
+ })
+
+ // Notify of any errors
+ .error(function passwordUpdateFailed(error) {
+ guacNotification.showStatus({
+ className : 'error',
+ title : 'SETTINGS_PREFERENCES.DIALOG_HEADER_ERROR',
+ 'text' : error.message,
+ actions : [ ACKNOWLEDGE_ACTION ]
+ });
+ });
+
+ };
+
+ // Retrieve current permissions
+ permissionService.getPermissions(username)
+ .success(function permissionsRetrieved(permissions) {
+
+ // Add action for changing password if permission is granted
+ $scope.canChangePassword = PermissionSet.hasUserPermission(permissions,
+ PermissionSet.ObjectPermissionType.UPDATE, username);
+
+ });
+
+ }]
+ };
+
+}]);
diff --git a/guacamole/src/main/webapp/app/settings/services/preferenceService.js b/guacamole/src/main/webapp/app/settings/services/preferenceService.js
new file mode 100644
index 000000000..3f2d79fd3
--- /dev/null
+++ b/guacamole/src/main/webapp/app/settings/services/preferenceService.js
@@ -0,0 +1,117 @@
+/*
+ * 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 service for setting and retrieving browser-local preferences. Preferences
+ * may be any JSON-serializable type.
+ */
+angular.module('settings').factory('preferenceService', ['$injector',
+ function preferenceService($injector) {
+
+ // Required services
+ var $window = $injector.get('$window');
+ var $rootScope = $injector.get('$rootScope');
+
+ var service = {};
+
+ // The parameter name for getting the history from local storage
+ var GUAC_PREFERENCES_STORAGE_KEY = "GUAC_PREFERENCES";
+
+ /**
+ * All currently-set preferences, as name/value pairs. Each property name
+ * corresponds to the name of a preference.
+ *
+ * @type Object.
+ */
+ service.preferences = {
+
+ /**
+ * Whether translation of touch to mouse events should emulate an
+ * absolute pointer device, or a relative pointer device.
+ *
+ * @type Boolean
+ */
+ emulateAbsoluteMouse : true,
+
+ /**
+ * The default input method. This may be either "none", "osk", or
+ * "text".
+ *
+ * @type String
+ */
+ inputMethod : null
+
+ };
+
+ /**
+ * Persists the current values of all preferences, if possible.
+ */
+ service.save = function save() {
+
+ // Save updated preferences, ignore inability to use localStorage
+ try {
+ if (localStorage)
+ localStorage.setItem(GUAC_PREFERENCES_STORAGE_KEY, JSON.stringify(service.preferences));
+ }
+ catch (ignore) {}
+
+ };
+
+ // Get stored preferences, ignore inability to use localStorage
+ try {
+
+ if (localStorage) {
+ var preferencesJSON = localStorage.getItem(GUAC_PREFERENCES_STORAGE_KEY);
+ if (preferencesJSON)
+ service.preferences = JSON.parse(preferencesJSON);
+ }
+
+ }
+ catch (ignore) {}
+
+ // Choose reasonable default input method based on best-guess at platform
+ if (service.preferences.inputMethod === null) {
+
+ // Use text input by default if platform likely lacks physical keyboard
+ if (/android|ipad|iphone/i.test(navigator.userAgent))
+ service.preferences.inputMethod = 'text';
+ else
+ service.preferences.inputMethod = 'none';
+
+ }
+
+ // Persist settings when window is unloaded
+ $window.addEventListener('unload', service.save);
+
+ // Persist settings upon navigation
+ $rootScope.$on('$routeChangeSuccess', function handleNavigate() {
+ service.save();
+ });
+
+ // Persist settings upon logout
+ $rootScope.$on('guacLogout', function handleLogout() {
+ service.save();
+ });
+
+ return service;
+
+}]);
diff --git a/guacamole/src/main/webapp/app/manage/styles/buttons.css b/guacamole/src/main/webapp/app/settings/styles/buttons.css
similarity index 100%
rename from guacamole/src/main/webapp/app/manage/styles/buttons.css
rename to guacamole/src/main/webapp/app/settings/styles/buttons.css
diff --git a/guacamole/src/main/webapp/app/settings/styles/input-method.css b/guacamole/src/main/webapp/app/settings/styles/input-method.css
new file mode 100644
index 000000000..39e12e323
--- /dev/null
+++ b/guacamole/src/main/webapp/app/settings/styles/input-method.css
@@ -0,0 +1,26 @@
+/*
+ * 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.
+ */
+
+.preferences .input-method .caption {
+ margin-left: 2em;
+ margin-right: 2em;
+}
diff --git a/guacamole/src/main/webapp/app/settings/styles/mouse-mode.css b/guacamole/src/main/webapp/app/settings/styles/mouse-mode.css
new file mode 100644
index 000000000..ff37b1d89
--- /dev/null
+++ b/guacamole/src/main/webapp/app/settings/styles/mouse-mode.css
@@ -0,0 +1,47 @@
+/*
+ * 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.
+ */
+
+.preferences .mouse-mode .choices {
+ text-align: center;
+}
+
+.preferences .mouse-mode .choice {
+ display: inline-block;
+}
+
+.preferences .mouse-mode .choice .figure {
+ display: inline-block;
+ vertical-align: middle;
+ width: 75%;
+ max-width: 320px;
+}
+
+.preferences .mouse-mode .figure img {
+ display: block;
+ width: 100%;
+ max-width: 320px;
+ margin: 1em auto;
+}
+
+.preferences .mouse-mode .caption {
+ text-align: left;
+}
diff --git a/guacamole/src/main/webapp/app/settings/styles/settings.css b/guacamole/src/main/webapp/app/settings/styles/settings.css
index 961fdc5a0..67453a266 100644
--- a/guacamole/src/main/webapp/app/settings/styles/settings.css
+++ b/guacamole/src/main/webapp/app/settings/styles/settings.css
@@ -32,7 +32,7 @@
.settings .action-buttons {
text-align: center;
- margin-bottom: 1em;
+ margin: 1em 0;
}
.settings-tabs .page-list {
diff --git a/guacamole/src/main/webapp/app/settings/styles/update-password.css b/guacamole/src/main/webapp/app/settings/styles/update-password.css
new file mode 100644
index 000000000..3cf4d6332
--- /dev/null
+++ b/guacamole/src/main/webapp/app/settings/styles/update-password.css
@@ -0,0 +1,26 @@
+/*
+ * 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.
+ */
+
+.preferences .update-password .form {
+ padding-left: 0.5em;
+ border-left: 3px solid rgba(0, 0, 0, 0.125);
+}
diff --git a/guacamole/src/main/webapp/app/settings/templates/settings.html b/guacamole/src/main/webapp/app/settings/templates/settings.html
index 59ac3d35e..3c7f26e84 100644
--- a/guacamole/src/main/webapp/app/settings/templates/settings.html
+++ b/guacamole/src/main/webapp/app/settings/templates/settings.html
@@ -29,12 +29,13 @@ THE SOFTWARE.
-
+
+
diff --git a/guacamole/src/main/webapp/app/settings/templates/settingsPreferences.html b/guacamole/src/main/webapp/app/settings/templates/settingsPreferences.html
new file mode 100644
index 000000000..d2b0a63cf
--- /dev/null
+++ b/guacamole/src/main/webapp/app/settings/templates/settingsPreferences.html
@@ -0,0 +1,106 @@
+