Skip to content

Commit 5e61eb6

Browse files
thomaswoehlkethomaswoehlke
committed
## 2.3.34
* fixed #317 switch Context is broken * fixed #326 add Context to Breadcrumb * fixed #327 AbstractController: rename rootCategories to rootProjects (line 77) * fixed #328 AbstractController: rename allCategories to allProjects (line 66) * fixed #329 AbstractController: remove side effects from getContext (line 145, 159) * fixed #330 Add Project to Root Project: preset correct Context * fixed #331 Edit Project: update HTML Layout to current Bootstrap Version
1 parent f08eda7 commit 5e61eb6

File tree

5 files changed

+128
-128
lines changed

5 files changed

+128
-128
lines changed

‎etc/TODO.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@
6363
## 2.3.34
6464
* fixed #317 switch Context is broken
6565
* fixed #326 add Context to Breadcrumb
66-
* Issue #327 AbstractController: rename rootCategories to rootProjects (line 77)
67-
* Issue #328 AbstractController: rename allCategories to allProjects (line 66)
66+
* fixed #327 AbstractController: rename rootCategories to rootProjects (line 77)
67+
* fixed #328 AbstractController: rename allCategories to allProjects (line 66)
6868
* fixed #329 AbstractController: remove side effects from getContext (line 145, 159)
6969
* fixed #330 Add Project to Root Project: preset correct Context
7070
* fixed #331 Edit Project: update HTML Layout to current Bootstrap Version

