Skip to content

Commit 3525c79

Browse files
thomaswoehlkethomaswoehlke
committed
work
1 parent 26f2183 commit 3525c79

File tree

4 files changed

+86
-42
lines changed

4 files changed

+86
-42
lines changed

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

Lines changed: 80 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -12,114 +12,158 @@
1212
<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
1313
<div class="row">
1414
<div class="col">
15-
<div class="form-group">
16-
<label th:for="${#ids.next('title')}" class="control-label">
17-
<span th:utext="#{task.show.title}">Title</span>
18-
</label>
19-
<input type="text" th:field="*{title}" class="form-control form-control-lg is-invalid" required/>
15+
<label th:for="${#ids.next('title')}" class="control-label">
16+
<span th:utext="#{task.show.title}">Title</span>
17+
</label>
18+
<div class="form-group input-group is-invalid">
19+
20+
<span class="input-group-text is-invalid" id="basic-addon1">
21+
<i class="fa-solid fa-at"></i>
22+
</span>
23+
24+
<input type="text" th:field="*{title}" class="form-control form-control-lg is-invalid" aria-describedby="basic-addon1" required/>
2025
<div th:each="err : ${#fields.errors('title')}">
2126
<div class="invalid-feedback" th:text="${err}">err</div>
2227
</div>
2328
</div>
2429
</div>
2530
</div>
26-
<div class="row">
31+
32+
<div class="row my-2">
2733
<div class="col">
28-
<div class="form-group">
29-
<label th:for="${#ids.next('listTaskState')}" class="control-label">
30-
<span th:utext="#{tasks.col.taskState}">taskState</span>
31-
</label>
32-
<select th:field="*{taskState}" class="form-control form-control-lg is-invalid" required>
34+
<label th:for="${#ids.next('listTaskState')}" class="control-label">
35+
<span th:utext="#{tasks.col.taskState}">taskState</span>
36+
</label>
37+
<div class="form-group input-group is-invalid">
38+
39+
<span class="input-group-text is-invalid" id="basic-addon2">
40+
<i class="fa-solid fa-person-digging"></i>
41+
</span>
42+
43+
<select th:field="*{taskState}" class="form-control form-control-lg is-invalid" aria-describedby="basic-addon2" required>
3344
<option th:each="taskStateItem : ${listTaskState}"
3445
th:value="${taskStateItem.value}"
3546
th:text="${#messages.msgOrNull(taskStateItem.code)}">
3647
taskStateItem
3748
</option>
3849
</select>
50+
3951
<div th:each="err : ${#fields.errors('taskState')}">
4052
<div class="invalid-feedback" th:text="${err}">err</div>
4153
</div>
4254
</div>
4355
</div>
56+
4457
<div class="col">
45-
<div class="form-group">
46-
<label for="taskDueDate" class="control-label">
47-
<span th:utext="#{task.show.dueDate}">dueDate</span>
48-
</label>
49-
<input id="taskDueDate" type="text" th:field="*{dueDate}"
50-
class="form-control form-control-lg is-invalid"/>
58+
<label for="taskDueDate" class="control-label">
59+
<span th:utext="#{task.show.dueDate}">dueDate</span>
60+
</label>
61+
<div class="form-group input-group is-invalid">
62+
63+
<span class="input-group-text is-invalid" id="basic-addon3">
64+
<i class="fa-solid fa-calendar-days"></i>
65+
</span>
66+
67+
<input id="taskDueDate" type="date" th:field="*{dueDate}"
68+
class="form-control form-control-lg is-invalid" aria-describedby="basic-addon3"/>
5169
<div th:each="err : ${#fields.errors('dueDate')}">
5270
<div class="invalid-feedback" th:text="${err}">err</div>
5371
</div>
5472
</div>
5573
</div>
5674
</div>
57-
<div class="row">
75+
76+
<div class="row my-2">
5877
<div class="col">
59-
<div class="form-group">
60-
<label th:for="${#ids.next('taskEnergy')}" class="control-label">
61-
<span th:utext="#{task.show.taskEnergy}">taskEnergy</span>
62-
</label>
63-
<select th:field="*{taskEnergy}" class="form-control form-control-lg is-invalid">
78+
<label th:for="${#ids.next('taskEnergy')}" class="control-label">
79+
<span th:utext="#{task.show.taskEnergy}">taskEnergy</span>
80+
</label>
81+
<div class="form-group input-group is-invalid">
82+
83+
<span class="input-group-text is-invalid" id="basic-addon4">
84+
<i class="fa-solid fa-bolt"></i>
85+
</span>
86+
87+
<select th:field="*{taskEnergy}" class="form-control form-control-lg is-invalid" aria-describedby="basic-addon4">
6488
<option th:each="taskEnergyItem : ${listTaskEnergy}"
6589
th:value="${taskEnergyItem.value}"
6690
th:text="${#messages.msgOrNull(taskEnergyItem.code)}">
6791
taskEnergyItem
6892
</option>
6993
</select>
94+
7095
<div th:each="err : ${#fields.errors('taskEnergy')}">
7196
<div class="invalid-feedback" th:text="${err}">err</div>
7297
</div>
7398
</div>
7499
</div>
100+
75101
<div class="col">
76-
<div class="form-group">
77-
<label th:for="${#ids.next('taskTime')}" class="control-label">
78-
<span th:utext="#{task.show.taskTime}">Time</span>
79-
</label>
80-
<select th:field="*{taskTime}" class="form-control form-control-lg is-invalid">
102+
<label th:for="${#ids.next('taskTime')}" class="control-label">
103+
<span th:utext="#{task.show.taskTime}">Time</span>
104+
</label>
105+
<div class="form-group input-group is-invalid">
106+
107+
<span class="input-group-text is-invalid" id="basic-addon5">
108+
<i class="fa-solid fa-clock"></i>
109+
</span>
110+
111+
<select th:field="*{taskTime}" class="form-control form-control-lg is-invalid" aria-describedby="basic-addon5">
81112
<option th:each="taskTimeItem : ${listTaskTime}"
82113
th:value="${taskTimeItem.value}"
83114
th:text="${#messages.msgOrNull(taskTimeItem.code)}">
84115
taskTimeItem
85116
</option>
86117
</select>
118+
87119
<div th:each="err : ${#fields.errors('taskEnergy')}">
88120
<div class="invalid-feedback" th:text="${err}">err</div>
89121
</div>
122+
90123
</div>&nbsp;
91124
</div>
92125
<div class="col">
93-
<div class="form-group">
94-
<label th:for="${#ids.next('context.id')}" class="control-label">
95-
<span th:utext="#{task.show.context}">Context</span>
96-
</label>
97-
<select th:field="*{context.id}" class="form-control form-control-lg is-invalid">
126+
<label th:for="${#ids.next('context.id')}" class="control-label">
127+
<span th:utext="#{task.show.context}">Context</span>
128+
</label>
129+
<div class="form-group input-group is-invalid">
130+
131+
<span class="input-group-text is-invalid" id="basic-addon6">
132+
<i class="fa-solid fa-cloud"></i>
133+
</span>
134+
135+
<select th:field="*{context.id}" class="form-control form-control-lg" aria-describedby="basic-addon6">
98136
<option th:each="contextOption : ${contexts}"
99137
th:value="${contextOption.id}"
100138
th:text="${locale == 'de' ? contextOption.nameDe : contextOption.nameEn}">
101139
contextOption
102140
</option>
103141
</select>
142+
104143
<div th:each="err : ${#fields.errors('context.id')}">
105144
<div class="invalid-feedback" th:text="${err}">err</div>
106145
</div>
107146
</div>
108147
</div>
109148
</div>
110-
<div class="row">
149+
150+
<div class="row my-2">
111151
<div class="col">
112-
<div class="form-group">
152+
<div class="form-group is-invalid">
153+
113154
<label th:for="textEditor" class="control-label">
114155
<span th:utext="#{task.show.text}">Text</span>
115156
</label>
157+
116158
<textarea id="textEditor" name="textEditor" rows="10" cols="50"
117159
class="form-control form-control-lg is-invalid"
118160
th:field="*{text}">Text
119-
</textarea>
161+
</textarea>
162+
120163
<div th:each="err : ${#fields.errors('text')}">
121164
<div class="invalid-feedback" th:text="${err}">err</div>
122165
</div>
166+
123167
</div>
124168
</div>
125169
</div>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ <h1>
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})}" >
2424
<div th:replace="layout/task :: tw-task-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
25-
<div class="row">
25+
<div class="row my-3">
2626
<div class="col">
2727
<a th:href="@{/taskstate/task/{id}/transform(id=${task.id})}" class="btn btn-secondary btn-block"
2828
role="button">
@@ -37,7 +37,7 @@ <h1>
3737
</button>
3838
</div>
3939
<div class="col">
40-
<a class="btn btn-secondary btn-block" role="button"
40+
<a class="btn btn-outline-secondary btn-block" role="button"
4141
th:href="@{/project/{projectId}/task/{id}/transform(id=${task.id},projectId=${thisProject.id})}">
4242
<i class="fas fa-project-diagram"></i>
4343
<span th:utext="#{task.show.transform}">Transform into Project</span>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ <h1 class="tw-title">
2222
<form id="formId" method="post" class="was-validated"
2323
th:action="@{/project/root/task/{taskId}/edit(taskId=${task.id})}" th:object="${task}">
2424
<div th:replace="layout/task :: tw-task-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
25-
<div class="row">
25+
<div class="row my-3">
2626
<div class="col">
2727
<a th:href="@{/taskstate/task/{id}/transform(id=${task.id})}" class="btn btn-secondary btn-block"
2828
role="button">
@@ -37,7 +37,7 @@ <h1 class="tw-title">
3737
</button>
3838
</div>
3939
<div class="col">
40-
<a th:href="@{/project/root/task/{id}/transform(id=${task.id})}" class="btn btn-secondary btn-block"
40+
<a th:href="@{/project/root/task/{id}/transform(id=${task.id})}" class="btn btn-outline-secondary btn-block"
4141
role="button">
4242
<i class="fas fa-project-diagram"></i>
4343
<span th:utext="#{task.show.transform}">Transform into Project</span>

‎src/main/resources/templates/taskstate/task/edit.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ <h1>
2424
<div
2525
th:replace="layout/task :: tw-task-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})">
2626
</div>
27-
<div class="row">
27+
<div class="row my-3">
2828
<div class="col">
2929
<a th:href="@{/taskstate/task/{id}/transform(id=${task.id})}" class="btn btn-secondary btn-block"
3030
role="button">
@@ -39,7 +39,7 @@ <h1>
3939
</button>
4040
</div>
4141
<div class="col">
42-
<a th:href="@{/taskstate/task/{id}/transform(id=${task.id})}" class="btn btn-secondary btn-block"
42+
<a th:href="@{/taskstate/task/{id}/transform(id=${task.id})}" class="btn btn-outline-secondary btn-block"
4343
role="button">
4444
<i class="fas fa-project-diagram"></i>
4545
<span th:utext="#{task.show.transform}">Transform into Project</span>

0 commit comments

Comments
 (0)