Skip to content

Commit

Permalink
Merge pull request #146 from imi-ms/144-update-resource-version-to-32…
Browse files Browse the repository at this point in the history 
…0-to-prevent-caching-issues

Adjusted all resource usages to use v3.2.0
  • Loading branch information
@ywarnecke
ywarnecke authored Jan 21, 2025
2 parents 45a738a + 1c2dff9 commit ac0a89e
Show file tree
Hide file tree
Showing 9 changed files with 91 additions and 140 deletions.
49 changes: 0 additions & 49 deletions .github/workflows/build-and-release.yml
View file

This file was deleted.

92 changes: 46 additions & 46 deletions src/main/webapp/WEB-INF/fragments/resourceFragment.html
View file
Original file line number Diff line number Diff line change
@@ -1,59 +1,59 @@
<th:block layout:fragment="adminJS">
<script defer th:src="@{/js/helper/dialog.js?version=3.0}"></script>
<script defer th:src="@{/js/helper/dragNDropList.js?version=3.0}"></script>
<script defer th:src="@{/js/helper/image.js?version=3.0}"></script>
<script defer th:src="@{/js/application.js?version=3.0}"></script>
<script defer th:src="@{/js/helper/localization.js?version=3.0}"></script>
<script defer th:src="@{/js/mobile/helper/pseudonymization.js?version=3.0}"></script>
<script defer th:src="@{/js/mobile/survey/model/answer.js?version=3.0}"></script>
<script defer th:src="@{/js/mobile/survey/model/bundle.js?version=3.0}"></script>
<script defer th:src="@{/js/mobile/survey/model/bundleQuestionnaire.js?version=3.0}"></script>
<script defer th:src="@{/js/mobile/survey/model/question.js?version=3.0}"></script>
<script defer th:src="@{/js/mobile/survey/model/questionnaire.js?version=3.0}"></script>
<script defer th:src="@{/js/mobile/survey/model/condition.js?version=3.0}"></script>
<script defer th:src="@{/js/helper/dialog.js?version=3.2.0}"></script>
<script defer th:src="@{/js/helper/dragNDropList.js?version=3.2.0}"></script>
<script defer th:src="@{/js/helper/image.js?version=3.2.0}"></script>
<script defer th:src="@{/js/application.js?version=3.2.0}"></script>
<script defer th:src="@{/js/helper/localization.js?version=3.2.0}"></script>
<script defer th:src="@{/js/mobile/helper/pseudonymization.js?version=3.2.0}"></script>
<script defer th:src="@{/js/mobile/survey/model/answer.js?version=3.2.0}"></script>
<script defer th:src="@{/js/mobile/survey/model/bundle.js?version=3.2.0}"></script>
<script defer th:src="@{/js/mobile/survey/model/bundleQuestionnaire.js?version=3.2.0}"></script>
<script defer th:src="@{/js/mobile/survey/model/question.js?version=3.2.0}"></script>
<script defer th:src="@{/js/mobile/survey/model/questionnaire.js?version=3.2.0}"></script>
<script defer th:src="@{/js/mobile/survey/model/condition.js?version=3.2.0}"></script>
</th:block>

