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

Merge 1.0.0 changes back to master.

Browse Source
This commit is contained in:
Nick Couchman
2018-06-13 06:15:10 -04:00
parent bf3d27611d bc1dc41a7c
commit 984ab48ce8
18 changed files with 213 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
guacamole/src/main/webapp/app/form/controllers/selectFieldController.js
View File

@@ -24,44 +24,10 @@
angular.module('form').controller('selectFieldController', ['$scope', '$injector',
function selectFieldController($scope, $injector) {
// Required services
var translationStringService = $injector.get('translationStringService');
// Interpret undefined/null as empty string
$scope.$watch('model', function setModel(model) {
if (!model && model !== '')
$scope.model = '';
});
/**
* Produces the translation string for the given field option
* value. The translation string will be of the form:
*
* <code>NAMESPACE.FIELD_OPTION_NAME_VALUE<code>
*
* where <code>NAMESPACE</code> is the namespace provided to the
* directive, <code>NAME</code> is the field name transformed
* via translationStringService.canonicalize(), and
* <code>VALUE</code> is the option value transformed via
* translationStringService.canonicalize()
*
* @param {String} value
* The name of the option value.
*
* @returns {String}
* The translation string which produces the translated name of the
* value specified.
*/
$scope.getFieldOption = function getFieldOption(value) {
// If no field, or no value, then no corresponding translation string
if (!$scope.field || !$scope.field.name || !value)
return '';
return translationStringService.canonicalize($scope.namespace || 'MISSING_NAMESPACE')
+ '.FIELD_OPTION_' + translationStringService.canonicalize($scope.field.name)
+ '_' + translationStringService.canonicalize(value || 'EMPTY');
};
}]);

40
guacamole/src/main/webapp/app/form/controllers/textFieldController.js Normal file
View File

@@ -0,0 +1,40 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
/**
* Controller for text fields.
*/
angular.module('form').controller('textFieldController', ['$scope', '$injector',
function textFieldController($scope, $injector) {
/**
* The ID of the datalist element that should be associated with the text
* field, providing a set of known-good values. If no such values are
* defined, this will be null.
*
* @type String
*/
$scope.dataListId = null;
// Generate unique ID for datalist, if applicable
if ($scope.field.options && $scope.field.options.length)
$scope.dataListId = $scope.field.name + '-datalist';
}]);

31
guacamole/src/main/webapp/app/form/directives/formField.js
View File

