Skip to content

Commit b5273c7

Browse files
thomaswoehlkethomaswoehlke
committed
fixed #401 Migrate spring-boot from 2 to 3
1 parent 469165b commit b5273c7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+127
-128
lines changed

‎src/main/resources/templates/layout/page.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<!-- Navbar on Top -->
4343
<header style="background-image: url('/img/jumbotron/berlin_skyline.png')" >
4444
<div style="background-color: rgba(255, 255, 255, 0.3)">
45-
<div th:replace="layout/navbartop :: navbartop(contexts=${contexts},locale=${locale},thisProject=${thisProject},numberOfNewIncomingMessages=${numberOfNewIncomingMessages},ctx=${ctx})">
45+
<div th:replace="~{layout/navbartop :: navbartop(contexts=${contexts},locale=${locale},thisProject=${thisProject},numberOfNewIncomingMessages=${numberOfNewIncomingMessages},ctx=${ctx})}">
4646
</div>
4747
<div class="jumbotron pt-3" id="tw-title-section">
4848
<div class="container">
@@ -51,10 +51,10 @@
5151
</div>
5252
<div th:if="${dataPage != null}">
5353
<!-- Breadcrumb -->
54-
<div th:replace="layout/breadcrumb :: breadcrumb(breadcrumb=${breadcrumb})" th:if="${taskstateType == ''}">
54+
<div th:replace="~{layout/breadcrumb :: breadcrumb(breadcrumb=${breadcrumb})}" th:if="${taskstateType == ''}">
5555
</div>
5656
<!-- taskstates -->
57-
<div th:replace="layout/taskstates :: navigation-taskstates(rootProjects=${rootProjects},thisProject=${thisProject})" class="link-dark">
57+
<div th:replace="~{layout/taskstates :: navigation-taskstates(rootProjects=${rootProjects},thisProject=${thisProject})}" class="link-dark">
5858
</div>
5959
</div>
6060
</div>
@@ -75,7 +75,7 @@
7575
<th:block th:replace="${twcontent}" />
7676
</div>
7777
<div class="col-md-4">
78-
<div th:replace="layout/projects :: navigation-projects(rootProjects=${rootProjects},thisProject=${thisProject})"></div>
78+
<div th:replace="~{layout/projects :: navigation-projects(rootProjects=${rootProjects},thisProject=${thisProject})}"></div>
7979
</div>
8080
</div>
8181
<div class="row" th:if="${dataPage == null}">

‎src/main/resources/templates/layout/projects.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</span>
2727
<span th:if="${rootProjects != null and rootProjects.size() gt 0}">
2828
<ul
29-
th:include="this :: tw-project-submenu(projectList=${rootProjects},thisProject=${thisProject})"
29+
th:include="~{this :: tw-project-submenu(projectList=${rootProjects},thisProject=${thisProject})}"
3030
style="list-style: none;">
3131
</ul>
3232
</span>
@@ -61,7 +61,7 @@
6161
</a>
6262

6363
<span th:if="${project.children.size() gt 0}">
64-
<ul th:include="this :: tw-project-submenu(projectList=${project.children},thisProject=${thisProject})"
64+
<ul th:include="~{this :: tw-project-submenu(projectList=${project.children},thisProject=${thisProject})}"
6565
style="list-style: none;">
6666
</ul>
6767
</span>

‎src/main/resources/templates/layout/tasks.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515

1616
<div th:fragment="tw-tasks-table(taskPage,myTaskState,myUrlPath)" sec:authorize="isAuthenticated()">
1717
<div class="container">
18-
<div th:replace="this :: tw-tasks-page-table(taskPage=${taskPage},myTaskState=${myTaskState},myUrlPath=${myUrlPath})"></div>
19-
<div th:replace="this :: tw-tasks-pagination(page=${taskPage})"></div>
18+
<div th:replace="~{this :: tw-tasks-page-table(taskPage=${taskPage},myTaskState=${myTaskState},myUrlPath=${myUrlPath})}"></div>
19+
<div th:replace="~{this :: tw-tasks-pagination(page=${taskPage})}"></div>
2020
</div>
2121
</div>
2222

‎src/main/resources/templates/pages/information.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
xmlns:th="http://www.thymeleaf.org"
55
xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
66
xmlns:sd="http://www.thymeleaf.org/spring-data">
7-
<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
7+
<head th:replace="~{layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)}">
88
<title th:text="'SimpleWorklist | ' + #{pages.information.h1}">Information</title>
99
</head>
10-
<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
10+
<body th:replace="~{layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})}">
1111

1212
<div th:fragment="mytwtitle">
1313
<div id="tw-content-title">

‎src/main/resources/templates/project/id/edit.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
xmlns:th="http://www.thymeleaf.org"
55
xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
66
xmlns:sd="http://www.thymeleaf.org/spring-data">
7-
<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
7+
<head th:replace="~{layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)}">
88
<title th:text="'SimpleWorklist | ' + #{project.edit.h1}">Title</title>
99
</head>
10-
<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{::script})">
10+
<body th:replace="~{layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{::script})}">
1111

1212
<div th:fragment="mytwtitle">
1313
<!-- New Project Form -->

‎src/main/resources/templates/project/id/project/add.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
xmlns:th="http://www.thymeleaf.org"
55
xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
66
xmlns:sd="http://www.thymeleaf.org/spring-data">
7-
<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
7+
<head th:replace="~{layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)}">
88
<title th:text="'SimpleWorklist | ' + #{project.add.h1}">Title</title>
99
</head>
10-
<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{::script})">
10+
<body th:replace="~{layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{::script})}">
1111

