From 32443189ac73f5901f0baad0c40e02a3b578e82b Mon Sep 17 00:00:00 2001 From: Thomas Gasmyr Date: Sat, 27 Aug 2022 16:10:29 +0100 Subject: [PATCH] feat: update jquery and bootstrap to latest stable versions #2235 #2236 --- .../static-resource-mappings.properties | 2 +- .../WEB-INF/incl/layout/fullWidthEmpty.xhtml | 2 +- .../WEB-INF/incl/layout/newtemplate.xhtml | 255 +- server/src/main/webapp/home.xhtml | 2 +- .../main/webapp/person/passwordReminder.xhtml | 2 +- .../src/main/webapp/resources/js/dashboard.js | 14 +- .../resources/js/jsoneditor.min.js.map | 1 + .../theme/bootstrap/css/bootstrap-theme.css | 587 ++++ .../bootstrap/css/bootstrap-theme.css.map | 1 + .../bootstrap/css/bootstrap-theme.min.css | 6 + .../bootstrap/css/bootstrap-theme.min.css.map | 1 + .../theme/bootstrap/css/bootstrap.css | 1436 +++++---- .../theme/bootstrap/css/bootstrap.css.map | 2 +- .../theme/bootstrap/css/bootstrap.min.css | 7 +- .../theme/bootstrap/css/bootstrap.min.css.map | 1 + .../theme/bootstrap/fonts/FontAwesome.otf | Bin 134808 -> 0 bytes .../bootstrap/fonts/fontawesome-webfont.eot | Bin 165742 -> 0 bytes .../bootstrap/fonts/fontawesome-webfont.svg | 2671 ----------------- .../bootstrap/fonts/fontawesome-webfont.ttf | Bin 165548 -> 0 bytes .../resources/theme/bootstrap/js/bootstrap.js | 1966 ++++++------ .../theme/bootstrap/js/bootstrap.min.js | 9 +- .../META-INF/resources/theme/dist/js/app.js | 5 +- .../resources/theme/dist/js/clipboard.min.js | 8 +- .../theme/dist/js/jquery-1.12.4.min.js | 5 - .../theme/dist/js/jquery-3.6.1.min.js | 2 + .../theme/dist/js/jquery-ui-1.12.1.min.js | 13 - .../theme/dist/js/jquery-ui-1.13.2.min.js | 6 + .../resources/theme/dist/js/jquery.blockUI.js | 7 +- 28 files changed, 2736 insertions(+), 4275 deletions(-) create mode 100644 static/src/main/resources/META-INF/resources/js/jsoneditor.min.js.map create mode 100644 static/src/main/resources/META-INF/resources/theme/bootstrap/css/bootstrap-theme.css create mode 100644 static/src/main/resources/META-INF/resources/theme/bootstrap/css/bootstrap-theme.css.map create mode 100644 static/src/main/resources/META-INF/resources/theme/bootstrap/css/bootstrap-theme.min.css create mode 100644 static/src/main/resources/META-INF/resources/theme/bootstrap/css/bootstrap-theme.min.css.map create mode 100644 static/src/main/resources/META-INF/resources/theme/bootstrap/css/bootstrap.min.css.map delete mode 100644 static/src/main/resources/META-INF/resources/theme/bootstrap/fonts/FontAwesome.otf delete mode 100644 static/src/main/resources/META-INF/resources/theme/bootstrap/fonts/fontawesome-webfont.eot delete mode 100644 static/src/main/resources/META-INF/resources/theme/bootstrap/fonts/fontawesome-webfont.svg delete mode 100644 static/src/main/resources/META-INF/resources/theme/bootstrap/fonts/fontawesome-webfont.ttf delete mode 100644 static/src/main/resources/META-INF/resources/theme/dist/js/jquery-1.12.4.min.js create mode 100644 static/src/main/resources/META-INF/resources/theme/dist/js/jquery-3.6.1.min.js delete mode 100644 static/src/main/resources/META-INF/resources/theme/dist/js/jquery-ui-1.12.1.min.js create mode 100644 static/src/main/resources/META-INF/resources/theme/dist/js/jquery-ui-1.13.2.min.js diff --git a/server/src/main/resources/META-INF/richfaces/static-resource-mappings.properties b/server/src/main/resources/META-INF/richfaces/static-resource-mappings.properties index 3f257f0a8..a90615b03 100644 --- a/server/src/main/resources/META-INF/richfaces/static-resource-mappings.properties +++ b/server/src/main/resources/META-INF/richfaces/static-resource-mappings.properties @@ -1,3 +1,3 @@ -#jquery.js=jquery-1.12.4.min.js +#jquery.js=jquery-3.6.1.min.js bootstrap.js=bootstrap.min.js jquery-migrate.js=4.3.7.Final/Packed/jquery.jsorg.richfaces.staticResource/jquery.js \ No newline at end of file diff --git a/server/src/main/webapp/WEB-INF/incl/layout/fullWidthEmpty.xhtml b/server/src/main/webapp/WEB-INF/incl/layout/fullWidthEmpty.xhtml index ce3ac3b1c..e58de8e05 100644 --- a/server/src/main/webapp/WEB-INF/incl/layout/fullWidthEmpty.xhtml +++ b/server/src/main/webapp/WEB-INF/incl/layout/fullWidthEmpty.xhtml @@ -160,7 +160,7 @@ a { - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - -
- - - - - - - - -
-
- - - -
- -
-
- - - - - - - - - + + + + + + - -
+ + + \ No newline at end of file diff --git a/server/src/main/webapp/home.xhtml b/server/src/main/webapp/home.xhtml index 98af54e1d..6c8dbb2ef 100644 --- a/server/src/main/webapp/home.xhtml +++ b/server/src/main/webapp/home.xhtml @@ -182,7 +182,7 @@ + src="#{oxAuthConfigurationService.jsLocation}/jquery-3.6.1.min.js">