Skip to content

Commit b2b357a

Browse files
committed
List of ALL Tasks
1 parent 9c4cdc9 commit b2b357a

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed

src/main/resources/messages_de.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@ project.show.state.someday=Sp
8888
project.show.state.completed=Erledigte Aufgaben
8989
project.show.state.trash=Papierkorb
9090
project.show.nothingToDo=Es gibt keine Aufgaben in diesem Projekt.
91+
layout.menu.taskstate=Aufgaben
92+
layout.menu.projects=Projekte
9193
layout.page.newContent=Neuer Inhalt
9294
layout.page.addProject=Neues Projekt
9395
layout.page.addTask=Neue Aufgabe
@@ -273,4 +275,3 @@ user.loginForm.email.label=Email
273275
user.loginForm.email.placeholder=Geben Sie Ihre Emailadresse ein
274276
user.loginForm.password.label=Passwort
275277
user.loginForm.password.placeholder=Geben Sie Ihr Passwort ein
276-
layout.menu.taskstate=Aufgaben

src/main/resources/messages_en.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ project.show.state.completed=Completed Tasks
8787
project.show.state.trash=Trash
8888
project.show.nothingToDo=You have no Tasks in this project.
8989
layout.menu.taskstate=Tasks
90+
layout.menu.projects=Projects
9091
layout.page.newContent=New Content
9192
layout.page.addProject=Add a Project
9293
layout.page.addTask=Add a Task

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

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,20 @@
9494
</div>
9595
</li>
9696

97-
<li class="nav-item">
98-
<a class="nav-link" th:href="@{/taskstate/all}">
99-
<i class="fa-solid fa-database"></i>
100-
<span th:text="#{layout.page.all}">ALL Tasks</span>
97+
<li class="nav-item dropdown" th:if="${allProjects != null}">
98+
<a class="nav-link dropdown-toggle" id="taskstateProjects" role="button"
99+
data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" href="#">
100+
<i class="fa-solid fa-diagram-project"></i>
101+
<span th:text="#{layout.menu.projects}">"Projects</span>
102+
<span class="caret"></span>
101103
</a>
104+
<div class="dropdown-menu" aria-labelledby="taskstateProjects">
105+
<a class="dropdown-item" th:each="menuProject : ${allProjects}"
106+
th:href="@{/project/{pid}(pid=${menuProject.id})}">
107+
<i class="fa-solid fa-diagram-project"></i>
108+
<span th:text="${menuProject.name}">menuProject.name</span>
109+
</a>
110+
</div>
102111
</li>
103112

104113
<li class="nav-item">

0 commit comments

Comments
 (0)