From 700e2023af582adb8dfe7e841439f9fb390ed897 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Wed, 2 Jun 2021 15:24:57 -0700 Subject: [PATCH] GUACAMOLE-773: Remove use of XHTML-style self-closing tags from normal HTML. This is particularly important for AngularJS 1.8.x and jQuery 3.5.0+, which will no longer correct this automatically with their HTML prefilters, resulting in unexpected nesting of tags when the browser interprets something like "
" as "
" (older versions of jQuery would have corrected "
" to "
"). See: * https://docs.angularjs.org/guide/migration#migrating-from-1-7-to-1-8 * https://jquery.com/upgrade-guide/3.5/ --- .../html/warning.html | 4 ++-- .../src/main/webapp/index.html | 2 +- .../src/main/webapp/index.html | 2 +- .../templates/quickconnectField.html | 4 ++-- .../resources/templates/radiusStateField.html | 2 +- .../templates/authenticationCodeField.html | 2 +- .../src/app/client/templates/client.html | 24 +++++++++---------- .../app/client/templates/guacThumbnail.html | 2 +- .../src/app/form/templates/checkboxField.html | 2 +- .../src/app/form/templates/dateField.html | 2 +- .../src/app/form/templates/emailField.html | 2 +- .../src/app/form/templates/numberField.html | 2 +- .../src/app/form/templates/passwordField.html | 2 +- .../src/app/form/templates/textField.html | 2 +- .../src/app/form/templates/timeField.html | 2 +- .../groupList/templates/guacGroupList.html | 2 +- .../templates/guacGroupListFilter.html | 2 +- .../home/templates/guacRecentConnections.html | 2 +- .../src/app/list/templates/guacFilter.html | 2 +- .../src/app/list/templates/guacPager.html | 8 +++---- .../src/app/login/templates/login.html | 4 ++-- .../templates/connectionGroupPermission.html | 2 +- .../templates/connectionPermission.html | 2 +- .../manage/templates/identifierSetEditor.html | 10 ++++---- .../app/manage/templates/locationChooser.html | 2 +- .../manage/templates/manageConnection.html | 2 +- .../templates/manageConnectionGroup.html | 2 +- .../templates/manageSharingProfile.html | 2 +- .../src/app/manage/templates/manageUser.html | 6 ++--- .../app/manage/templates/manageUserGroup.html | 2 +- .../templates/sharingProfilePermission.html | 2 +- .../templates/systemPermissionEditor.html | 4 ++-- .../templates/settingsConnectionHistory.html | 4 ++-- .../templates/settingsConnections.html | 2 +- .../templates/settingsPreferences.html | 20 ++++++++-------- .../settings/templates/settingsSessions.html | 2 +- guacamole/src/main/frontend/src/index.html | 18 +++++++------- 37 files changed, 79 insertions(+), 79 deletions(-) diff --git a/doc/guacamole-branding-example/html/warning.html b/doc/guacamole-branding-example/html/warning.html index 58a0514dd..b1b72b303 100644 --- a/doc/guacamole-branding-example/html/warning.html +++ b/doc/guacamole-branding-example/html/warning.html @@ -1,8 +1,8 @@ - +
Beware of entering Saturn's gravitational field. - Few who enter it ever escape.
\ No newline at end of file + Few who enter it ever escape.
diff --git a/doc/guacamole-example/src/main/webapp/index.html b/doc/guacamole-example/src/main/webapp/index.html index c212a54f2..c47bbc4ab 100644 --- a/doc/guacamole-example/src/main/webapp/index.html +++ b/doc/guacamole-example/src/main/webapp/index.html @@ -20,7 +20,7 @@ - + Guacamole (EXAMPLE) diff --git a/doc/guacamole-playback-example/src/main/webapp/index.html b/doc/guacamole-playback-example/src/main/webapp/index.html index c5ff62123..5b21551c3 100644 --- a/doc/guacamole-playback-example/src/main/webapp/index.html +++ b/doc/guacamole-playback-example/src/main/webapp/index.html @@ -21,7 +21,7 @@ Guacamole Recording Playback (EXAMPLE) - + diff --git a/extensions/guacamole-auth-quickconnect/src/main/resources/templates/quickconnectField.html b/extensions/guacamole-auth-quickconnect/src/main/resources/templates/quickconnectField.html index 6089965c5..9762a995a 100644 --- a/extensions/guacamole-auth-quickconnect/src/main/resources/templates/quickconnectField.html +++ b/extensions/guacamole-auth-quickconnect/src/main/resources/templates/quickconnectField.html @@ -1,8 +1,8 @@ - +
- +
diff --git a/extensions/guacamole-auth-radius/src/main/resources/templates/radiusStateField.html b/extensions/guacamole-auth-radius/src/main/resources/templates/radiusStateField.html index bfd9c4f31..e72924c71 100644 --- a/extensions/guacamole-auth-radius/src/main/resources/templates/radiusStateField.html +++ b/extensions/guacamole-auth-radius/src/main/resources/templates/radiusStateField.html @@ -1 +1 @@ - + diff --git a/extensions/guacamole-auth-totp/src/main/resources/templates/authenticationCodeField.html b/extensions/guacamole-auth-totp/src/main/resources/templates/authenticationCodeField.html index c493a2050..84859aae6 100644 --- a/extensions/guacamole-auth-totp/src/main/resources/templates/authenticationCodeField.html +++ b/extensions/guacamole-auth-totp/src/main/resources/templates/authenticationCodeField.html @@ -41,7 +41,7 @@
+ ng-model="model" autocorrect="off" autocapitalize="off">
diff --git a/guacamole/src/main/frontend/src/app/client/templates/client.html b/guacamole/src/main/frontend/src/app/client/templates/client.html index 20d711ee6..edc5cb665 100644 --- a/guacamole/src/main/frontend/src/app/client/templates/client.html +++ b/guacamole/src/main/frontend/src/app/client/templates/client.html @@ -134,20 +134,20 @@
- +

