Skip to content

Commit 60aeb21

Browse files
thomaswoehlkethomaswoehlke
committed
work in progress
1 parent 5baa74b commit 60aeb21

File tree

5 files changed

+90
-59
lines changed

5 files changed

+90
-59
lines changed

‎src/main/resources/templates/project/id/show.html‎

Lines changed: 38 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -19,30 +19,44 @@ <h1>
1919
</small>
2020
</h1>
2121
<div id="tw-content-title-actionbuttons">
22-
<a class="btn btn-sm btn-primary" data-toggle="collapse"
23-
href="#collapseDescription" role="button" aria-expanded="false" aria-controls="collapseExample">
24-
<div th:text="#{project.show.description}">Project Description</div>
25-
</a>
26-
<a class="btn btn-sm btn-secondary" role="button" href="#"
27-
th:href="@{/project/{thisProjectId}/edit(thisProjectId=${thisProject.id})}">
28-
<i class="fas fa-edit"></i>
29-
<span th:text="#{project.show.edit}">Edit Project</span>
30-
</a>
31-
<a class="btn btn-sm btn-secondary" role="button" href="#"
32-
th:href="@{/project/{thisProjectId}/delete(thisProjectId=${thisProject.id})}">
33-
<i class="fas fa-trash-alt"></i>
34-
<span th:text="#{project.show.delete}">Delete Project</span>
35-
</a>
36-
<a class="btn btn-sm btn-secondary" role="button" href="#"
37-
th:href="@{/project/{thisProjectId}/project/add(thisProjectId=${thisProject.id})}">
38-
<i class="fas fa-plus-square"></i>
39-
<span th:text="#{layout.page.addProject}">Add a Project</span>
40-
</a>
41-
<a class="btn btn-sm btn-secondary" role="button" href="#"
42-
th:href="@{/project/{thisProjectId}/task/add(thisProjectId=${thisProject.id})}">
43-
<i class="fas fa-plus-square"></i>
44-
<span th:text="#{project.show.addTask}">Add a Task</span>
45-
</a>
22+
<div class="row">
23+
<div class="col-md-3 mb-3">
24+
<a class="btn btn-block btn-primary" role="button" href="#"
25+
th:href="@{/project/{thisProjectId}/task/add(thisProjectId=${thisProject.id})}">
26+
<i class="fas fa-plus-square"></i>
27+
<span th:text="#{project.show.addTask}">Add a Task</span>
28+
</a>
29+
</div>
30+
<div class="col-md-3 mb-3">
31+
<a class="btn btn-block btn-secondary" role="button" href="#"
32+
th:href="@{/project/{thisProjectId}/project/add(thisProjectId=${thisProject.id})}">
33+
<i class="fas fa-plus-square"></i>
34+
<span th:text="#{layout.page.addProject}">Add a Project</span>
35+
</a>
36+
</div>
37+
<div class="col-md-3 mb-3">
38+
<a class="btn btn-block btn-dark" role="button" href="#"
39+
th:href="@{/project/{thisProjectId}/edit(thisProjectId=${thisProject.id})}">
40+
<i class="fas fa-edit"></i>
41+
<span th:text="#{project.show.edit}">Edit Project</span>
42+
</a>
43+
</div>
44+
<div class="col-md-3 mb-3">
45+
<a class="btn btn-block btn-dark" role="button" href="#"
46+
th:href="@{/project/{thisProjectId}/delete(thisProjectId=${thisProject.id})}">
47+
<i class="fas fa-trash-alt"></i>
48+
<span th:text="#{project.show.delete}">Delete Project</span>
49+
</a>
50+
</div>
51+
</div>
52+
<div class="row">
53+
<div class="col-md-12 mb-12">
54+
<a class="btn btn-block btn-secondary" data-toggle="collapse"
55+
href="#collapseDescription" role="button" aria-expanded="false" aria-controls="collapseExample">
56+
<div th:text="#{project.show.description}">Project Description</div>
57+
</a>
58+
</div>
59+
</div>
4660
</div>
4761
<div class="collapse" id="collapseDescription">
4862
<div class="card card-body" th:text="${thisProject.description}"></div>