@@ -97,6 +97,37 @@ angular.module('form').directive('guacFormField', [function formField() {
};
/**
* Produces the translation string for the given field option
* value. The translation string will be of the form:
*
* <code>NAMESPACE.FIELD_OPTION_NAME_VALUE<code>
*
* where <code>NAMESPACE</code> is the namespace provided to the
* directive, <code>NAME</code> is the field name transformed
* via translationStringService.canonicalize(), and
* <code>VALUE</code> is the option value transformed via
* translationStringService.canonicalize()
*
* @param {String} value
* The name of the option value.
*
* @returns {String}
* The translation string which produces the translated name of the
* value specified.
*/
$scope.getFieldOption = function getFieldOption(value) {
// If no field, or no value, then no corresponding translation string
if (!$scope.field || !$scope.field.name || !value)
return '';
return translationStringService.canonicalize($scope.namespace || 'MISSING_NAMESPACE')
+ '.FIELD_OPTION_' + translationStringService.canonicalize($scope.field.name)
+ '_' + translationStringService.canonicalize(value || 'EMPTY');
};
/**
* Returns whether the current field should be displayed.
*

2
guacamole/src/main/webapp/app/form/services/formService.js
View File

@@ -44,6 +44,8 @@ angular.module('form').provider('formService', function formServiceProvider() {
* @type FieldType
*/
'TEXT' : {
module : 'form',
controller : 'textFieldController',
templateUrl : 'app/form/templates/textField.html'
},

8
guacamole/src/main/webapp/app/form/templates/textField.html
View File

@@ -1 +1,7 @@
<input type="text" ng-model="model" autocorrect="off" autocapitalize="off"/>
<div class="text-field">
<input type="text" ng-model="model" autocorrect="off" autocapitalize="off" ng-attr-list="{{ dataListId }}"/>
<datalist ng-if="dataListId" id="{{ dataListId }}">
<option ng-repeat="option in field.options | orderBy: option"
value="{{ option }}">{{ getFieldOption(option) | translate }}</option>
</datalist>
</div>

3
guacamole/src/main/webapp/index.html
View File

@@ -71,8 +71,9 @@
<script type="text/javascript" src="webjars/angular-translate-interpolation-messageformat/2.16.0/angular-translate-interpolation-messageformat.min.js"></script>
<script type="text/javascript" src="webjars/angular-translate-loader-static-files/2.16.0/angular-translate-loader-static-files.min.js"></script>
<!-- Polyfills for Blob and the FileSaver API -->
<!-- Polyfills for the "datalist" element, Blob and the FileSaver API -->
<script type="text/javascript" src="webjars/blob-polyfill/1.0.20150320/Blob.js"></script>
<script type="text/javascript" src="webjars/datalist-polyfill/1.14.0/datalist-polyfill.min.js"></script>
<script type="text/javascript" src="webjars/filesaver/1.3.3/FileSaver.min.js"></script>
<!-- Allow arbitrary ordering of Angular module creation and retrieval -->

12
guacamole/src/main/webapp/translations/de.json
View File

@@ -378,6 +378,12 @@
"FIELD_HEADER_PRIVATE_KEY" : "Privater Schlüssel:",
"FIELD_HEADER_READ_ONLY" : "Nur-Lesen:",
"FIELD_OPTION_COLOR_SCHEME_BLACK_WHITE" : "Schwarz auf Weiß",
"FIELD_OPTION_COLOR_SCHEME_EMPTY" : "",
"FIELD_OPTION_COLOR_SCHEME_GRAY_BLACK" : "Grau auf Schwarz",
"FIELD_OPTION_COLOR_SCHEME_GREEN_BLACK" : "Grün auf Schwarz",
"FIELD_OPTION_COLOR_SCHEME_WHITE_BLACK" : "Weiß auf Schwarz",
"FIELD_OPTION_FONT_SIZE_8" : "8",
"FIELD_OPTION_FONT_SIZE_9" : "9",
"FIELD_OPTION_FONT_SIZE_10" : "10",
@@ -416,6 +422,12 @@
"FIELD_HEADER_PORT" : "Port:",
"FIELD_HEADER_READ_ONLY" : "Nur-Lesen:",
"FIELD_OPTION_COLOR_SCHEME_BLACK_WHITE" : "Schwarz auf Weiß",
"FIELD_OPTION_COLOR_SCHEME_EMPTY" : "",
"FIELD_OPTION_COLOR_SCHEME_GRAY_BLACK" : "Grau auf Schwarz",
"FIELD_OPTION_COLOR_SCHEME_GREEN_BLACK" : "Grün auf Schwarz",
"FIELD_OPTION_COLOR_SCHEME_WHITE_BLACK" : "Weiß auf Schwarz",
"FIELD_OPTION_FONT_SIZE_8" : "8",
"FIELD_OPTION_FONT_SIZE_9" : "9",
"FIELD_OPTION_FONT_SIZE_10" : "10",

12
guacamole/src/main/webapp/translations/en.json
View File

@@ -455,6 +455,12 @@
"FIELD_OPTION_BACKSPACE_8" : "Backspace (Ctrl-H)",
"FIELD_OPTION_BACKSPACE_127" : "Delete (Ctrl-?)",
"FIELD_OPTION_COLOR_SCHEME_BLACK_WHITE" : "Black on white",
"FIELD_OPTION_COLOR_SCHEME_EMPTY" : "",
"FIELD_OPTION_COLOR_SCHEME_GRAY_BLACK" : "Gray on black",
"FIELD_OPTION_COLOR_SCHEME_GREEN_BLACK" : "Green on black",
"FIELD_OPTION_COLOR_SCHEME_WHITE_BLACK" : "White on black",
"FIELD_OPTION_FONT_SIZE_8" : "8",
"FIELD_OPTION_FONT_SIZE_9" : "9",
"FIELD_OPTION_FONT_SIZE_10" : "10",
@@ -519,6 +525,12 @@
"FIELD_OPTION_BACKSPACE_8" : "Backspace (Ctrl-H)",
"FIELD_OPTION_BACKSPACE_127" : "Delete (Ctrl-?)",
"FIELD_OPTION_COLOR_SCHEME_BLACK_WHITE" : "Black on white",
"FIELD_OPTION_COLOR_SCHEME_EMPTY" : "",
"FIELD_OPTION_COLOR_SCHEME_GRAY_BLACK" : "Gray on black",
"FIELD_OPTION_COLOR_SCHEME_GREEN_BLACK" : "Green on black",
"FIELD_OPTION_COLOR_SCHEME_WHITE_BLACK" : "White on black",
"FIELD_OPTION_FONT_SIZE_8" : "8",
"FIELD_OPTION_FONT_SIZE_9" : "9",
"FIELD_OPTION_FONT_SIZE_10" : "10",

12
guacamole/src/main/webapp/translations/es.json
View File

@@ -435,6 +435,12 @@
"FIELD_HEADER_TYPESCRIPT_NAME" : "Nombre script escritura:",
"FIELD_HEADER_TYPESCRIPT_PATH" : "Ruta script escritura:",
"FIELD_OPTION_COLOR_SCHEME_BLACK_WHITE" : "Negro sobre blanco",
"FIELD_OPTION_COLOR_SCHEME_EMPTY" : "",
"FIELD_OPTION_COLOR_SCHEME_GRAY_BLACK" : "Gris sobre negro",
"FIELD_OPTION_COLOR_SCHEME_GREEN_BLACK" : "Verde sobre negro",
"FIELD_OPTION_COLOR_SCHEME_WHITE_BLACK" : "Blanco sobre negro",
"FIELD_OPTION_FONT_SIZE_8" : "8",
"FIELD_OPTION_FONT_SIZE_9" : "9",
"FIELD_OPTION_FONT_SIZE_10" : "10",
@@ -481,6 +487,12 @@
"FIELD_HEADER_TYPESCRIPT_NAME" : "Nombre script escritura:",
"FIELD_HEADER_TYPESCRIPT_PATH" : "Ruta script escritura:",
"FIELD_OPTION_COLOR_SCHEME_BLACK_WHITE" : "Negro sobre blanco",
"FIELD_OPTION_COLOR_SCHEME_EMPTY" : "",
"FIELD_OPTION_COLOR_SCHEME_GRAY_BLACK" : "Gris sobre negro",
"FIELD_OPTION_COLOR_SCHEME_GREEN_BLACK" : "Verde sobre negro",
"FIELD_OPTION_COLOR_SCHEME_WHITE_BLACK" : "Blanco sobre negro",
"FIELD_OPTION_FONT_SIZE_8" : "8",
"FIELD_OPTION_FONT_SIZE_9" : "9",
"FIELD_OPTION_FONT_SIZE_10" : "10",

12
guacamole/src/main/webapp/translations/fr.json
View File

@@ -381,6 +381,12 @@
"FIELD_HEADER_PRIVATE_KEY" : "Clé privée:",
"FIELD_HEADER_READ_ONLY" : "Lecture seule:",
"FIELD_OPTION_COLOR_SCHEME_BLACK_WHITE" : "Noir sur blanc",
"FIELD_OPTION_COLOR_SCHEME_EMPTY" : "",
"FIELD_OPTION_COLOR_SCHEME_GRAY_BLACK" : "Gris sur noir",
"FIELD_OPTION_COLOR_SCHEME_GREEN_BLACK" : "Vert sur noir",
"FIELD_OPTION_COLOR_SCHEME_WHITE_BLACK" : "Blanc sur noir",
"FIELD_OPTION_FONT_SIZE_8" : "8",
"FIELD_OPTION_FONT_SIZE_9" : "9",
"FIELD_OPTION_FONT_SIZE_10" : "10",
@@ -419,6 +425,12 @@
"FIELD_HEADER_PORT" : "Port:",
"FIELD_HEADER_READ_ONLY" : "Lecture seule:",
"FIELD_OPTION_COLOR_SCHEME_BLACK_WHITE" : "Noir sur blanc",
"FIELD_OPTION_COLOR_SCHEME_EMPTY" : "",
"FIELD_OPTION_COLOR_SCHEME_GRAY_BLACK" : "Gris sur noir",
"FIELD_OPTION_COLOR_SCHEME_GREEN_BLACK" : "Vert sur noir",
"FIELD_OPTION_COLOR_SCHEME_WHITE_BLACK" : "Blanc sur noir",
"FIELD_OPTION_FONT_SIZE_8" : "8",
"FIELD_OPTION_FONT_SIZE_9" : "9",
"FIELD_OPTION_FONT_SIZE_10" : "10",

12
guacamole/src/main/webapp/translations/nl.json
View File

@@ -397,6 +397,12 @@
"FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript naam:",
"FIELD_HEADER_TYPESCRIPT_PATH" : "Typescript map:",
"FIELD_OPTION_COLOR_SCHEME_BLACK_WHITE" : "Zwart op wit",
"FIELD_OPTION_COLOR_SCHEME_EMPTY" : "",
"FIELD_OPTION_COLOR_SCHEME_GRAY_BLACK" : "Grijs op zwart",
"FIELD_OPTION_COLOR_SCHEME_GREEN_BLACK" : "Groen op zwart",
"FIELD_OPTION_COLOR_SCHEME_WHITE_BLACK" : "Wit op zwart",
"FIELD_OPTION_FONT_SIZE_8" : "8",
"FIELD_OPTION_FONT_SIZE_9" : "9",
"FIELD_OPTION_FONT_SIZE_10" : "10",
@@ -443,6 +449,12 @@
"FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript naam:",
"FIELD_HEADER_TYPESCRIPT_PATH" : "Typescript map:",
"FIELD_OPTION_COLOR_SCHEME_BLACK_WHITE" : "Zwart op wit",
"FIELD_OPTION_COLOR_SCHEME_EMPTY" : "",
"FIELD_OPTION_COLOR_SCHEME_GRAY_BLACK" : "Grijs op zwart",
"FIELD_OPTION_COLOR_SCHEME_GREEN_BLACK" : "Groen op zwart",
"FIELD_OPTION_COLOR_SCHEME_WHITE_BLACK" : "Wit op zwart",
"FIELD_OPTION_FONT_SIZE_8" : "8",
"FIELD_OPTION_FONT_SIZE_9" : "9",
"FIELD_OPTION_FONT_SIZE_10" : "10",

12
guacamole/src/main/webapp/translations/no.json
View File

@@ -379,6 +379,12 @@
"FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript navn:",
"FIELD_HEADER_TYPESCRIPT_PATH" : "Typescript sti:",
"FIELD_OPTION_COLOR_SCHEME_BLACK_WHITE" : "Svart på hvit",
"FIELD_OPTION_COLOR_SCHEME_EMPTY" : "",
"FIELD_OPTION_COLOR_SCHEME_GRAY_BLACK" : "Grå på svart",
"FIELD_OPTION_COLOR_SCHEME_GREEN_BLACK" : "Grønn på svart",
"FIELD_OPTION_COLOR_SCHEME_WHITE_BLACK" : "Hvit på svart",
"FIELD_OPTION_FONT_SIZE_8" : "8",
"FIELD_OPTION_FONT_SIZE_9" : "9",
"FIELD_OPTION_FONT_SIZE_10" : "10",
@@ -424,6 +430,12 @@
"FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript navn:",
"FIELD_HEADER_TYPESCRIPT_PATH" : "Typescript sti:",
"FIELD_OPTION_COLOR_SCHEME_BLACK_WHITE" : "Svart på hvit",
"FIELD_OPTION_COLOR_SCHEME_EMPTY" : "",
"FIELD_OPTION_COLOR_SCHEME_GRAY_BLACK" : "Grå på svart",
"FIELD_OPTION_COLOR_SCHEME_GREEN_BLACK" : "Grønn på svart",
"FIELD_OPTION_COLOR_SCHEME_WHITE_BLACK" : "Hvit på svart",
"FIELD_OPTION_FONT_SIZE_8" : "8",
"FIELD_OPTION_FONT_SIZE_9" : "9",
"FIELD_OPTION_FONT_SIZE_10" : "10",