-
- +
+

- +

@@ -162,18 +162,18 @@
- +
- +

- +
- +

@@ -186,16 +186,16 @@

{{'CLIENT.SECTION_HEADER_DISPLAY' | translate}}

-
-
+
-
% + ng-change="zoomSet()">%
-
+
+
+
-
+
diff --git a/guacamole/src/main/frontend/src/app/client/templates/guacThumbnail.html b/guacamole/src/main/frontend/src/app/client/templates/guacThumbnail.html index 61e597eab..e0af90495 100644 --- a/guacamole/src/main/frontend/src/app/client/templates/guacThumbnail.html +++ b/guacamole/src/main/frontend/src/app/client/templates/guacThumbnail.html @@ -5,6 +5,6 @@
- +
\ No newline at end of file diff --git a/guacamole/src/main/frontend/src/app/form/templates/checkboxField.html b/guacamole/src/main/frontend/src/app/form/templates/checkboxField.html index e906f7d38..80666c018 100644 --- a/guacamole/src/main/frontend/src/app/form/templates/checkboxField.html +++ b/guacamole/src/main/frontend/src/app/form/templates/checkboxField.html @@ -4,4 +4,4 @@ ng-model="typedValue" guac-focus="focused" autocorrect="off" - autocapitalize="off"/> + autocapitalize="off"> diff --git a/guacamole/src/main/frontend/src/app/form/templates/dateField.html b/guacamole/src/main/frontend/src/app/form/templates/dateField.html index 7673e366d..9048dec36 100644 --- a/guacamole/src/main/frontend/src/app/form/templates/dateField.html +++ b/guacamole/src/main/frontend/src/app/form/templates/dateField.html @@ -8,5 +8,5 @@ guac-focus="focused" placeholder="{{'FORM.FIELD_PLACEHOLDER_DATE' | translate}}" autocorrect="off" - autocapitalize="off"/> + autocapitalize="off"> diff --git a/guacamole/src/main/frontend/src/app/form/templates/emailField.html b/guacamole/src/main/frontend/src/app/form/templates/emailField.html index cbfbb9084..677abba2f 100644 --- a/guacamole/src/main/frontend/src/app/form/templates/emailField.html +++ b/guacamole/src/main/frontend/src/app/form/templates/emailField.html @@ -6,6 +6,6 @@ ng-hide="readOnly" guac-focus="focused" autocorrect="off" - autocapitalize="off"/> + autocapitalize="off"> {{model}} diff --git a/guacamole/src/main/frontend/src/app/form/templates/numberField.html b/guacamole/src/main/frontend/src/app/form/templates/numberField.html index c86fb8eff..b7666c680 100644 --- a/guacamole/src/main/frontend/src/app/form/templates/numberField.html +++ b/guacamole/src/main/frontend/src/app/form/templates/numberField.html @@ -4,4 +4,4 @@ ng-model="typedValue" guac-focus="focused" autocorrect="off" - autocapitalize="off"/> + autocapitalize="off"> diff --git a/guacamole/src/main/frontend/src/app/form/templates/passwordField.html b/guacamole/src/main/frontend/src/app/form/templates/passwordField.html index 35eba9e99..3e1b2e512 100644 --- a/guacamole/src/main/frontend/src/app/form/templates/passwordField.html +++ b/guacamole/src/main/frontend/src/app/form/templates/passwordField.html @@ -6,6 +6,6 @@ ng-trim="false" guac-focus="focused" autocorrect="off" - autocapitalize="off"/> + autocapitalize="off">
diff --git a/guacamole/src/main/frontend/src/app/form/templates/textField.html b/guacamole/src/main/frontend/src/app/form/templates/textField.html index 3aea2bc4a..856ec8d0d 100644 --- a/guacamole/src/main/frontend/src/app/form/templates/textField.html +++ b/guacamole/src/main/frontend/src/app/form/templates/textField.html @@ -6,7 +6,7 @@ ng-disabled="disabled" guac-focus="focused" autocorrect="off" - autocapitalize="off"/> + autocapitalize="off"> diff --git a/guacamole/src/main/frontend/src/app/form/templates/timeField.html b/guacamole/src/main/frontend/src/app/form/templates/timeField.html index 2a882304a..f7efeb3eb 100644 --- a/guacamole/src/main/frontend/src/app/form/templates/timeField.html +++ b/guacamole/src/main/frontend/src/app/form/templates/timeField.html @@ -8,5 +8,5 @@ guac-lenient-time placeholder="{{'FORM.FIELD_PLACEHOLDER_TIME' | translate}}" autocorrect="off" - autocapitalize="off"/> + autocapitalize="off"> diff --git a/guacamole/src/main/frontend/src/app/groupList/templates/guacGroupList.html b/guacamole/src/main/frontend/src/app/groupList/templates/guacGroupList.html index 40145c8a0..e76f2e394 100644 --- a/guacamole/src/main/frontend/src/app/groupList/templates/guacGroupList.html +++ b/guacamole/src/main/frontend/src/app/groupList/templates/guacGroupList.html @@ -16,7 +16,7 @@
- + diff --git a/guacamole/src/main/frontend/src/app/groupList/templates/guacGroupListFilter.html b/guacamole/src/main/frontend/src/app/groupList/templates/guacGroupListFilter.html index d4d160b47..bbaec1c88 100644 --- a/guacamole/src/main/frontend/src/app/groupList/templates/guacGroupListFilter.html +++ b/guacamole/src/main/frontend/src/app/groupList/templates/guacGroupListFilter.html @@ -1,6 +1,6 @@
- +
diff --git a/guacamole/src/main/frontend/src/app/home/templates/guacRecentConnections.html b/guacamole/src/main/frontend/src/app/home/templates/guacRecentConnections.html index c5053897f..b2be7a3bd 100644 --- a/guacamole/src/main/frontend/src/app/home/templates/guacRecentConnections.html +++ b/guacamole/src/main/frontend/src/app/home/templates/guacRecentConnections.html @@ -26,7 +26,7 @@
- {{recentConnection.name}} + {{recentConnection.name}}
diff --git a/guacamole/src/main/frontend/src/app/list/templates/guacFilter.html b/guacamole/src/main/frontend/src/app/list/templates/guacFilter.html index 1e6dad439..d3025be22 100644 --- a/guacamole/src/main/frontend/src/app/list/templates/guacFilter.html +++ b/guacamole/src/main/frontend/src/app/list/templates/guacFilter.html @@ -1,6 +1,6 @@
- +
diff --git a/guacamole/src/main/frontend/src/app/list/templates/guacPager.html b/guacamole/src/main/frontend/src/app/list/templates/guacPager.html index 34e56fcdf..eac2fe853 100644 --- a/guacamole/src/main/frontend/src/app/list/templates/guacPager.html +++ b/guacamole/src/main/frontend/src/app/list/templates/guacPager.html @@ -1,8 +1,8 @@
-
-
+
+
...
@@ -19,7 +19,7 @@
...
-
-
+
+
diff --git a/guacamole/src/main/frontend/src/app/login/templates/login.html b/guacamole/src/main/frontend/src/app/login/templates/login.html index 04111edb4..41bc0cd10 100644 --- a/guacamole/src/main/frontend/src/app/login/templates/login.html +++ b/guacamole/src/main/frontend/src/app/login/templates/login.html @@ -36,11 +36,11 @@ + value="{{'LOGIN.ACTION_LOGIN' | translate}}"> + value="{{'LOGIN.ACTION_CONTINUE' | translate}}">
diff --git a/guacamole/src/main/frontend/src/app/manage/templates/connectionGroupPermission.html b/guacamole/src/main/frontend/src/app/manage/templates/connectionGroupPermission.html index 6b27055a6..8ac52641e 100644 --- a/guacamole/src/main/frontend/src/app/manage/templates/connectionGroupPermission.html +++ b/guacamole/src/main/frontend/src/app/manage/templates/connectionGroupPermission.html @@ -5,7 +5,7 @@ + ng-change="context.connectionGroupPermissionChanged(item.identifier)"> {{item.name}} diff --git a/guacamole/src/main/frontend/src/app/manage/templates/connectionPermission.html b/guacamole/src/main/frontend/src/app/manage/templates/connectionPermission.html index 8f1bb8b11..3a0dddaea 100644 --- a/guacamole/src/main/frontend/src/app/manage/templates/connectionPermission.html +++ b/guacamole/src/main/frontend/src/app/manage/templates/connectionPermission.html @@ -5,7 +5,7 @@ + ng-change="context.connectionPermissionChanged(item.identifier)"> {{item.name}} diff --git a/guacamole/src/main/frontend/src/app/manage/templates/identifierSetEditor.html b/guacamole/src/main/frontend/src/app/manage/templates/identifierSetEditor.html index 72c235c66..794e1bd16 100644 --- a/guacamole/src/main/frontend/src/app/manage/templates/identifierSetEditor.html +++ b/guacamole/src/main/frontend/src/app/manage/templates/identifierSetEditor.html @@ -4,7 +4,7 @@
+ ng-model="filterString">
@@ -12,14 +12,14 @@
- Expand - Collapse + Expand + Collapse

