Skip to content

Commit d246a54

Browse files
thomaswoehlkethomaswoehlke
committed
removed liquibase
1 parent 3e6bf9b commit d246a54

File tree

3 files changed

+42
-35
lines changed

3 files changed

+42
-35
lines changed

‎src/main/resources/messages_de.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ task.add.taskEnergy=Energie
131131
task.add.taskTime=Zeit
132132
task.add.button=Neue Aufgabe speichern
133133
layout.page.signedInUser=Angemeldet als
134+
task.show.focus=Fokus
134135
task.show.title=Aufgabe
135136
task.show.dueDate=Fälligkeitsdatum
136137
task.show.text=Beschreibung
@@ -256,6 +257,7 @@ task.col.twtooltip.badge.taskEnergy=Energie Aufwand
256257
task.col.twtooltip.badge.taskTime=Zeit Aufwand
257258
task.col.twtooltip.context=Kontext
258259
tasks.col.info.icons= 
260+
tasks.col.focus=Fokus
259261
tasks.col.title=Title
260262
tasks.col.dueDate=Fälligkeitsdatum
261263
tasks.col.taskState=Status

‎src/main/resources/messages_en.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ task.add.taskEnergy=Energy
130130
task.add.taskTime=Time
131131
task.add.button=Add Task
132132
layout.page.signedInUser=Signed in as
133+
task.show.focus=Focus
133134
task.show.title=Title
134135
task.show.dueDate=Due Date
135136
task.show.text=Description
@@ -255,6 +256,7 @@ task.col.twtooltip.badge.taskEnergy=Energy Amount
255256
task.col.twtooltip.badge.taskTime=Time Amount
256257
task.col.twtooltip.context=Context
257258
tasks.col.info.icons= 
259+
tasks.col.focus=Focus
258260
tasks.col.title=Title
259261
tasks.col.dueDate=Due Date
260262
tasks.col.taskState=Task State

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

Lines changed: 38 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<thead>
2727
<tr>
2828
<th class="task_col task_col_info_icons" th:utext="#{tasks.col.info.icons}">&nbsp;</th>
29+
<th class="task_col task_col_info_icons" th:utext="#{tasks.col.focus}">Focus</th>
2930
<th class="task_col task_col_title" th:text="#{tasks.col.title}">
3031
Title
3132
</th>
@@ -56,7 +57,6 @@
5657
ondrop="dropTask2Task(event)" ondragover="allowDropOfTask(event)">
5758