‎src/main/java/org/woehlke/simpleworklist/common/domain/AbstractController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public abstract class AbstractController {
6464
protected BreadcrumbService breadcrumbService;
6565

6666
//TODO: rename allCategories to allProjects
67-
@ModelAttribute("allCategories")
67+
@ModelAttribute("allProjects")
6868
public final List<Project> getAllCategories(
6969
@ModelAttribute("userSession") UserSessionBean userSession,
7070
BindingResult result, //TODO: remove
@@ -75,7 +75,7 @@ public final List<Project> getAllCategories(
7575
}
7676

7777
//TODO: rename rootCategories to rootProjects
78-
@ModelAttribute("rootCategories")
78+
@ModelAttribute("rootProjects")
7979
public final List<Project> getRootCategories(
8080
@ModelAttribute("userSession") UserSessionBean userSession
8181
) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
</div>
3434
</header>
3535

36-
<section th:replace="layout/taskstates :: navigation-taskstates(rootCategories=${rootCategories},thisProject=${thisProject})">
36+
<section th:replace="layout/taskstates :: navigation-taskstates(rootProjects=${rootProjects},thisProject=${thisProject})">
3737
</section>
3838

3939
<!-- Breadcrumb -->
@@ -55,7 +55,7 @@
5555
<th:block th:replace="${twcontent}" />
5656
</div>
5757
<div class="col-md-4">
58-
<div th:replace="layout/projects :: navigation-projects(rootCategories=${rootCategories},thisProject=${thisProject})">
58+
<div th:replace="layout/projects :: navigation-projects(rootProjects=${rootProjects},thisProject=${thisProject})">
5959
</div>
6060
</div>
6161
</div>

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

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,54 @@
1-
<!DOCTYPE html>
2-
<html xmlns="http://www.w3.org/1999/xhtml"
3-
xmlns:th="http://www.thymeleaf.org"
4-
xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
5-
xmlns:sd="http://www.thymeleaf.org/spring-data">
6-
7-
<section th:fragment="navigation-projects(rootCategories,thisProject)">
8-
<div class="border-top" id="projectNavigationWell" sec:authorize="isAuthenticated()">
9-
<div class="row col" id="tw-project-submenu-col">
10-
<nav>
11-
<ul id="rootProject">
12-
<li>
13-
<span id="tw-project-submenu-root">
14-
<i class="fas fa-folder-open"></i>
15-
<a th:href="@{/project/root}" id="project_0"
16-
ondrop="drop2project(event)" ondragover="allowDrop2Project(event)"
17-
th:text="#{right.nav.projects}">
18-
Projects
19-
</a>
20-
</span>
21-
<span th:if="${rootCategories != null and rootCategories.size() gt 0}">
22-
<ul th:include="this :: tw-project-submenu(projectList=${rootCategories},thisProject=${thisProject})"></ul>
23-
</span>
24-
</li>
25-
</ul>
26-
</nav>
27-
</div>
28-
</div>
29-
</section>
30-
31-
<ul th:fragment="tw-project-submenu(projectList, thisProject)">
32-
<li th:each="project : ${projectList}">
33-
<span th:if="${project == thisProject}">
34-
<strong th:id="'project_' + ${project.id}"
35-
th:text="${project.name}"
36-
ondrop="drop2project(event)" ondragover="allowDrop2Project(event)"
37-
draggable="true" ondragstart="dragProject(event)">
38-
</strong>
39-
</span>
40-
<span th:if="${project != thisProject}">
41-
<a th:id="'project_' + ${project.id}"
42-
th:text="${project.name}"
43-
th:href="@{/project/{id}(id=${project.id})}"
44-
ondrop="drop2project(event)" ondragover="allowDrop2Project(event)"
45-
draggable="true" ondragstart="dragProject(event)">
46-
</a>
47-
</span>
48-
<span th:if="${project.children.size() gt 0}">
49-
<ul th:include="this :: tw-project-submenu(projectList=${project.children},thisProject=${thisProject})"></ul>
50-
</span>
51-
</li>
52-
</ul>
53-
54-
</html>
1+
<!DOCTYPE html>
2+
<html xmlns="http://www.w3.org/1999/xhtml"
3+
xmlns:th="http://www.thymeleaf.org"
4+
xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
5+
xmlns:sd="http://www.thymeleaf.org/spring-data">
6+
7+
<section th:fragment="navigation-projects(rootProjects,thisProject)">
8+
<div class="border-top" id="projectNavigationWell" sec:authorize="isAuthenticated()">
9+
<div class="row col" id="tw-project-submenu-col">
10+
<nav>
11+
<ul id="rootProject">
12+
<li>
13+
<span id="tw-project-submenu-root">
14+
<i class="fas fa-folder-open"></i>
15+
<a th:href="@{/project/root}" id="project_0"
16+
ondrop="drop2project(event)" ondragover="allowDrop2Project(event)"
17+
th:text="#{right.nav.projects}">
18+
Projects
19+
</a>
20+
</span>
21+
<span th:if="${rootProjects != null and rootProjects.size() gt 0}">
22+
<ul th:include="this :: tw-project-submenu(projectList=${rootProjects},thisProject=${thisProject})"></ul>
23+
</span>
24+
</li>
25+
</ul>
26+
</nav>
27+
</div>
28+
</div>
29+
</section>
30+
31+
<ul th:fragment="tw-project-submenu(projectList, thisProject)">
32+
<li th:each="project : ${projectList}">
33+
<span th:if="${project == thisProject}">
34+
<strong th:id="'project_' + ${project.id}"
35+
th:text="${project.name}"
36+
ondrop="drop2project(event)" ondragover="allowDrop2Project(event)"
37+
draggable="true" ondragstart="dragProject(event)">
38+
</strong>
39+
</span>
40+
<span th:if="${project != thisProject}">
41+
<a th:id="'project_' + ${project.id}"
42+
th:text="${project.name}"
43+
th:href="@{/project/{id}(id=${project.id})}"
44+
ondrop="drop2project(event)" ondragover="allowDrop2Project(event)"
45+
draggable="true" ondragstart="dragProject(event)">
46+
</a>
47+
</span>
48+
<span th:if="${project.children.size() gt 0}">
49+
<ul th:include="this :: tw-project-submenu(projectList=${project.children},thisProject=${thisProject})"></ul>
50+
</span>
51+
</li>
52+
</ul>
53+
54+
</html>

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

Lines changed: 68 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,68 @@
1-
<!DOCTYPE html>
2-
<html xmlns="http://www.w3.org/1999/xhtml"
3-
xmlns:th="http://www.thymeleaf.org"
4-
xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
5-
xmlns:sd="http://www.thymeleaf.org/spring-data">
6-
7-
<section th:fragment="navigation-taskstates(rootCategories,thisProject)">
8-
<div class="container" id="taskStateNavigationContainer" sec:authorize="isAuthenticated()">
9-
<ul id="taskStateNavigation" class="nav nav-tabs">
10-
<li class="nav-item" ondrop="drop2inbox(event)" ondragover="allowDropOfTask(event)">
11-
<a id="taskstate_inbox" th:href="@{/taskstate/inbox}" th:class="${taskstateType == null or taskstateType == 'inbox' ? 'nav-link active' : 'nav-link'}">
12-
<i class="fas fa-inbox"></i>
13-
<span th:text="#{layout.page.inbox}">Inbox</span>
14-
</a>
15-
</li>
16-
<li class="nav-item" ondrop="drop2today(event)" ondragover="allowDropOfTask(event)">
17-
<a id="taskstate_today" th:href="@{/taskstate/today}" th:class="${taskstateType == 'today' ? 'nav-link active' : 'nav-link'}">
18-
<i class="fas fa-clock"></i>
19-
<span th:text="#{layout.page.today}">Today</span>
20-
</a>
21-
</li>
22-
<li class="nav-item" ondrop="drop2next(event)" ondragover="allowDropOfTask(event)">
23-
<a id="taskstate_next" th:href="@{/taskstate/next}" th:class="${taskstateType == 'next' ? 'nav-link active' : 'nav-link'}">
24-
<i class="fas fa-cogs"></i>
25-
<span th:text="#{layout.page.next}">Next</span>
26-
</a>
27-
</li>
28-
<li class="nav-item" ondrop="drop2waiting(event)" ondragover="allowDropOfTask(event)">
29-
<a id="taskstate_waiting" th:href="@{/taskstate/waiting}" th:class="${taskstateType == 'waiting' ? 'nav-link active' : 'nav-link'}">
30-
<i class="fas fa-hourglass-half"></i>
31-
<span th:text="#{layout.page.waiting}">Waiting</span>
32-
</a>
33-
</li>
34-
<li class="nav-item">
35-
<a id="taskstate_scheduled" th:href="@{/taskstate/scheduled}" th:class="${taskstateType == 'scheduled' ? 'nav-link active' : 'nav-link'}">
36-
<i class="fas fa-calendar-alt"></i>
37-
<span th:text="#{layout.page.scheduled}">Scheduled</span>
38-
</a>
39-
</li>
40-
<li class="nav-item" ondrop="drop2someday(event)" ondragover="allowDropOfTask(event)">
41-
<a id="taskstate_someday" th:href="@{/taskstate/someday}" th:class="${taskstateType == 'someday' ? 'nav-link active' : 'nav-link'}">
42-
<i class="fas fa-road"></i>
43-
<span th:text="#{layout.page.someday}">Someday</span>
44-
</a>
45-
</li>
46-
<li class="nav-item" ondrop="drop2focus(event)" ondragover="allowDropOfTask(event)">
47-
<a id="taskstate_focus" th:href="@{/taskstate/focus}" th:class="${taskstateType == 'focus' ? 'nav-link active' : 'nav-link'}">
48-
<i class="fas fa-star"></i>
49-
<span th:text="#{layout.page.focus}">Focus</span>
50-
</a>
51-
</li>
52-
<li class="nav-item" ondrop="drop2completed(event)" ondragover="allowDropOfTask(event)">
53-
<a id="taskstate_completed" th:href="@{/taskstate/completed}" th:class="${taskstateType == 'completed' ? 'nav-link active' : 'nav-link'}">
54-
<i class="fas fa-check-square"></i>
55-
<span th:text="#{layout.page.completed}">Completed Tasks</span>
56-
</a>
57-
</li>
58-
<li class="nav-item" ondrop="drop2trash(event)" ondragover="allowDropOfTask(event)">
59-
<a id="taskstate_trash" th:href="@{/taskstate/trash}" th:class="${taskstateType == 'trash' ? 'nav-link active' : 'nav-link'}">
60-
<i class="fas fa-trash-alt"></i>
61-
<span th:text="#{layout.page.trash}">Trash</span>
62-
</a>
63-
</li>
64-
</ul>
65-
</div>
66-
</section>
67-
68-
</html>
1+
<!DOCTYPE html>
2+
<html xmlns="http://www.w3.org/1999/xhtml"
3+
xmlns:th="http://www.thymeleaf.org"
4+
xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
5+
xmlns:sd="http://www.thymeleaf.org/spring-data">
6+
7+
<section th:fragment="navigation-taskstates(rootProjects,thisProject)">
8+
<div class="container" id="taskStateNavigationContainer" sec:authorize="isAuthenticated()">
9+
<ul id="taskStateNavigation" class="nav nav-tabs">
10+
<li class="nav-item" ondrop="drop2inbox(event)" ondragover="allowDropOfTask(event)">
11+
<a id="taskstate_inbox" th:href="@{/taskstate/inbox}" th:class="${taskstateType == null or taskstateType == 'inbox' ? 'nav-link active' : 'nav-link'}">
12+
<i class="fas fa-inbox"></i>
13+
<span th:text="#{layout.page.inbox}">Inbox</span>
14+
</a>
15+
</li>
16+
<li class="nav-item" ondrop="drop2today(event)" ondragover="allowDropOfTask(event)">
17+
<a id="taskstate_today" th:href="@{/taskstate/today}" th:class="${taskstateType == 'today' ? 'nav-link active' : 'nav-link'}">
18+
<i class="fas fa-clock"></i>
19+
<span th:text="#{layout.page.today}">Today</span>
20+
</a>
21+
</li>
22+
<li class="nav-item" ondrop="drop2next(event)" ondragover="allowDropOfTask(event)">
23+
<a id="taskstate_next" th:href="@{/taskstate/next}" th:class="${taskstateType == 'next' ? 'nav-link active' : 'nav-link'}">
24+
<i class="fas fa-cogs"></i>
25+
<span th:text="#{layout.page.next}">Next</span>
26+
</a>
27+
</li>
28+
<li class="nav-item" ondrop="drop2waiting(event)" ondragover="allowDropOfTask(event)">
29+
<a id="taskstate_waiting" th:href="@{/taskstate/waiting}" th:class="${taskstateType == 'waiting' ? 'nav-link active' : 'nav-link'}">
30+
<i class="fas fa-hourglass-half"></i>
31+
<span th:text="#{layout.page.waiting}">Waiting</span>
32+
</a>
33+
</li>
34+
<li class="nav-item">
35+
<a id="taskstate_scheduled" th:href="@{/taskstate/scheduled}" th:class="${taskstateType == 'scheduled' ? 'nav-link active' : 'nav-link'}">
36+
<i class="fas fa-calendar-alt"></i>
37+
<span th:text="#{layout.page.scheduled}">Scheduled</span>
38+
</a>
39+
</li>
40+
<li class="nav-item" ondrop="drop2someday(event)" ondragover="allowDropOfTask(event)">
41+
<a id="taskstate_someday" th:href="@{/taskstate/someday}" th:class="${taskstateType == 'someday' ? 'nav-link active' : 'nav-link'}">
42+
<i class="fas fa-road"></i>
43+
<span th:text="#{layout.page.someday}">Someday</span>
44+
</a>
45+
</li>
46+
<li class="nav-item" ondrop="drop2focus(event)" ondragover="allowDropOfTask(event)">
47+
<a id="taskstate_focus" th:href="@{/taskstate/focus}" th:class="${taskstateType == 'focus' ? 'nav-link active' : 'nav-link'}">
48+
<i class="fas fa-star"></i>
49+
<span th:text="#{layout.page.focus}">Focus</span>
50+
</a>
51+
</li>
52+
<li class="nav-item" ondrop="drop2completed(event)" ondragover="allowDropOfTask(event)">
53+
<a id="taskstate_completed" th:href="@{/taskstate/completed}" th:class="${taskstateType == 'completed' ? 'nav-link active' : 'nav-link'}">
54+
<i class="fas fa-check-square"></i>
55+
<span th:text="#{layout.page.completed}">Completed Tasks</span>
56+
</a>
57+
</li>
58+
<li class="nav-item" ondrop="drop2trash(event)" ondragover="allowDropOfTask(event)">
59+
<a id="taskstate_trash" th:href="@{/taskstate/trash}" th:class="${taskstateType == 'trash' ? 'nav-link active' : 'nav-link'}">
60+
<i class="fas fa-trash-alt"></i>
61+
<span th:text="#{layout.page.trash}">Trash</span>
62+
</a>
63+
</li>
64+
</ul>
65+
</div>
66+
</section>
67+
68+
</html>

0 commit comments

Comments
 (0)