1212
<div th:fragment="mytwtitle">
1313
<!-- New Project Form -->
@@ -20,7 +20,7 @@ <h1>
2020
<div th:fragment="mytwcontent">
2121
<form id="formId" class="was-validated" method="post"
2222
th:action="@{/project/{id}/project/add(id=${thisProject.id})}" th:object="${project}">
23-
<div th:replace="layout/project :: tw-project-form(project=${project},contexts=${contexts})"></div>
23+
<div th:replace="~{layout/project :: tw-project-form(project=${project},contexts=${contexts})}"></div>
2424
<div class="row my-3">
2525
<div class="col">
2626
<a th:href="@{/project/{projectId}(projectId=${thisProject.id})}"

‎src/main/resources/templates/project/id/show.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
xmlns:th="http://www.thymeleaf.org"
55
xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
66
xmlns:sd="http://www.thymeleaf.org/spring-data">
7-
<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
7+
<head th:replace="~{layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)}">
88
<title th:text="'SimpleWorklist | ' + #{project.show.h1}">Title</title>
99
</head>
10-
<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
10+
<body th:replace="~{layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})}">
1111

1212
<div th:fragment="mytwtitle">
1313
<div id="tw-content-title">
@@ -61,10 +61,10 @@ <h2>
6161

6262
<div th:fragment="mytwcontent">
6363
<!-- Document Window -->
64-
<div th:replace="layout/tasks :: tw-tasks-message(message=${message})">
64+
<div th:replace="~{layout/tasks :: tw-tasks-message(message=${message})}">
6565
</div>
6666
<div th:if="${taskPage.getTotalElements() gt 0}">
67-
<div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage}, myTaskState='PROJECT', myUrlPath=@{/project/{thisProjectId}(thisProjectId=${thisProject.id})} )">
67+
<div th:replace="~{layout/tasks :: tw-tasks-table(taskPage=${taskPage}, myTaskState='PROJECT', myUrlPath=@{/project/{thisProjectId}(thisProjectId=${thisProject.id})})}">
6868
</div>
6969
</div>
7070
<div th:if="${taskPage.getTotalElements() eq 0}">

‎src/main/resources/templates/project/id/task/add.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
xmlns:th="http://www.thymeleaf.org"
55
xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
66
xmlns:sd="http://www.thymeleaf.org/spring-data">
7-
<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
7+
<head th:replace="~{layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)}">
88
<title th:text="'SimpleWorklist | ' + #{task.add.h1}">Title</title>
99
</head>
10-
<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},,scripts=~{::script})">
10+
<body th:replace="~{layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},,scripts=~{::script})}">
1111

1212
<div th:fragment="mytwtitle">
1313
<!-- New Task Form -->
@@ -20,7 +20,7 @@ <h1>
2020
<div th:fragment="mytwcontent">
2121
<form id="formId" class="was-validated" method="post"
2222
th:action="@{/project/{projectId}/task/add(projectId=${thisProject.id})}" th:object="${task}">
23-
<div th:replace="layout/task :: tw-task-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
23+
<div th:replace="~{layout/task :: tw-task-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})}"></div>
2424
<div class="row my-3">
2525
<div class="col">
2626
<a th:href="@{/project/{projectId}(projectId=${thisProject.id})}"

‎src/main/resources/templates/project/id/task/edit.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
xmlns:th="http://www.thymeleaf.org"
55
xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
66
xmlns:sd="http://www.thymeleaf.org/spring-data">
7-
<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
7+
<head th:replace="~{layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)}">
88
<title th:text="'SimpleWorklist | ' + #{task.show.h1}">Title</title>
99
</head>
10-
<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{::script})">
10+
<body th:replace="~{layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{::script})}">
1111

1212
<div th:fragment="mytwtitle">
1313
<!-- Document Window -->
@@ -21,7 +21,7 @@ <h1>
2121
<div>
2222
<form id="formId" th:object="${task}" method="post" class="was-validated"
2323
th:action="@{/project/{projectId}/task/{taskId}/edit(taskId=${task.id},projectId=${thisProject.id})}" >
24-
<div th:replace="layout/task :: tw-task-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
24+
<div th:replace="~{layout/task :: tw-task-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})}"></div>
2525
<div class="row my-3">
2626
<div class="col">
2727
<a th:href="@{/project/{projectId}(projectId=${thisProject.id})}" class="btn btn-secondary btn-block"

‎src/main/resources/templates/project/root/project/add.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
xmlns:th="http://www.thymeleaf.org"
55
xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
66
xmlns:sd="http://www.thymeleaf.org/spring-data">
7-
<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
7+
<head th:replace="~{layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)}">
88
<title th:text="'SimpleWorklist | ' + #{project.add.h1}">Title</title>
99
</head>
10-
<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{::script})">
10+
<body th:replace="~{layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{::script})}">
1111

1212
<div th:fragment="mytwtitle">
1313
<!-- New Project Form -->
@@ -20,7 +20,7 @@ <h1>
2020
<div th:fragment="mytwcontent">
2121
<form id="formId" class="was-validated" method="post"
2222
th:action="@{/project/root/project/add}" th:object="${project}">
23-
<div th:replace="layout/project :: tw-project-form(project=${project},contexts=${contexts})"></div>
23+
<div th:replace="~{layout/project :: tw-project-form(project=${project},contexts=${contexts})}"></div>
2424
<div class="row my-3">
2525
<div class="col">
2626
<a th:href="@{/project/root}"

0 commit comments

Comments
 (0)