From e3210fc64ecf65d7fd3cdd0190eddc1d1bc1e29f Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Fri, 17 Apr 2015 21:08:34 -0700 Subject: [PATCH] GUAC-1053: Move settings-specific things into own namespace. --- ...nections.js => guacSettingsConnections.js} | 8 +- ...ageSessions.js => guacSettingsSessions.js} | 21 ++-- .../{manageUsers.js => guacSettingsUsers.js} | 10 +- .../app/settings/templates/connection.html | 2 +- .../app/settings/templates/settings.html | 8 +- ...nections.html => settingsConnections.html} | 6 +- ...ageSessions.html => settingsSessions.html} | 16 +-- .../{manageUsers.html => settingsUsers.html} | 4 +- .../src/main/webapp/translations/en_US.json | 107 +++++++++++------- 9 files changed, 100 insertions(+), 82 deletions(-) rename guacamole/src/main/webapp/app/settings/directives/{manageConnections.js => guacSettingsConnections.js} (95%) rename guacamole/src/main/webapp/app/settings/directives/{manageSessions.js => guacSettingsSessions.js} (94%) rename guacamole/src/main/webapp/app/settings/directives/{manageUsers.js => guacSettingsUsers.js} (94%) rename guacamole/src/main/webapp/app/settings/templates/{manageConnections.html => settingsConnections.html} (86%) rename guacamole/src/main/webapp/app/settings/templates/{manageSessions.html => settingsSessions.html} (81%) rename guacamole/src/main/webapp/app/settings/templates/{manageUsers.html => settingsUsers.html} (92%) diff --git a/guacamole/src/main/webapp/app/settings/directives/manageConnections.js b/guacamole/src/main/webapp/app/settings/directives/guacSettingsConnections.js similarity index 95% rename from guacamole/src/main/webapp/app/settings/directives/manageConnections.js rename to guacamole/src/main/webapp/app/settings/directives/guacSettingsConnections.js index 1be07b656..a900aed11 100644 --- a/guacamole/src/main/webapp/app/settings/directives/manageConnections.js +++ b/guacamole/src/main/webapp/app/settings/directives/guacSettingsConnections.js @@ -23,7 +23,7 @@ /** * A directive for managing all connections and connection groups in the system. */ -angular.module('settings').directive('guacManageConnections', [function guacManageConnections() { +angular.module('settings').directive('guacSettingsConnections', [function guacSettingsConnections() { return { // Element only @@ -33,8 +33,8 @@ angular.module('settings').directive('guacManageConnections', [function guacMana scope: { }, - templateUrl: 'app/settings/templates/manageConnections.html', - controller: ['$scope', '$injector', function manageConnectionsController($scope, $injector) { + templateUrl: 'app/settings/templates/settingsConnections.html', + controller: ['$scope', '$injector', function settingsConnectionsController($scope, $injector) { // Required types var ConnectionGroup = $injector.get('ConnectionGroup'); @@ -55,7 +55,7 @@ angular.module('settings').directive('guacManageConnections', [function guacMana * showStatus which closes the currently-shown status dialog. */ var ACKNOWLEDGE_ACTION = { - name : "MANAGE_CONNECTION.ACTION_ACKNOWLEDGE", + name : "SETTINGS_CONNECTIONS.ACTION_ACKNOWLEDGE", // Handle action callback : function acknowledgeCallback() { guacNotification.showStatus(false); diff --git a/guacamole/src/main/webapp/app/settings/directives/manageSessions.js b/guacamole/src/main/webapp/app/settings/directives/guacSettingsSessions.js similarity index 94% rename from guacamole/src/main/webapp/app/settings/directives/manageSessions.js rename to guacamole/src/main/webapp/app/settings/directives/guacSettingsSessions.js index 7375f5dba..e478fbd69 100644 --- a/guacamole/src/main/webapp/app/settings/directives/manageSessions.js +++ b/guacamole/src/main/webapp/app/settings/directives/guacSettingsSessions.js @@ -23,7 +23,7 @@ /** * A directive for managing all active Guacamole sessions. */ -angular.module('settings').directive('guacManageSessions', [function guacManageSessions() { +angular.module('settings').directive('guacSettingsSessions', [function guacSettingsSessions() { return { // Element only @@ -33,9 +33,8 @@ angular.module('settings').directive('guacManageSessions', [function guacManageS scope: { }, - templateUrl: 'app/settings/templates/manageSessions.html', - controller: ['$scope', '$injector', - function manageSessionsController($scope, $injector) { + templateUrl: 'app/settings/templates/settingsSessions.html', + controller: ['$scope', '$injector', function settingsSessionsController($scope, $injector) { // Required types var ActiveConnectionWrapper = $injector.get('ActiveConnectionWrapper'); @@ -218,7 +217,7 @@ angular.module('settings').directive('guacManageSessions', [function guacManageS }); // Get session date format - $translate('MANAGE_SESSION.FORMAT_STARTDATE').then(function sessionDateFormatReceived(retrievedSessionDateFormat) { + $translate('SETTINGS_SESSIONS.FORMAT_STARTDATE').then(function sessionDateFormatReceived(retrievedSessionDateFormat) { // Store received date format sessionDateFormat = retrievedSessionDateFormat; @@ -248,7 +247,7 @@ angular.module('settings').directive('guacManageSessions', [function guacManageS * showStatus which closes the currently-shown status dialog. */ var ACKNOWLEDGE_ACTION = { - name : "MANAGE_SESSION.ACTION_ACKNOWLEDGE", + name : "SETTINGS_SESSIONS.ACTION_ACKNOWLEDGE", // Handle action callback : function acknowledgeCallback() { guacNotification.showStatus(false); @@ -260,7 +259,7 @@ angular.module('settings').directive('guacManageSessions', [function guacManageS * showStatus which closes the currently-shown status dialog. */ var CANCEL_ACTION = { - name : "MANAGE_SESSION.ACTION_CANCEL", + name : "SETTINGS_SESSIONS.ACTION_CANCEL", // Handle action callback : function cancelCallback() { guacNotification.showStatus(false); @@ -273,7 +272,7 @@ angular.module('settings').directive('guacManageSessions', [function guacManageS * sessions. */ var DELETE_ACTION = { - name : "MANAGE_SESSION.ACTION_DELETE", + name : "SETTINGS_SESSIONS.ACTION_DELETE", className : "danger", // Handle action callback : function deleteCallback() { @@ -306,7 +305,7 @@ angular.module('settings').directive('guacManageSessions', [function guacManageS .error(function activeConnectionDeletionFailed(error) { guacNotification.showStatus({ 'className' : 'error', - 'title' : 'MANAGE_SESSION.DIALOG_HEADER_ERROR', + 'title' : 'SETTINGS_SESSIONS.DIALOG_HEADER_ERROR', 'text' : error.message, 'actions' : [ ACKNOWLEDGE_ACTION ] }); @@ -321,8 +320,8 @@ angular.module('settings').directive('guacManageSessions', [function guacManageS $scope.deleteSessions = function deleteSessions() { // Confirm deletion request guacNotification.showStatus({ - 'title' : 'MANAGE_SESSION.DIALOG_HEADER_CONFIRM_DELETE', - 'text' : 'MANAGE_SESSION.TEXT_CONFIRM_DELETE', + 'title' : 'SETTINGS_SESSIONS.DIALOG_HEADER_CONFIRM_DELETE', + 'text' : 'SETTINGS_SESSIONS.TEXT_CONFIRM_DELETE', 'actions' : [ DELETE_ACTION, CANCEL_ACTION] }); }; diff --git a/guacamole/src/main/webapp/app/settings/directives/manageUsers.js b/guacamole/src/main/webapp/app/settings/directives/guacSettingsUsers.js similarity index 94% rename from guacamole/src/main/webapp/app/settings/directives/manageUsers.js rename to guacamole/src/main/webapp/app/settings/directives/guacSettingsUsers.js index 093302a34..20c877b46 100644 --- a/guacamole/src/main/webapp/app/settings/directives/manageUsers.js +++ b/guacamole/src/main/webapp/app/settings/directives/guacSettingsUsers.js @@ -23,7 +23,7 @@ /** * A directive for managing all users in the system. */ -angular.module('settings').directive('guacManageUsers', [function guacManageUsers() { +angular.module('settings').directive('guacSettingsUsers', [function guacSettingsUsers() { return { // Element only @@ -33,8 +33,8 @@ angular.module('settings').directive('guacManageUsers', [function guacManageUser scope: { }, - templateUrl: 'app/settings/templates/manageUsers.html', - controller: ['$scope', '$injector', function manageUsersController($scope, $injector) { + templateUrl: 'app/settings/templates/settingsUsers.html', + controller: ['$scope', '$injector', function settingsUsersController($scope, $injector) { // Required types var PermissionSet = $injector.get('PermissionSet'); @@ -55,7 +55,7 @@ angular.module('settings').directive('guacManageUsers', [function guacManageUser * showStatus which closes the currently-shown status dialog. */ var ACKNOWLEDGE_ACTION = { - name : "MANAGE_USER.ACTION_ACKNOWLEDGE", + name : "SETTINGS_USERS.ACTION_ACKNOWLEDGE", // Handle action callback : function acknowledgeCallback() { guacNotification.showStatus(false); @@ -175,7 +175,7 @@ angular.module('settings').directive('guacManageUsers', [function guacManageUser .error(function userCreationFailed(error) { guacNotification.showStatus({ 'className' : 'error', - 'title' : 'MANAGE_USER.DIALOG_HEADER_ERROR', + 'title' : 'SETTINGS_USERS.DIALOG_HEADER_ERROR', 'text' : error.message, 'actions' : [ ACKNOWLEDGE_ACTION ] }); diff --git a/guacamole/src/main/webapp/app/settings/templates/connection.html b/guacamole/src/main/webapp/app/settings/templates/connection.html index b96e3dfa7..97960a2dd 100644 --- a/guacamole/src/main/webapp/app/settings/templates/connection.html +++ b/guacamole/src/main/webapp/app/settings/templates/connection.html @@ -33,7 +33,7 @@ - {{'MANAGE_CONNECTION.INFO_ACTIVE_USER_COUNT' | translate:'{USERS: item.getActiveConnections()}'}} + {{'SETTINGS_CONNECTIONS.INFO_ACTIVE_USER_COUNT' | translate:'{USERS: item.getActiveConnections()}'}} diff --git a/guacamole/src/main/webapp/app/settings/templates/settings.html b/guacamole/src/main/webapp/app/settings/templates/settings.html index 4caefed64..59ac3d35e 100644 --- a/guacamole/src/main/webapp/app/settings/templates/settings.html +++ b/guacamole/src/main/webapp/app/settings/templates/settings.html @@ -23,7 +23,7 @@ THE SOFTWARE.
-

{{'MANAGE_SETTINGS.SECTION_HEADER_MANAGE_SETTINGS' | translate}}

+

{{'SETTINGS.SECTION_HEADER_SETTINGS' | translate}}

@@ -33,8 +33,8 @@ THE SOFTWARE.
- - - + + + diff --git a/guacamole/src/main/webapp/app/settings/templates/manageConnections.html b/guacamole/src/main/webapp/app/settings/templates/settingsConnections.html similarity index 86% rename from guacamole/src/main/webapp/app/settings/templates/manageConnections.html rename to guacamole/src/main/webapp/app/settings/templates/settingsConnections.html index 444865eca..38860b259 100644 --- a/guacamole/src/main/webapp/app/settings/templates/manageConnections.html +++ b/guacamole/src/main/webapp/app/settings/templates/settingsConnections.html @@ -22,18 +22,18 @@ --> -

{{'MANAGE_CONNECTION.HELP_CONNECTIONS' | translate}}

+

{{'SETTINGS_CONNECTIONS.HELP_CONNECTIONS' | translate}}

{{'MANAGE_CONNECTION.ACTION_NEW_CONNECTION' | translate}} + href="#/manage/connections/">{{'SETTINGS_CONNECTIONS.ACTION_NEW_CONNECTION' | translate}} {{'MANAGE_CONNECTION.ACTION_NEW_CONNECTION_GROUP' | translate}} + href="#/manage/connectionGroups/">{{'SETTINGS_CONNECTIONS.ACTION_NEW_CONNECTION_GROUP' | translate}}
diff --git a/guacamole/src/main/webapp/app/settings/templates/manageSessions.html b/guacamole/src/main/webapp/app/settings/templates/settingsSessions.html similarity index 81% rename from guacamole/src/main/webapp/app/settings/templates/manageSessions.html rename to guacamole/src/main/webapp/app/settings/templates/settingsSessions.html index 3c1b1aff1..405c9d332 100644 --- a/guacamole/src/main/webapp/app/settings/templates/manageSessions.html +++ b/guacamole/src/main/webapp/app/settings/templates/settingsSessions.html @@ -22,16 +22,16 @@ --> -

{{'MANAGE_SESSION.HELP_SESSIONS' | translate}}

+

{{'SETTINGS_SESSIONS.HELP_SESSIONS' | translate}}

- +
@@ -40,16 +40,16 @@ - {{'MANAGE_SESSION.TABLE_HEADER_SESSION_USERNAME' | translate}} + {{'SETTINGS_SESSIONS.TABLE_HEADER_SESSION_USERNAME' | translate}} - {{'MANAGE_SESSION.TABLE_HEADER_SESSION_STARTDATE' | translate}} + {{'SETTINGS_SESSIONS.TABLE_HEADER_SESSION_STARTDATE' | translate}} - {{'MANAGE_SESSION.TABLE_HEADER_SESSION_REMOTEHOST' | translate}} + {{'SETTINGS_SESSIONS.TABLE_HEADER_SESSION_REMOTEHOST' | translate}} - {{'MANAGE_SESSION.TABLE_HEADER_SESSION_CONNECTION_NAME' | translate}} + {{'SETTINGS_SESSIONS.TABLE_HEADER_SESSION_CONNECTION_NAME' | translate}} @@ -68,7 +68,7 @@

- {{'MANAGE_SESSION.INFO_NO_SESSIONS' | translate}} + {{'SETTINGS_SESSIONS.INFO_NO_SESSIONS' | translate}}

diff --git a/guacamole/src/main/webapp/app/settings/templates/manageUsers.html b/guacamole/src/main/webapp/app/settings/templates/settingsUsers.html similarity index 92% rename from guacamole/src/main/webapp/app/settings/templates/manageUsers.html rename to guacamole/src/main/webapp/app/settings/templates/settingsUsers.html index 2ee778b21..79290cb07 100644 --- a/guacamole/src/main/webapp/app/settings/templates/manageUsers.html +++ b/guacamole/src/main/webapp/app/settings/templates/settingsUsers.html @@ -22,12 +22,12 @@ --> -

{{'MANAGE_USER.HELP_USERS' | translate}}

+

{{'SETTINGS_USERS.HELP_USERS' | translate}}

- +
diff --git a/guacamole/src/main/webapp/translations/en_US.json b/guacamole/src/main/webapp/translations/en_US.json index 1c4a69183..ddd336aea 100644 --- a/guacamole/src/main/webapp/translations/en_US.json +++ b/guacamole/src/main/webapp/translations/en_US.json @@ -155,8 +155,6 @@ "ACTION_CANCEL" : "@:APP.ACTION_CANCEL", "ACTION_CLONE" : "@:APP.ACTION_CLONE", "ACTION_DELETE" : "@:APP.ACTION_DELETE", - "ACTION_NEW_CONNECTION" : "New Connection", - "ACTION_NEW_CONNECTION_GROUP" : "New Group", "ACTION_SAVE" : "@:APP.ACTION_SAVE", "DIALOG_HEADER_CONFIRM_DELETE" : "Delete Connection", @@ -168,14 +166,10 @@ "FORMAT_HISTORY_START" : "@:APP.FORMAT_DATE_TIME_PRECISE", - "HELP_CONNECTIONS" : "Click or tap on a connection below to manage that connection. Depending on your access level, connections can be added and deleted, and their properties (protocol, hostname, port, etc.) can be changed.", - - "INFO_ACTIVE_USER_COUNT" : "@:APP.INFO_ACTIVE_USER_COUNT", "INFO_CONNECTION_DURATION_UNKNOWN" : "--", "INFO_CONNECTION_ACTIVE_NOW" : "Active Now", "INFO_CONNECTION_NOT_USED" : "This connection has not yet been used.", - "SECTION_HEADER_CONNECTIONS" : "Manage Connections", "SECTION_HEADER_EDIT_CONNECTION" : "Edit Connection", "SECTION_HEADER_HISTORY" : "Usage History", "SECTION_HEADER_PARAMETERS" : "Parameters", @@ -217,7 +211,6 @@ "ACTION_ACKNOWLEDGE" : "@:APP.ACTION_ACKNOWLEDGE", "ACTION_CANCEL" : "@:APP.ACTION_CANCEL", "ACTION_DELETE" : "@:APP.ACTION_DELETE", - "ACTION_NEW_USER" : "New User", "ACTION_SAVE" : "@:APP.ACTION_SAVE", "DIALOG_HEADER_CONFIRM_DELETE" : "Delete User", @@ -234,51 +227,14 @@ "FIELD_HEADER_PASSWORD_AGAIN" : "@:APP.FIELD_HEADER_PASSWORD_AGAIN", "FIELD_HEADER_USERNAME" : "Username:", - "HELP_USERS" : "Click or tap on a user below to manage that user. Depending on your access level, users can be added and deleted, and their passwords can be changed.", - "SECTION_HEADER_CONNECTIONS" : "Connections", "SECTION_HEADER_EDIT_USER" : "Edit User", "SECTION_HEADER_PERMISSIONS" : "Permissions", - "SECTION_HEADER_USERS" : "Users", "TEXT_CONFIRM_DELETE" : "Users cannot be restored after they have been deleted. Are you sure you want to delete this user?" }, - "MANAGE_SESSION" : { - - "ACTION_ACKNOWLEDGE" : "@:APP.ACTION_ACKNOWLEDGE", - "ACTION_CANCEL" : "@:APP.ACTION_CANCEL", - "ACTION_DELETE" : "Kill Sessions", - - "DIALOG_HEADER_CONFIRM_DELETE" : "Kill Sessions", - "DIALOG_HEADER_ERROR" : "Error", - - "FIELD_PLACEHOLDER_FILTER" : "Filter", - - "FORMAT_STARTDATE" : "@:APP.FORMAT_DATE_TIME_PRECISE", - - "HELP_SESSIONS" : "All currently-active Guacamole sessions are listed here. If you wish to kill one or more sessions, check the box next to those sessions and click \"Kill Sessions\". Killing a session will immediately disconnect the user from the associated connection.", - - "INFO_NO_SESSIONS" : "No active sessions", - - "SECTION_HEADER_SESSIONS" : "Active Sessions", - - "TABLE_HEADER_SESSION_USERNAME" : "Username", - "TABLE_HEADER_SESSION_STARTDATE" : "Active since", - "TABLE_HEADER_SESSION_REMOTEHOST" : "Remote host", - "TABLE_HEADER_SESSION_CONNECTION_NAME" : "Connection name", - - "TEXT_CONFIRM_DELETE" : "Are you sure you want to kill all selected sessions? The users using these sessions will be immediately disconnected." - - }, - - "MANAGE_SETTINGS" : { - - "SECTION_HEADER_MANAGE_SETTINGS" : "Settings" - - }, - "PROTOCOL_RDP" : { "FIELD_HEADER_COLOR_DEPTH" : "Color depth:", @@ -421,6 +377,69 @@ }, + "SETTINGS" : { + + "SECTION_HEADER_SETTINGS" : "Settings" + + }, + + "SETTINGS_CONNECTIONS" : { + + "ACTION_ACKNOWLEDGE" : "@:APP.ACTION_ACKNOWLEDGE", + "ACTION_NEW_CONNECTION" : "New Connection", + "ACTION_NEW_CONNECTION_GROUP" : "New Group", + + "DIALOG_HEADER_ERROR" : "Error", + + "HELP_CONNECTIONS" : "Click or tap on a connection below to manage that connection. Depending on your access level, connections can be added and deleted, and their properties (protocol, hostname, port, etc.) can be changed.", + + "INFO_ACTIVE_USER_COUNT" : "@:APP.INFO_ACTIVE_USER_COUNT", + + "SECTION_HEADER_CONNECTIONS" : "Manage Connections" + + }, + + "SETTINGS_USERS" : { + + "ACTION_ACKNOWLEDGE" : "@:APP.ACTION_ACKNOWLEDGE", + "ACTION_NEW_USER" : "New User", + + "DIALOG_HEADER_ERROR" : "Error", + + "HELP_USERS" : "Click or tap on a user below to manage that user. Depending on your access level, users can be added and deleted, and their passwords can be changed.", + + "SECTION_HEADER_USERS" : "Users" + + }, + + "SETTINGS_SESSIONS" : { + + "ACTION_ACKNOWLEDGE" : "@:APP.ACTION_ACKNOWLEDGE", + "ACTION_CANCEL" : "@:APP.ACTION_CANCEL", + "ACTION_DELETE" : "Kill Sessions", + + "DIALOG_HEADER_CONFIRM_DELETE" : "Kill Sessions", + "DIALOG_HEADER_ERROR" : "Error", + + "FIELD_PLACEHOLDER_FILTER" : "Filter", + + "FORMAT_STARTDATE" : "@:APP.FORMAT_DATE_TIME_PRECISE", + + "HELP_SESSIONS" : "All currently-active Guacamole sessions are listed here. If you wish to kill one or more sessions, check the box next to those sessions and click \"Kill Sessions\". Killing a session will immediately disconnect the user from the associated connection.", + + "INFO_NO_SESSIONS" : "No active sessions", + + "SECTION_HEADER_SESSIONS" : "Active Sessions", + + "TABLE_HEADER_SESSION_USERNAME" : "Username", + "TABLE_HEADER_SESSION_STARTDATE" : "Active since", + "TABLE_HEADER_SESSION_REMOTEHOST" : "Remote host", + "TABLE_HEADER_SESSION_CONNECTION_NAME" : "Connection name", + + "TEXT_CONFIRM_DELETE" : "Are you sure you want to kill all selected sessions? The users using these sessions will be immediately disconnected." + + }, + "USER_MENU" : { "ACTION_ACKNOWLEDGE" : "@:APP.ACTION_ACKNOWLEDGE",