work

Author: thomaswoehlke

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

@@ -129,20 +129,20 @@
                             </a>
                         </td>
                         <td th:id="'task_' + ${task.id} + '_col_energy_and_time'" class="task_col task_col_energy_and_time">
-                                <span class="badge badge-pill badge-dark task_col_content task_col_content_taskenergy twtooltip"
-                                      th:if="${task.taskEnergy.value ne 'NONE'}"
-                                      th:id="'task_' + ${task.id} + '_col_energy_and_time_badge'"
-                                      draggable="true" ondragstart="dragTask(event)"
-                                      th:alt-title="#{task.col.twtooltip.badge.taskEnergy}"
-                                      th:text="${#messages.msgOrNull(task.taskEnergy.code)}">
-                                </span>
-                            <span class="badge badge-pill badge-dark task_col_content task_col_content_tasktime twtooltip"
-                                  th:text="${#messages.msgOrNull(task.taskTime.code)}"
+                            <span class="badge bg-dark task_col_content task_col_content_taskenergy twtooltip"
+                                  th:if="${task.taskEnergy.value ne 'NONE'}"
                                   th:id="'task_' + ${task.id} + '_col_energy_and_time_badge'"
                                   draggable="true" ondragstart="dragTask(event)"
-                                  th:alt-title="#{task.col.twtooltip.badge.taskTime}"
-                                  th:if="${task.taskTime.value ne 'NONE'}">
-                                </span>
+                                  th:text="${#messages.msgOrNull(task.taskEnergy.code)}"
+                                  th:alt-title="#{task.col.twtooltip.badge.taskEnergy}">
+                            </span>
+                            <span class="badge bg-dark task_col_content task_col_content_tasktime twtooltip"
+                                  th:if="${task.taskTime.value ne 'NONE'}"
+                                  th:id="'task_' + ${task.id} + '_col_energy_and_time_badge'"
+                                  draggable="true" ondragstart="dragTask(event)"
+                                  th:text="${#messages.msgOrNull(task.taskTime.code)}"
+                                  th:alt-title="#{task.col.twtooltip.badge.taskTime}">
+                            </span>
                         </td>
                         <td th:id="'task_' + ${task.id} + '_col_context'" class="task_col task_col_context"
                             th:if="${myTaskState eq 'ALL'}">