{{ emptyPlaceholder | translate }}

@@ -32,7 +32,7 @@
    • diff --git a/guacamole/src/main/frontend/src/app/manage/templates/locationChooser.html b/guacamole/src/main/frontend/src/app/manage/templates/locationChooser.html index baeebded9..068b13b3a 100644 --- a/guacamole/src/main/frontend/src/app/manage/templates/locationChooser.html +++ b/guacamole/src/main/frontend/src/app/manage/templates/locationChooser.html @@ -11,7 +11,7 @@ connection-groups="rootGroups" templates="{ 'connection-group' : 'app/manage/templates/locationChooserConnectionGroup.html' - }"/> + }">
    diff --git a/guacamole/src/main/frontend/src/app/manage/templates/manageConnection.html b/guacamole/src/main/frontend/src/app/manage/templates/manageConnection.html index 17a1108c6..8f37b98d4 100644 --- a/guacamole/src/main/frontend/src/app/manage/templates/manageConnection.html +++ b/guacamole/src/main/frontend/src/app/manage/templates/manageConnection.html @@ -13,7 +13,7 @@ {{'MANAGE_CONNECTION.FIELD_HEADER_NAME' | translate}} - + diff --git a/guacamole/src/main/frontend/src/app/manage/templates/manageConnectionGroup.html b/guacamole/src/main/frontend/src/app/manage/templates/manageConnectionGroup.html index 0f121803e..1ed7e9c16 100644 --- a/guacamole/src/main/frontend/src/app/manage/templates/manageConnectionGroup.html +++ b/guacamole/src/main/frontend/src/app/manage/templates/manageConnectionGroup.html @@ -13,7 +13,7 @@ {{'MANAGE_CONNECTION_GROUP.FIELD_HEADER_NAME' | translate}} - + diff --git a/guacamole/src/main/frontend/src/app/manage/templates/manageSharingProfile.html b/guacamole/src/main/frontend/src/app/manage/templates/manageSharingProfile.html index d242e591d..f7e9d114e 100644 --- a/guacamole/src/main/frontend/src/app/manage/templates/manageSharingProfile.html +++ b/guacamole/src/main/frontend/src/app/manage/templates/manageSharingProfile.html @@ -10,7 +10,7 @@ {{'MANAGE_SHARING_PROFILE.FIELD_HEADER_NAME' | translate}} + autocorrect="off" autocapitalize="off"> {{'MANAGE_SHARING_PROFILE.FIELD_HEADER_PRIMARY_CONNECTION' | translate}} diff --git a/guacamole/src/main/frontend/src/app/manage/templates/manageUser.html b/guacamole/src/main/frontend/src/app/manage/templates/manageUser.html index 571f5c874..014c7659c 100644 --- a/guacamole/src/main/frontend/src/app/manage/templates/manageUser.html +++ b/guacamole/src/main/frontend/src/app/manage/templates/manageUser.html @@ -25,17 +25,17 @@ {{'MANAGE_USER.FIELD_HEADER_USERNAME' | translate}} - + {{user.username}} {{'MANAGE_USER.FIELD_HEADER_PASSWORD' | translate}} - + {{'MANAGE_USER.FIELD_HEADER_PASSWORD_AGAIN' | translate}} - +
    diff --git a/guacamole/src/main/frontend/src/app/manage/templates/manageUserGroup.html b/guacamole/src/main/frontend/src/app/manage/templates/manageUserGroup.html index c65991505..09fd3e68b 100644 --- a/guacamole/src/main/frontend/src/app/manage/templates/manageUserGroup.html +++ b/guacamole/src/main/frontend/src/app/manage/templates/manageUserGroup.html @@ -24,7 +24,7 @@ {{'MANAGE_USER_GROUP.FIELD_HEADER_USER_GROUP_NAME' | translate}} - + {{userGroup.identifier}} diff --git a/guacamole/src/main/frontend/src/app/manage/templates/sharingProfilePermission.html b/guacamole/src/main/frontend/src/app/manage/templates/sharingProfilePermission.html index bc2b1302c..8d8311b76 100644 --- a/guacamole/src/main/frontend/src/app/manage/templates/sharingProfilePermission.html +++ b/guacamole/src/main/frontend/src/app/manage/templates/sharingProfilePermission.html @@ -5,7 +5,7 @@ + ng-change="context.sharingProfilePermissionChanged(item.identifier)"> {{item.name}} diff --git a/guacamole/src/main/frontend/src/app/manage/templates/systemPermissionEditor.html b/guacamole/src/main/frontend/src/app/manage/templates/systemPermissionEditor.html index 47fec6630..aa5ee475a 100644 --- a/guacamole/src/main/frontend/src/app/manage/templates/systemPermissionEditor.html +++ b/guacamole/src/main/frontend/src/app/manage/templates/systemPermissionEditor.html @@ -6,12 +6,12 @@ ng-show="canChangeSystemPermissions()"> {{systemPermissionType.label | translate}} + ng-change="systemPermissionChanged(systemPermissionType.value)"> {{'MANAGE_USER.FIELD_HEADER_CHANGE_OWN_PASSWORD' | translate}} + ng-change="userPermissionChanged('UPDATE', username)"> diff --git a/guacamole/src/main/frontend/src/app/settings/templates/settingsConnectionHistory.html b/guacamole/src/main/frontend/src/app/settings/templates/settingsConnectionHistory.html index 67d62064f..34f2fd3a6 100644 --- a/guacamole/src/main/frontend/src/app/settings/templates/settingsConnectionHistory.html +++ b/guacamole/src/main/frontend/src/app/settings/templates/settingsConnectionHistory.html @@ -5,8 +5,8 @@
    - - + +
    diff --git a/guacamole/src/main/frontend/src/app/settings/templates/settingsConnections.html b/guacamole/src/main/frontend/src/app/settings/templates/settingsConnections.html index 0b1e22ca5..6b890d162 100644 --- a/guacamole/src/main/frontend/src/app/settings/templates/settingsConnections.html +++ b/guacamole/src/main/frontend/src/app/settings/templates/settingsConnections.html @@ -44,6 +44,6 @@ 'new-sharing-profile' : 'app/settings/templates/newSharingProfile.html', 'new-connection-group' : 'app/settings/templates/newConnectionGroup.html' - }"/> + }"> diff --git a/guacamole/src/main/frontend/src/app/settings/templates/settingsPreferences.html b/guacamole/src/main/frontend/src/app/settings/templates/settingsPreferences.html index 581a66e9c..09c1a97ed 100644 --- a/guacamole/src/main/frontend/src/app/settings/templates/settingsPreferences.html +++ b/guacamole/src/main/frontend/src/app/settings/templates/settingsPreferences.html @@ -16,15 +16,15 @@ - + - + - +
    {{'SETTINGS_PREFERENCES.FIELD_HEADER_PASSWORD_OLD' | translate}}
    {{'SETTINGS_PREFERENCES.FIELD_HEADER_PASSWORD_NEW' | translate}}
    {{'SETTINGS_PREFERENCES.FIELD_HEADER_PASSWORD_NEW_AGAIN' | translate}}
    @@ -43,19 +43,19 @@
    - +

    - +

    - +

    @@ -70,18 +70,18 @@
    - +
    - +

    - +
    - +

    diff --git a/guacamole/src/main/frontend/src/app/settings/templates/settingsSessions.html b/guacamole/src/main/frontend/src/app/settings/templates/settingsSessions.html index 698582cc7..a2cd9b3d8 100644 --- a/guacamole/src/main/frontend/src/app/settings/templates/settingsSessions.html +++ b/guacamole/src/main/frontend/src/app/settings/templates/settingsSessions.html @@ -35,7 +35,7 @@ - + {{wrapper.startDate}} diff --git a/guacamole/src/main/frontend/src/index.html b/guacamole/src/main/frontend/src/index.html index a92c3eb88..2f0f39cfe 100644 --- a/guacamole/src/main/frontend/src/index.html +++ b/guacamole/src/main/frontend/src/index.html @@ -19,18 +19,18 @@ --> - - - - - - - - + + + + + + + + <% for (var index in htmlWebpackPlugin.files.css) { %> - + <% } %>