Skip to content

Commit f8724b9

Browse files
thomaswoehlkethomaswoehlke
committed
work
1 parent 221d8ab commit f8724b9

File tree

2 files changed

+66
-65
lines changed

2 files changed

+66
-65
lines changed

‎src/main/resources/templates/search/resultlist.html‎

Lines changed: 36 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -5,54 +5,53 @@
55
xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
66
xmlns:sd="http://www.thymeleaf.org/spring-data">
77
<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
8-
<title th:text="'SimpleWorklist | ' + #{searchRequest.resultlist.h1}">Title</title>
8+
<title th:text="'SimpleWorklist | ' + #{searchRequest.resultlist.h1}">Title</title>
99
</head>
1010
<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
1111

1212
<div th:fragment="mytwtitle">
13-
<h1>
14-
<span th:utext="#{searchRequest.resultlist.h1}">Search Result for searchterm</span>
15-
<i>${searchResult.searchterm}</i>
16-
</h1>
13+
<h1>
14+
<span th:utext="#{searchRequest.resultlist.h1}">Search Result for searchterm</span>
15+
<i>${searchResult.searchterm}</i>
16+
</h1>
1717
</div>
1818

1919
<div th:fragment="mytwcontent">
20-
<h2 th:if="${searchResult.taskList != null}">
21-
<span th:utext="#{searchRequest.resultlist.h2.noTasks}">No Tasks found</span>
20+
<h2 th:if="${searchResult.taskList != null}">
21+
<span th:utext="#{searchRequest.resultlist.h2.noTasks}">No Tasks found</span>
22+
</h2>
23+
<div th:if="${searchResult.taskList != null}">
24+
<h2>
25+
<span th:utext="#{searchRequest.resultlist.h2.tasks}">Tasks</span>
2226
</h2>
23-
<div th:if="${searchResult.taskList != null}">
24-
<h2>
25-
<span th:utext="#{searchRequest.resultlist.h2.tasks}">Tasks</span>
26-
</h2>
27-
<div th:replace="layout/tasks :: tw-tasks-table(dataList=${searchResult.taskList},myTaskState='ALL')">
28-
</div>
27+
<div th:replace="layout/tasks :: tw-tasks-table(dataList=${searchResult.taskList},myTaskState='ALL')">
2928
</div>
30-
<h2 th:if="${searchResult.projectList == null}">
31-
<span th:utext="#{searchRequest.resultlist.projects.h2.noProjects}">No Projects found</span>
29+
</div>
30+
<h2 th:if="${searchResult.projectList == null}">
31+
<span th:utext="#{searchRequest.resultlist.projects.h2.noProjects}">No Projects found</span>
32+
</h2>
33+
<div th:if="${searchResult.projectList != null}">
34+
<h2>
35+
<span th:utext="#{searchRequest.resultlist.projects.h2.projects}">Projects</span>
3236
</h2>
33-
<div th:if="${searchResult.projectList != null}">
34-
<h2>
35-
<span th:utext="#{searchRequest.resultlist.projects.h2.projects}">Projects</span>
36-
</h2>
37-
<table class="table table-striped table-hover">
38-
<tr>
39-
<th><span th:utext="#{searchRequest.resultlist.projects.name}">Name</span></th>
40-
<th><span th:utext="#{searchRequest.resultlist.projects.description}">Description</span></th>
41-
</tr>
42-
<tr th:each="cat : ${searchResult.projectList}">
43-
<td>
44-
<a th:href="@{/project/{id}(id=${cat.id})}" th:id="'searchResultProject_' + ${cat.id}">
45-
<span th:text="${cat.name}">name</span>
46-
</a>
47-
</td>
48-
<td>
49-
<span th:text="${cat.description}">description</span>
50-
</td>
51-
</tr>
52-
</table>
53-
</div>
37+
<table class="table table-striped table-hover">
38+
<tr>
39+
<th><span th:utext="#{searchRequest.resultlist.projects.name}">Name</span></th>
40+
<th><span th:utext="#{searchRequest.resultlist.projects.description}">Description</span></th>
41+
</tr>
42+
<tr th:each="cat : ${searchResult.projectList}">
43+
<td>
44+
<a th:href="@{/project/{id}(id=${cat.id})}" th:id="'searchResultProject_' + ${cat.id}">
45+
<span th:text="${cat.name}">name</span>
46+
</a>
47+
</td>
48+
<td>
49+
<span th:text="${cat.description}">description</span>
50+
</td>
51+
</tr>
52+
</table>
53+
</div>
5454
</div>
5555