<th:block layout:fragment="adminCSS">
<link rel="stylesheet" th:href="@{/css/admin/dataTables.css?version=3.0}" />
<link rel="stylesheet" th:href="@{/css/admin/elements.css?version=3.0}" />
<link rel="stylesheet" th:href="@{/css/admin/error.css?version=3.0}" />
<link rel="stylesheet" th:href="@{/css/admin/footer.css?version=3.0}" />
<link rel="stylesheet" th:href="@{/css/admin/header.css?version=3.0}" />
<link rel="stylesheet" th:href="@{/css/admin/layout.css?version=3.0}" />
<link rel="stylesheet" th:href="@{/css/admin/mapping.css?version=3.0}" />
<link rel="stylesheet" th:href="@{/css/admin/iconpicker.css?version=3.0}" />
<link rel="stylesheet" th:href="@{/css/admin/dataTables.css?version=3.2.0}" />
<link rel="stylesheet" th:href="@{/css/admin/elements.css?version=3.2.0}" />
<link rel="stylesheet" th:href="@{/css/admin/error.css?version=3.2.0}" />
<link rel="stylesheet" th:href="@{/css/admin/footer.css?version=3.2.0}" />
<link rel="stylesheet" th:href="@{/css/admin/header.css?version=3.2.0}" />
<link rel="stylesheet" th:href="@{/css/admin/layout.css?version=3.2.0}" />
<link rel="stylesheet" th:href="@{/css/admin/mapping.css?version=3.2.0}" />
<link rel="stylesheet" th:href="@{/css/admin/iconpicker.css?version=3.2.0}" />
</th:block>

<th:block layout:fragment="mobileCSS">
<link rel="stylesheet" th:href="@{/css/mobile/layout.css?version=3.0}" />
<link rel="stylesheet" th:href="@{/css/mobile/style.css?version=3.0}" />
<link rel="stylesheet" th:href="@{/css/mobile/survey.css?version=3.0}" />
<link rel="stylesheet" th:href="@{/css/mobile/layout.css?version=3.2.0}" />
<link rel="stylesheet" th:href="@{/css/mobile/style.css?version=3.2.0}" />
<link rel="stylesheet" th:href="@{/css/mobile/survey.css?version=3.2.0}" />
</th:block>

<th:block layout:fragment="mobileJS">
<script th:src="@{/js/mobile/helper/login.js?version=3.0}"></script>
<script th:src="@{/js/mobile/helper/user.js?version=3.0}"></script>
<script th:src="@{/js/mobile/helper/footer.js?version=3.0}"></script>
<script th:src="@{/js/mobile/helper/pseudonymization.js?version=3.0}"></script>
<script th:src="@{/js/mobile/helper/survey/mobileApplication.js?version=3.0}"></script>
<script th:src="@{/js/mobile/helper/login.js?version=3.2.0}"></script>
<script th:src="@{/js/mobile/helper/user.js?version=3.2.0}"></script>
<script th:src="@{/js/mobile/helper/footer.js?version=3.2.0}"></script>
<script th:src="@{/js/mobile/helper/pseudonymization.js?version=3.2.0}"></script>
<script th:src="@{/js/mobile/helper/survey/mobileApplication.js?version=3.2.0}"></script>

<script th:src="@{/js/mobile/survey/selectBundle.js?version=3.0}"></script>
<script th:src="@{/js/mobile/survey/selectBundle.js?version=3.2.0}"></script>

