This is an automated email from the ASF dual-hosted git repository. jmuehlner pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit 51b1c08cf408191b4a19f6d6a336496e2f4e84b2 Merge: 6a8ffa0 91bf843 Author: James Muehlner <[email protected]> AuthorDate: Thu Aug 8 22:13:05 2019 -0700 Merge 1.1.0 changes back to master. .../main/java/org/apache/guacamole/form/Field.java | 6 + .../guacamole/form/TerminalColorSchemeField.java | 25 +- .../org/apache/guacamole/protocols/kubernetes.json | 2 +- .../org/apache/guacamole/protocols/ssh.json | 2 +- .../org/apache/guacamole/protocols/telnet.json | 2 +- guacamole/pom.xml | 7 + guacamole/src/licenses/LICENSE | 31 + guacamole/src/licenses/bundled/pickr-1.2.6/LICENSE | 21 + .../terminalColorSchemeFieldController.js | 142 +++ .../app/form/controllers/textFieldController.js | 2 +- .../main/webapp/app/form/directives/formField.js | 14 +- .../webapp/app/form/directives/guacInputColor.js | 202 +++++ .../main/webapp/app/form/services/formService.js | 18 + .../form/styles/terminal-color-scheme-field.css | 158 ++++ .../webapp/app/form/templates/checkboxField.html | 8 +- .../main/webapp/app/form/templates/dateField.html | 1 + .../main/webapp/app/form/templates/emailField.html | 3 +- .../main/webapp/app/form/templates/formField.html | 8 +- .../webapp/app/form/templates/guacInputColor.html | 10 + .../webapp/app/form/templates/languageField.html | 5 +- .../webapp/app/form/templates/numberField.html | 8 +- .../webapp/app/form/templates/passwordField.html | 11 +- .../webapp/app/form/templates/selectField.html | 5 +- .../form/templates/terminalColorSchemeField.html | 63 ++ .../webapp/app/form/templates/textAreaField.html | 7 +- .../main/webapp/app/form/templates/textField.html | 14 +- .../main/webapp/app/form/templates/timeField.html | 1 + .../webapp/app/form/templates/timeZoneField.html | 1 + .../src/main/webapp/app/form/types/ColorScheme.js | 949 +++++++++++++++++++++ .../app/manage/styles/connection-parameter.css | 4 + guacamole/src/main/webapp/app/rest/types/Field.js | 11 +- guacamole/src/main/webapp/index.html | 6 +- guacamole/src/main/webapp/translations/en.json | 16 + 33 files changed, 1728 insertions(+), 35 deletions(-) diff --cc guacamole/src/main/webapp/app/form/templates/checkboxField.html index 252441b,110ab14..e906f7d --- a/guacamole/src/main/webapp/app/form/templates/checkboxField.html +++ b/guacamole/src/main/webapp/app/form/templates/checkboxField.html @@@ -1,1 -1,5 +1,7 @@@ - <input type="checkbox" ng-disabled="disabled" ng-model="typedValue" guac-focus="focused" autocorrect="off" autocapitalize="off"/> + <input type="checkbox" + ng-attr-id="{{ fieldId }}" ++ ng-disabled="disabled" + ng-model="typedValue" ++ guac-focus="focused" + autocorrect="off" + autocapitalize="off"/> diff --cc guacamole/src/main/webapp/app/form/templates/dateField.html index 6fd38da,2da96a1..7673e36 --- a/guacamole/src/main/webapp/app/form/templates/dateField.html +++ b/guacamole/src/main/webapp/app/form/templates/dateField.html @@@ -1,6 -1,6 +1,7 @@@ <div class="date-field"> <input type="date" + ng-disabled="disabled" + ng-attr-id="{{ fieldId }}" ng-model="typedValue" ng-model-options="modelOptions" guac-lenient-date diff --cc guacamole/src/main/webapp/app/form/templates/emailField.html index 3eb31e7,4ef14f4..cbfbb90 --- a/guacamole/src/main/webapp/app/form/templates/emailField.html +++ b/guacamole/src/main/webapp/app/form/templates/emailField.html @@@ -1,9 -1,8 +1,10 @@@ <div class="email-field"> <input type="email" + ng-disabled="disabled" + ng-attr-id="{{ fieldId }}" ng-model="model" ng-hide="readOnly" + guac-focus="focused" autocorrect="off" autocapitalize="off"/> <a href="mailto:{{model}}"; ng-show="readOnly">{{model}}</a> diff --cc guacamole/src/main/webapp/app/form/templates/languageField.html index 5af4e75,b1f25e8..2a22ff2 --- a/guacamole/src/main/webapp/app/form/templates/languageField.html +++ b/guacamole/src/main/webapp/app/form/templates/languageField.html @@@ -1,1 -1,3 +1,4 @@@ - <select guac-focus="focused" ng-model="model" ng-options="language.key as language.value for language in languages | toArray | orderBy: key"></select> -<select ng-attr-id="{{ fieldId }}" ++<select guac-focus="focused" ++ ng-attr-id="{{ fieldId }}" + ng-model="model" + ng-options="language.key as language.value for language in languages | toArray | orderBy: key"></select> diff --cc guacamole/src/main/webapp/app/form/templates/numberField.html index 9e4c28b,f802b4a..c86fb8e --- a/guacamole/src/main/webapp/app/form/templates/numberField.html +++ b/guacamole/src/main/webapp/app/form/templates/numberField.html @@@ -1,1 -1,5 +1,7 @@@ - <input type="number" ng-disabled="disabled" ng-model="typedValue" guac-focus="focused" autocorrect="off" autocapitalize="off"/> + <input type="number" ++ ng-disabled="disabled" + ng-attr-id="{{ fieldId }}" + ng-model="typedValue" ++ guac-focus="focused" + autocorrect="off" + autocapitalize="off"/> diff --cc guacamole/src/main/webapp/app/form/templates/passwordField.html index 68d36f7,69d67e8..35eba9e --- a/guacamole/src/main/webapp/app/form/templates/passwordField.html +++ b/guacamole/src/main/webapp/app/form/templates/passwordField.html @@@ -1,4 -1,9 +1,11 @@@ <div class="password-field"> - <input type="{{passwordInputType}}" ng-disabled="disabled" ng-model="model" ng-trim="false" guac-focus="focused" autocorrect="off" autocapitalize="off"/> + <input type="{{passwordInputType}}" ++ ng-disabled="disabled" + ng-attr-id="{{ fieldId }}" + ng-model="model" + ng-trim="false" ++ guac-focus="focused" + autocorrect="off" + autocapitalize="off"/> <div class="icon toggle-password" ng-click="togglePassword()" title="{{getTogglePasswordHelpText() | translate}}"></div> - </div> + </div> diff --cc guacamole/src/main/webapp/app/form/templates/selectField.html index f173d54,e5ce0e9..2c672aa --- a/guacamole/src/main/webapp/app/form/templates/selectField.html +++ b/guacamole/src/main/webapp/app/form/templates/selectField.html @@@ -1,2 -1,3 +1,5 @@@ - <select ng-model="model" ng-disabled="disabled" guac-focus="focused" + <select ng-attr-id="{{ fieldId }}" ++ ng-disabled="disabled" ++ guac-focus="focused" + ng-model="model" ng-options="option as getFieldOption(option) | translate for option in field.options | orderBy: value"></select> diff --cc guacamole/src/main/webapp/app/form/templates/textAreaField.html index 6614bfb,2d4144b..9761af7 --- a/guacamole/src/main/webapp/app/form/templates/textAreaField.html +++ b/guacamole/src/main/webapp/app/form/templates/textAreaField.html @@@ -1,1 -1,4 +1,6 @@@ - <textarea ng-model="model" guac-focus="focused" autocorrect="off" autocapitalize="off" ng-disabled="disabled"></textarea> + <textarea ng-attr-id="{{ fieldId }}" + ng-model="model" ++ ng-disabled="disabled" ++ guac-focus="focused" + autocorrect="off" + autocapitalize="off"></textarea> diff --cc guacamole/src/main/webapp/app/form/templates/textField.html index 6abd4f6,938b81c..3aea2bc --- a/guacamole/src/main/webapp/app/form/templates/textField.html +++ b/guacamole/src/main/webapp/app/form/templates/textField.html @@@ -1,7 -1,11 +1,13 @@@ <div class="text-field"> - <input type="text" ng-model="model" autocorrect="off" autocapitalize="off" guac-focus="focused" - ng-disabled="disabled" ng-attr-list="{{ dataListId }}"/> - <datalist ng-if="dataListId" id="{{ dataListId }}"> + <input type="text" + ng-attr-id="{{ fieldId }}" + ng-attr-list="{{ dataListId }}" + ng-model="model" ++ ng-disabled="disabled" ++ guac-focus="focused" + autocorrect="off" + autocapitalize="off"/> + <datalist ng-if="dataListId" ng-attr-id="{{ dataListId }}"> <option ng-repeat="option in field.options | orderBy: option" value="{{ option }}">{{ getFieldOption(option) | translate }}</option> </datalist> diff --cc guacamole/src/main/webapp/app/form/templates/timeField.html index 6f7201f,292e44c..2a88230 --- a/guacamole/src/main/webapp/app/form/templates/timeField.html +++ b/guacamole/src/main/webapp/app/form/templates/timeField.html @@@ -1,9 -1,8 +1,10 @@@ <div class="time-field"> <input type="time" + ng-disabled="disabled" + ng-attr-id="{{ fieldId }}" ng-model="typedValue" ng-model-options="modelOptions" + guac-focus="focused" guac-lenient-time placeholder="{{'FORM.FIELD_PLACEHOLDER_TIME' | translate}}" autocorrect="off" diff --cc guacamole/src/main/webapp/app/form/templates/timeZoneField.html index c318a17,ed960af..ecab57d --- a/guacamole/src/main/webapp/app/form/templates/timeZoneField.html +++ b/guacamole/src/main/webapp/app/form/templates/timeZoneField.html @@@ -2,8 -2,7 +2,9 @@@ <!-- Available time zone regions --> <select class="time-zone-region" + ng-disabled="disabled" + guac-focus="focused" + ng-attr-id="{{ fieldId }}" ng-model="region" ng-options="name for name in regions | orderBy: name"></select>