‎src/main/resources/templates/project/root/show.html‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,19 @@ <h1>
1515
<i class="fas fa-folder-open"></i>
1616
<span th:text="#{project.show.h1}">Project</span>
1717
</h1>
18-
<div id="tw-content-title-actionbuttons">
19-
<a class="btn btn-sm btn-secondary" role="button" th:href="@{/project/root/project/add}">
20-
<i class="fas fa-plus-square"></i>
21-
<span th:text="#{layout.page.addProject}">Add a Project</span>
22-
</a>
23-
<a class="btn btn-sm btn-secondary" role="button" th:href="@{/project/root/task/add}" href="#">
24-
<i class="fas fa-plus-square"></i>
25-
<span th:text="#{project.show.addTask}">Add a Task</span>
26-
</a>
18+
<div id="tw-content-title-actionbuttons" class="row">
19+
<div class="col-md-3 mb-3">
20+
<a class="btn btn-block btn-primary" role="button" th:href="@{/project/root/task/add}">
21+
<i class="fas fa-plus-square"></i>
22+
<span th:text="#{project.show.addTask}">Add a Task</span>
23+
</a>
24+
</div>
25+
<div class="col-md-3 mb-3">
26+
<a class="btn btn-block btn-secondary" role="button" th:href="@{/project/root/project/add}">
27+
<i class="fas fa-plus-square"></i>
28+
<span th:text="#{layout.page.addProject}">Add a Project</span>
29+
</a>
30+
</div>
2731
</div>
2832
</div>
2933
</div>

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

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,19 @@
1111

1212
<div th:fragment="mytwtitle">
1313
<div id="tw-content-title">
14-
<h1>
15-
<i class="fas fa-check-square"></i>
16-
<span th:utext="#{tasks.completed.h1}">Completed Tasks</span>
17-
</h1>
18-
<div id="tw-content-title-actionbuttons">
19-
<a th:href="@{/task/move/completed/to/trash}" class="btn btn-sm btn-primary" role="button">
20-
<i class="fas fa-trash-alt"></i>
21-
<span th:utext="#{tasks.completed.delete}">Delete All Completed Tasks</span>
22-
</a>
14+
<div class="row">
15+
<h1 class="col-md-12 mb-12">
16+
<i class="fas fa-check-square"></i>
17+
<span th:utext="#{tasks.completed.h1}">Completed Tasks</span>
18+
</h1>
19+
</div>
20+
<div class="row">
21+
<div id="tw-content-title-actionbuttons" class="col-md-3 mb-3">
22+
<a th:href="@{/task/move/completed/to/trash}" class="btn btn-block btn-primary" role="button">
23+
<i class="fas fa-trash-alt"></i>
24+
<span th:utext="#{tasks.completed.delete}">Delete All Completed Tasks</span>
25+
</a>
26+
</div>
2327
</div>
2428
</div>
2529
</div>

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

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,19 @@
1111

1212
<div th:fragment="mytwtitle">
1313
<div id="tw-content-title">
14-
<h1>
15-
<i class="fas fa-inbox"></i>
16-
<span th:utext="#{tasks.inbox.h1}">Inbox</span>
17-
</h1>
18-
<div id="tw-content-title-actionbuttons">
19-
<a class="btn btn-sm btn-primary" role="button" th:href="@{/taskstate/task/add}">
20-
<i class="fas fa-plus-square"></i>
21-
<span th:utext="#{tasks.inbox.addTask}">Add Task</span>
22-
</a>
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>
2327
</div>
2428
</div>
2529
</div>

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

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,20 @@
1111

1212
<div th:fragment="mytwtitle">
1313
<div id="tw-content-title">
14-
<h1>
15-
<i class="fas fa-trash-alt"></i>
16-
<span th:utext="#{tasks.trash.h1}">Trash</span>
17-
</h1>
18-
<div id="tw-content-title-actionbuttons">
19-
<a th:href="@{/task/move/trash/to/void}" class="btn btn-sm btn-primary" role="button">
14+
<div class="row">
15+
<h1 class="col-md-12 mb-12">
2016
<i class="fas fa-trash-alt"></i>
21-
<span th:utext="#{tasks.trash.empty}">Empty Trash</span>
22-
</a>
17+
<span th:utext="#{tasks.trash.h1}">Trash</span>
18+
</h1>
19+
</div>
20+
</div>
21+
<div class="row">
22+
<div id="tw-content-title-actionbuttons" class="col-md-3 mb-3">
23+
<a th:href="@{/task/move/trash/to/void}" class="btn btn-block btn-primary" role="button">
24+
<i class="fas fa-trash-alt"></i>
25+
<span th:utext="#{tasks.trash.empty}">Empty Trash</span>
26+
</a>
27+
</div>
2328
</div>
2429
</div>
2530
</div>

0 commit comments

Comments
 (0)