<script th:src="@{/js/mobile/survey/helpMode.js?version=3.0}"></script>
<script th:src="@{/js/mobile/helper/survey/questionStyleEnhancer.js?version=3.0}"></script>
<script th:src="@{/js/mobile/survey/survey.js?version=3.0}"></script>
<script th:src="@{/js/mobile/survey/navigation.js?version=3.0}"></script>
<script th:src="@{/js/mobile/survey/selector.js?version=3.0}"></script>
<script th:src="@{/js/mobile/survey/model/encounter.js?version=3.0}"></script>
<script th:src="@{/js/mobile/survey/model/bundle.js?version=3.0}"></script>
<script th:src="@{/js/mobile/survey/model/questionnaire.js?version=3.0}"></script>
<script th:src="@{/js/mobile/survey/model/bundleQuestionnaire.js?version=3.0}"></script>
<script th:src="@{/js/mobile/survey/model/question.js?version=3.0}"></script>
<script th:src="@{/js/mobile/survey/model/answer.js?version=3.0}"></script>
<script th:src="@{/js/mobile/survey/model/condition.js?version=3.0}"></script>
<script th:src="@{/js/mobile/survey/model/configuration.js?version=3.0}"></script>
<script th:src="@{/js/mobile/survey/model/response.js?version=3.0}"></script>
<script th:src="@{/js/mobile/survey/model/pointOnImage.js?version=3.0}"></script>
<script th:src="@{/js/mobile/helper/survey/stepsizeRounding.js?version=3.0}"></script>
<script th:src="@{/js/mobile/helper/selector/freeTextCleaner.js?version=3.0}"></script>
<script th:src="@{/js/mobile/survey/helpMode.js?version=3.2.0}"></script>
<script th:src="@{/js/mobile/helper/survey/questionStyleEnhancer.js?version=3.2.0}"></script>
<script th:src="@{/js/mobile/survey/survey.js?version=3.2.0}"></script>
<script th:src="@{/js/mobile/survey/navigation.js?version=3.2.0}"></script>
<script th:src="@{/js/mobile/survey/selector.js?version=3.2.0}"></script>
<script th:src="@{/js/mobile/survey/model/encounter.js?version=3.2.0}"></script>
<script th:src="@{/js/mobile/survey/model/bundle.js?version=3.2.0}"></script>
<script th:src="@{/js/mobile/survey/model/questionnaire.js?version=3.2.0}"></script>
<script th:src="@{/js/mobile/survey/model/bundleQuestionnaire.js?version=3.2.0}"></script>
<script th:src="@{/js/mobile/survey/model/question.js?version=3.2.0}"></script>
<script th:src="@{/js/mobile/survey/model/answer.js?version=3.2.0}"></script>
<script th:src="@{/js/mobile/survey/model/condition.js?version=3.2.0}"></script>
<script th:src="@{/js/mobile/survey/model/configuration.js?version=3.2.0}"></script>
<script th:src="@{/js/mobile/survey/model/response.js?version=3.2.0}"></script>
<script th:src="@{/js/mobile/survey/model/pointOnImage.js?version=3.2.0}"></script>
<script th:src="@{/js/mobile/helper/survey/stepsizeRounding.js?version=3.2.0}"></script>
<script th:src="@{/js/mobile/helper/selector/freeTextCleaner.js?version=3.2.0}"></script>
</th:block>
10 changes: 5 additions & 5 deletions src/main/webapp/WEB-INF/layout/error.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
<head>
<meta charset="utf-8" />

<script th:src="@{/js/jQuery/jquery.min.js?version=3.0}"></script>
<script th:src="@{/js/jQuery/jquery.min.js?version=3.2.0}"></script>
<script
defer
th:src="@{/js/modernizr/modernizr-custom.js?version=3.0}"
th:src="@{/js/modernizr/modernizr-custom.js?version=3.2.0}"
></script>

<link
Expand All @@ -20,15 +20,15 @@

<link
rel="stylesheet"
th:href="@{/css/bootstrap/bootstrap.min.css?version=3.0}"
th:href="@{/css/bootstrap/bootstrap.min.css?version=3.2.0}"
/>
<link
rel="stylesheet"
th:href="@{/css/bootstrap/bootstrap-icons.min.css?version=3.0}"
th:href="@{/css/bootstrap/bootstrap-icons.min.css?version=3.2.0}"
/>
<link
rel="stylesheet"
th:href="@{/css/bootstrap/fileinput.min.css?version=3.0}"
th:href="@{/css/bootstrap/fileinput.min.css?version=3.2.0}"
/>