56-
5756
</body>
5857
</html>

‎src/main/resources/templates/taskstate/inbox.html‎

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,40 +5,42 @@
55
xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
66
xmlns:sd="http://www.thymeleaf.org/spring-data">
77
<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
8-
<title th:text="'SimpleWorklist | ' + #{tasks.inbox.h1}">Inbox</title>
8+
<title th:text="'SimpleWorklist | ' + #{tasks.inbox.h1}">Inbox</title>
99
</head>
1010
<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
1111

12-
<div th:fragment="mytwtitle">
13-
<div id="tw-content-title">
14-
<div class="row">
15-
<h1 class="col-md-12 mb-12">
16-
<i class="fas fa-inbox"></i>
17-
<span th:utext="#{tasks.inbox.h1}">Inbox</span>
18-
</h1>
19-
</div>
20-
<div class="row">
21-
<div id="tw-content-title-actionbuttons" class="col-md-3 mb-3">
22-
<a class="btn btn-block btn-primary" role="button" th:href="@{/taskstate/task/add}">
23-
<i class="fas fa-plus-square"></i>
24-
<span th:utext="#{tasks.inbox.addTask}">Add Task</span>
25-
</a>
26-
</div>
27-
</div>
28-
</div>
12+
<div th:fragment="mytwtitle">
13+
<div id="tw-content-title">
14+
<div class="row">
15+
<h1 class="col-md-12 mb-12">
16+
<i class="fas fa-inbox"></i>
17+
<span th:utext="#{tasks.inbox.h1}">Inbox</span>
18+
</h1>
2919
</div>
20+
<div class="row">
21+
<div id="tw-content-title-actionbuttons" class="col-md-3 mb-3">
22+
<a class="btn btn-block btn-primary" role="button" th:href="@{/taskstate/task/add}">
23+
<i class="fas fa-plus-square"></i>
24+
<span th:utext="#{tasks.inbox.addTask}">Add Task</span>
25+
</a>
26+
</div>
27+
</div>
28+
</div>
29+
</div>
3030

31-
<div th:fragment="mytwcontent">
32-
<div th:replace="layout/tasks :: tw-tasks-message(message=${message})" th:if="${message} != null" id="mytwcontent-message">
33-
</div>
34-
<div th:if="${taskPage.getTotalElements() gt 0}" id="mytwcontent-taskpage">
35-
<div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='INBOX', myUrlPath=@{/taskstate})">
36-
</div>
37-
</div>
38-
<div th:if="${taskPage.getTotalElements() eq 0}" id="mytwcontent-no-taskpage">
39-
<div th:text="#{tasks.inbox.noTasks}">You have no Tasks in Your Inbox</div>
40-
</div>
31+
<div th:fragment="mytwcontent">
32+
<div th:replace="layout/tasks :: tw-tasks-message(message=${message})" th:if="${message} != null"
33+
id="mytwcontent-message">
34+
</div>
35+
<div th:if="${taskPage.getTotalElements() gt 0}" id="mytwcontent-taskpage">
36+
<div
37+
th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='INBOX', myUrlPath=@{/taskstate})">
4138
</div>
39+
</div>
40+
<div th:if="${taskPage.getTotalElements() eq 0}" id="mytwcontent-no-taskpage">
41+
<div th:text="#{tasks.inbox.noTasks}">You have no Tasks in Your Inbox</div>
42+
</div>
43+
</div>
4244

4345
</body>
4446
</html>

0 commit comments

Comments
 (0)