Skip to content

Commit aa953eb

Browse files
thomaswoehlkethomaswoehlke
committed
work
1 parent 6e60cd2 commit aa953eb

File tree

3 files changed

+48
-32
lines changed

3 files changed

+48
-32
lines changed

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

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,29 @@ <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>
25-
<div class="form-row">
26-
<div class="col-md-6 mb-6">
27-
<button id="editTaskSubmit" type="submit" class="btn btn-primary btn-block">
28-
<i class="fas fa-save"></i>
29-
<span th:utext="#{task.show.button}">Save Task</span>
30-
</button>
31-
</div>
32-
<div class="col-md-6 mb-6">
33-
<a class="btn btn-secondary btn-block" role="button"
34-
th:href="@{/project/{projectId}/task/{id}/transform(id=${task.id},projectId=${thisProject.id})}">
35-
<i class="fas fa-project-diagram"></i>
36-
<span th:utext="#{task.show.transform}">Transform into Project</span>
37-
</a>
38-
</div>
24+
<div th:replace="layout/task :: tw-task-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
25+
<div class="row">
26+
<div class="col">
27+
<a th:href="@{/taskstate/task/{id}/transform(id=${task.id})}" class="btn btn-secondary btn-block"
28+
role="button">
29+
<i class="fas fa-angle-double-left"></i>
30+
<span th:utext="#{task.show.button.close}">cancel and back</span>
31+
</a>
3932
</div>
33+
<div class="col">
34+
<button id="editTaskSubmit" type="submit" class="btn btn-primary btn-block">
35+
<i class="fas fa-save"></i>
36+
<span th:utext="#{task.show.button}">Save Task</span>
37+
</button>
38+
</div>
39+
<div class="col">
40+
<a class="btn btn-secondary btn-block" role="button"
41+
th:href="@{/project/{projectId}/task/{id}/transform(id=${task.id},projectId=${thisProject.id})}">
42+
<i class="fas fa-project-diagram"></i>
43+
<span th:utext="#{task.show.transform}">Transform into Project</span>
44+
</a>
45+
</div>
46+
</div>
4047
</form>
4148
</div>
4249
</div>

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

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,29 @@ <h1 class="tw-title">
2121
<div class="tw-content">
2222
<form id="formId" method="post" class="was-validated"
2323
th:action="@{/project/root/task/{taskId}/edit(taskId=${task.id})}" th:object="${task}">
24-
<div th:replace="layout/task :: tw-task-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
25-
<div class="form-row">
26-
<div class="col-md-6 mb-6">
27-
<button id="editTaskSubmit" type="submit" class="btn btn-primary btn-block">
28-
<i class="fas fa-save"></i>
29-
<span th:utext="#{task.show.button}">Save Task</span>
30-
</button>
31-
</div>
32-
<div class="col-md-6 mb-6">
33-
<a th:href="@{/project/root/task/{id}/transform(id=${task.id})}" class="btn btn-secondary btn-block" role="button">
34-
<i class="fas fa-project-diagram"></i>
35-
<span th:utext="#{task.show.transform}">Transform into Project</span>
36-
</a>
37-
</div>
38-
</div>
24+
<div th:replace="layout/task :: tw-task-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
25+
<div class="row">
26+
<div class="col">
27+
<a th:href="@{/taskstate/task/{id}/transform(id=${task.id})}" class="btn btn-secondary btn-block"
28+
role="button">
29+
<i class="fas fa-angle-double-left"></i>
30+
<span th:utext="#{task.show.button.close}">cancel and back</span>
31+
</a>
32+
</div>
33+
<div class="col">
34+
<button id="editTaskSubmit" type="submit" class="btn btn-primary btn-block">
35+
<i class="fas fa-save"></i>
36+
<span th:utext="#{task.show.button}">Save Task</span>
37+
</button>
38+
</div>
39+
<div class="col">
40+
<a th:href="@{/project/root/task/{id}/transform(id=${task.id})}" class="btn btn-secondary btn-block"
41+
role="button">
42+
<i class="fas fa-project-diagram"></i>
43+
<span th:utext="#{task.show.transform}">Transform into Project</span>
44+
</a>
45+
</div>
46+
</div>
3947
</form>
4048
</div>
4149
</div>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,13 @@ <h1>
2222
<form id="formId" method="post" class="was-validated"
2323
th:action="@{/taskstate/task/{taskId}/edit(taskId=${task.id})}" th:object="${task}">
2424
<div
25-
th:replace="layout/task :: tw-task-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
25+
th:replace="layout/task :: tw-task-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})">
26+
</div>
2627
<div class="row">
2728
<div class="col">
2829
<a th:href="@{/taskstate/task/{id}/transform(id=${task.id})}" class="btn btn-secondary btn-block"
2930
role="button">
30-
<i class="fas fa-project-diagram"></i>
31+
<i class="fas fa-angle-double-left"></i>
3132
<span th:utext="#{task.show.button.close}">cancel and back</span>
3233
</a>
3334
</div>

0 commit comments

Comments
 (0)