<!--/* Set thymeleaf variable "deployment" to "LOCAL" to add all css files independently, so that debugging is possible
Expand Down
14 changes: 7 additions & 7 deletions src/main/webapp/WEB-INF/layout/login.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@

<link
rel="stylesheet"
th:href="@{/css/bootstrap/bootstrap.min.css?version=3.0}"
th:href="@{/css/bootstrap/bootstrap.min.css?version=3.2.0}"
/>
<link
rel="stylesheet"
th:href="@{/css/bootstrap/bootstrap-icons.min.css?version=3.0}"
th:href="@{/css/bootstrap/bootstrap-icons.min.css?version=3.2.0}"
/>
<link
rel="stylesheet"
th:href="@{/css/bootstrap/fileinput.min.css?version=3.0}"
th:href="@{/css/bootstrap/fileinput.min.css?version=3.2.0}"
/>

<th:block
Expand All @@ -55,16 +55,16 @@
<![endif]-->

<!--/* JQuery Basics */-->
<script th:src="@{/js/jQuery/jquery.min.js?version=3.0}"></script>
<script th:src="@{/js/jQuery/jquery.min.js?version=3.2.0}"></script>

<!--/* Modernizr to query specific device types */-->
<script th:src="@{/js/modernizr/modernizr-custom.js?version=3.0}"></script>
<script th:src="@{/js/modernizr/modernizr-custom.js?version=3.2.0}"></script>

<!--/* Bootstrap */-->
<script th:src="@{/js/bootstrap/bootstrap.min.js?version=3.0}"></script>
<script th:src="@{/js/bootstrap/bootstrap.min.js?version=3.2.0}"></script>

<!--/* Always import dialog from non mobile helper directory */-->
<script th:src="@{/js/helper/dialog.js?version=3.0}"></script>
<script th:src="@{/js/helper/dialog.js?version=3.2.0}"></script>

<th:block
layout:replace="~{fragments/resourceFragment :: mobileJS}"
Expand Down
42 changes: 21 additions & 21 deletions src/main/webapp/WEB-INF/layout/main.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,25 +24,25 @@
<!--/* WYSIWYG Editor */-->
<link
rel="stylesheet"
th:href="@{/css/wysiwyg/summernote-bs5.min.css?version=3.0}"
th:href="@{/css/wysiwyg/summernote-bs5.min.css?version=3.2.0}"
/>
<!--/* dataTables */-->
<link
rel="stylesheet"
th:href="@{/css/jQuery/dataTables/datatables.min.css?version=3.0}"
th:href="@{/css/jQuery/dataTables/datatables.min.css?version=3.2.0}"
/>
<!--/* Bootstrap */-->
<link
rel="stylesheet"
th:href="@{/css/bootstrap/bootstrap.min.css?version=3.0}"
th:href="@{/css/bootstrap/bootstrap.min.css?version=3.2.0}"
/>
<link
rel="stylesheet"
th:href="@{/css/bootstrap/bootstrap-icons.min.css?version=3.0}"
th:href="@{/css/bootstrap/bootstrap-icons.min.css?version=3.2.0}"
/>
<link
rel="stylesheet"
th:href="@{/css/bootstrap/fileinput.min.css?version=3.0}"
th:href="@{/css/bootstrap/fileinput.min.css?version=3.2.0}"
/>


Expand All @@ -54,70 +54,70 @@
<th:block layout:fragment="links"></th:block>

<!--/* JQuery Basics */-->
<script th:src="@{/js/jQuery/jquery.min.js?version=3.0}"></script>
<script th:src="@{/js/jQuery/jquery.min.js?version=3.2.0}"></script>
<script
defer
th:src="@{/js/modernizr/modernizr-custom.js?version=3.0}"
th:src="@{/js/modernizr/modernizr-custom.js?version=3.2.0}"
></script>
<!--/* Sortable + jquery bindings */-->
<script th:src="@{/js/sortable/Sortable.min.js?version=3.0}"></script>
<script th:src="@{/js/sortable/jquery-sortable.js?version=3.0}"></script>
<script th:src="@{/js/sortable/Sortable.min.js?version=3.2.0}"></script>
<script th:src="@{/js/sortable/jquery-sortable.js?version=3.2.0}"></script>