5859
<td th:id="'task_' + ${task.id} + '_col_info_icons'" class="task_col task_col_info_icons">
59-
6060
<a th:href="@{{myUrlPath}/task/{id}/complete(id=${task.id},myUrlPath=${myUrlPath})}"
6161
th:if="${task.taskState.name() ne 'COMPLETED' and task.taskState.name() ne 'TRASHED'}"
6262
class="task_col_content task_col_content_finish twtooltip" data-placement="bottom"
@@ -73,6 +73,8 @@
7373
th:if="${task.taskState.name() eq 'TRASHED'}"
7474
th:alt-title="#{task.col.twtooltip.infoicons.trash}"
7575
draggable="true" ondragstart="dragTask(event)" data-placement="bottom"></i>
76+
</td>
77+
<td th:id="'task_' + ${task.id} + '_col_focus_icons'" class="task_col task_col_info_icons">
7678
<a th:if="${task.focus}" th:href="@{{myUrlPath}/task/{id}/unsetfocus(id=${task.id},myUrlPath=${myUrlPath})}"
7779
class="task_col_content task_col_content_unsetfocus twtooltip" data-placement="bottom"
7880
th:alt-title="#{task.col.twtooltip.infoicons.unsetfocus}"
@@ -168,7 +170,8 @@
168170
th:attr="data-bs-target='#taskModalScrollable_'+${task.id}"
169171
th:id="'task_' + ${task.id} + '_col_button_modal'"
170172
draggable="true" ondragstart="dragTask(event)"
171-
th:alt-title="#{task.col.twtooltip.show.details}" th:text="${task.title}">
173+
th:alt-title="#{task.col.twtooltip.show.details}"
174+
th:text="${task.title}">
172175
Launch Task Modal
173176
</button>
174177
<!-- Modal -->
@@ -177,39 +180,39 @@
177180
<div class="modal-dialog modal-dialog-scrollable" role="document">
178181
<div class="modal-content">
179182
<div class="modal-header">
180-
<h5 class="modal-title" id="taskModalScrollableTitle">
181-
<a th:if="${task.taskState.name() ne 'COMPLETED' and task.taskState.name() ne 'TRASHED'}"
182-
th:href="@{{myUrlPath}/task/{id}/complete(id=${task.id},myUrlPath=${myUrlPath})}">
183-
<i class="far fa-square"></i>
184-
</a>
185-
<a th:if="${task.taskState.name() eq 'COMPLETED'}"
186-
th:href="@{{myUrlPath}/task/{id}/incomplete(id=${task.id},myUrlPath=${myUrlPath})}" >
187-
<i class="fas fa-check-square"></i>
188-
</a>
189-
<i class="fas fa-trash-alt" th:if="${task.taskState.name() eq 'TRASHED'}"></i>
190-
<a th:if="${task.focus}"
191-
th:href="@{{myUrlPath}/task/{id}/unsetfocus(id=${task.id},myUrlPath=${myUrlPath})}">
192-
<i class="fas fa-star"></i>
193-
</a>
194-
<a th:if="${not task.focus}"
195-
th:href="@{{myUrlPath}/task/{id}/setfocus(id=${task.id},myUrlPath=${myUrlPath})}">
196-
<i class="far fa-star"></i>
197-
</a>
198-
<span th:text="${task.title}">Modal title</span>
199-
<span class="badge badge-pill badge-dark"
200-
th:if="${task.taskEnergy.value ne 'NONE'}"
201-
th:text="${#messages.msgOrNull(task.taskEnergy.code)}">
202-
task.taskEnergy.code
203-
</span>
204-
<span class="badge badge-pill badge-dark"
205-
th:if="${task.taskTime.value ne 'NONE'}"
206-
th:text="${#messages.msgOrNull(task.taskTime.code)}">
207-
task.taskTime.code
208-
</span>
209-
</h5>
210-
<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
211-
<span aria-hidden="true">&times;</span>
212-
</button>
183+
<h5 class="modal-title" id="taskModalScrollableTitle">
184+
<span th:if="${task.taskState.name() ne 'COMPLETED' and task.taskState.name() ne 'TRASHED'}" class="me-2">
185+
<a th:href="@{{myUrlPath}/task/{id}/complete(id=${task.id},myUrlPath=${myUrlPath})}">
186+
<i class="far fa-square me-0"></i></a>
187+
</span>
188+
<span th:if="${task.taskState.name() eq 'COMPLETED'}" class="me-2">
189+
<a th:href="@{{myUrlPath}/task/{id}/incomplete(id=${task.id},myUrlPath=${myUrlPath})}">
190+
<i class="fas fa-check-square me-0"></i></a>
191+
</span>
192+
<span th:if="${task.taskState.name() eq 'TRASHED'}" class="me-2">
193+
<i class="fas fa-trash-alt"></i>
194+
</span>
195+
<span th:if="${task.focus}" class="me-2">
196+
<a th:href="@{{myUrlPath}/task/{id}/unsetfocus(id=${task.id},myUrlPath=${myUrlPath})}">
197+
<i class="fas fa-star"></i></a>
198+
</span>
199+
<span th:if="${not task.focus}" class="me-2">
200+
<a th:href="@{{myUrlPath}/task/{id}/setfocus(id=${task.id},myUrlPath=${myUrlPath})}">
201+
<i class="far fa-star"></i></a>
202+
</span>
203+
<span th:text="${task.title}" class="me-2">Modal title</span>
204+
<span class="badge badge-pill badge-dark me-2"
205+
th:if="${task.taskEnergy.value ne 'NONE'}"
206+
th:text="${#messages.msgOrNull(task.taskEnergy.code)}">
207+
task.taskEnergy.code
208+
</span>
209+
<span class="badge badge-pill badge-dark me-2"
210+
th:if="${task.taskTime.value ne 'NONE'}"
211+
th:text="${#messages.msgOrNull(task.taskTime.code)}">
212+
task.taskTime.code
213+
</span>
214+
</h5>
215+
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
213216
</div>
214217
<div class="modal-body">
215218
<div>

0 commit comments

Comments
 (0)