<!--/* WYSIWYG Editor */-->
<script
defer
th:src="@{/js/wysiwyg/summernote-bs5.min.js?version=3.0}"
th:src="@{/js/wysiwyg/summernote-bs5.min.js?version=3.2.0}"
></script>
<script
defer
th:src="@{/js/wysiwyg/summernote-de-DE.min.js?version=3.0}"
th:src="@{/js/wysiwyg/summernote-de-DE.min.js?version=3.2.0}"
></script>
<script
defer
th:src="@{/js/wysiwyg/summernote-es-ES.min.js?version=3.0}"
th:src="@{/js/wysiwyg/summernote-es-ES.min.js?version=3.2.0}"
></script>


<!--/* dataTables */-->
<script
defer
th:src="@{/js/jQuery/dataTables/jquery.dataTables.min.js?version=3.0}"
th:src="@{/js/jQuery/dataTables/jquery.dataTables.min.js?version=3.2.0}"
></script>
<script
defer
th:src="@{/js/jQuery/dataTables/datatables.min.js?version=3.0}"
th:src="@{/js/jQuery/dataTables/datatables.min.js?version=3.2.0}"
></script>
<!--/* Bootstrap */-->
<script
defer
th:src="@{/js/bootstrap/bootstrap.min.js?version=3.0}"
th:src="@{/js/bootstrap/bootstrap.min.js?version=3.2.0}"
></script>
<!--/* file upload */-->
<script
defer
th:src="@{/js/bootstrap/fileinput.min.js?version=3.0}"
th:src="@{/js/bootstrap/fileinput.min.js?version=3.2.0}"
></script>
<script
defer
th:src="@{/js/bootstrap/locales/de.js?version=3.0}"
th:src="@{/js/bootstrap/locales/de.js?version=3.2.0}"
></script>
<script
defer
th:src="@{/js/bootstrap/locales/es.js?version=3.0}"
th:src="@{/js/bootstrap/locales/es.js?version=3.2.0}"
></script>
<script
defer
th:src="@{/js/helper/dialog.js?version=3.0}"
th:src="@{/js/helper/dialog.js?version=3.2.0}"
></script>
<script
defer
th:src="@{/js/helper/image.js?version=3.0}"
th:src="@{/js/helper/image.js?version=3.2.0}"
></script>
<!--/* Iconpicker for slider questions */-->
<script
type="module"
defer
th:src="@{/js/iconpicker.js?version=3.0}"
th:src="@{/js/iconpicker.js?version=3.2.0}"
></script>

<th:block
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/layout/mobile.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
*/-->
<th:block layout:decorate="~{layout/login}">
<th:block layout:fragment="addScripts">
<script th:src="@{/js/zxing/zxing.min.js?version=3.0}"></script>
<script th:src="@{/js/zxing/zxing.min.js?version=3.2.0}"></script>
</th:block>
</th:block>
6 changes: 3 additions & 3 deletions src/main/webapp/WEB-INF/layout/mobileQuestionnaire.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
<th:block layout:fragment="header"></th:block>

<th:block layout:fragment="addScripts">
<script th:src="@{/js/svg/svg.min.js?version=3.0}"></script>
<script th:src="@{/js/zxing/zxing.min.js?version=3.0}"></script>
<script th:src="@{/js/jQuery/jquery-barcode.min.js?version=3.0}"></script>
<script th:src="@{/js/svg/svg.min.js?version=3.2.0}"></script>
<script th:src="@{/js/zxing/zxing.min.js?version=3.2.0}"></script>
<script th:src="@{/js/jQuery/jquery-barcode.min.js?version=3.2.0}"></script>
</th:block>

<th:block layout:fragment="content"></th:block>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/layout/mobileUser.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
th:with="onLoad='initUser();'"
>
<th:block layout:fragment="addScripts">
<script th:src="@{/js/mobile/helper/user.js?version=3.0}"></script>
<script th:src="@{/js/mobile/helper/user.js?version=3.2.0}"></script>
</th:block>
</th:block>
Loading

0 comments on commit ac0a89e

Please sign in to comment.