Skip to content

Commit 94810c2

Browse files
thomaswoehlkethomaswoehlke
committed
work
1 parent 3093e41 commit 94810c2

File tree

3 files changed

+104
-93
lines changed

3 files changed

+104
-93
lines changed

‎pom.xml‎

Lines changed: 37 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -73,17 +73,13 @@
7373
<properties>
7474
<java.version>11</java.version>
7575
<version.maven>3.6.3</version.maven>
76-
<pmdVersion>6.46.0</pmdVersion>
77-
7876
<maven.compiler.source>${java.version}</maven.compiler.source>
7977
<maven.compiler.target>${java.version}</maven.compiler.target>
80-
8178
<spring-boot.repackage.layout>JAR</spring-boot.repackage.layout>
79+
<version.spring-boot-maven-plugin>${project.parent.version}</version.spring-boot-maven-plugin>
80+
<version.thymeleaf-testing>3.1.0.M2</version.thymeleaf-testing>
81+
<version.thymeleaf-spring-data-dialect>3.5.0</version.thymeleaf-spring-data-dialect>
8282

83-
<spring-boot-maven-plugin.version>${project.parent.version}</spring-boot-maven-plugin.version>
84-
85-
<thymeleaf-testing.version>3.1.0.M2</thymeleaf-testing.version>
86-
<thymeleaf-spring-data-dialect.version>3.5.0</thymeleaf-spring-data-dialect.version>
8783

8884
<!-- Webjars -->
8985
<webjars.jquery.version>3.6.0</webjars.jquery.version>
@@ -95,12 +91,12 @@
9591

9692
<!-- Unit and Integration Testing -->
9793
<skipTests>true</skipTests>
98-
9994
<xmlunit.version>2.9.0</xmlunit.version>
10095
<htmlunit.version>2.63.0</htmlunit.version>
10196
<groovy-all.version>2.4.21</groovy-all.version>
10297
<hamcrest.version>2.2</hamcrest.version>
10398
<jsoup.version>1.14.2</jsoup.version>
99+
<pmdVersion>6.46.0</pmdVersion>
104100

105101
<!-- SCM and Releasing -->
106102
<version.org.apache.maven.scm>1.13.0</version.org.apache.maven.scm>
@@ -113,19 +109,22 @@
113109
<docker-compose-maven-plugin.ignorePullFailures>true</docker-compose-maven-plugin.ignorePullFailures>
114110
<docker-compose-maven-plugin.detachedMode>true</docker-compose-maven-plugin.detachedMode>
115111

112+
<!-- Maven Plugins -->
113+
114+
116115
<maven-release-plugin.version>3.0.0-M6</maven-release-plugin.version>
117116

118117
<!-- Maven Reports for Site -->
119-
<maven-site-plugin.version>3.12.0</maven-site-plugin.version>
120-
<maven-project-info-reports-plugin.version>3.3.0</maven-project-info-reports-plugin.version>
121-
<maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
122-
<maven-jxr-plugin.version>3.2.0</maven-jxr-plugin.version>
118+
<version.maven-site-plugin>3.12.0</version.maven-site-plugin>
119+
<version.maven-project-info-reports-plugin>3.3.0</version.maven-project-info-reports-plugin>
120+
<version.maven-checkstyle-plugin>3.1.2</version.maven-checkstyle-plugin>
121+
<version.maven-jxr-plugin>3.2.0</version.maven-jxr-plugin>
123122
<maven-pmd-plugin.version>3.17.0</maven-pmd-plugin.version>
124-
<spotbugs-maven-plugin.version>4.7.0.0</spotbugs-maven-plugin.version>
125-
<maven-surefire-report-plugin.version>3.0.0-M7</maven-surefire-report-plugin.version>
126-
<asciidoctor-maven-plugin.version>2.2.2</asciidoctor-maven-plugin.version>
127-
<doxia-module-markdown.version>1.11.1</doxia-module-markdown.version>
128-
<maven-enforcer-plugin.version>3.1.0</maven-enforcer-plugin.version>
123+
<version.spotbugs-maven-plugin>4.7.0.0</version.spotbugs-maven-plugin>
124+
<version.maven-surefire-report-plugin>3.0.0-M7</version.maven-surefire-report-plugin>
125+
<version.asciidoctor-maven-plugin>2.2.2</version.asciidoctor-maven-plugin>
126+
<version.doxia-module-markdown>1.11.1</version.doxia-module-markdown>
127+
<version.maven-enforcer-plugin>3.1.0</version.maven-enforcer-plugin>
129128
</properties>
130129

131130
<repositories>
@@ -363,13 +362,13 @@
363362
<dependency>
364363
<groupId>org.thymeleaf</groupId>
365364
<artifactId>thymeleaf-testing</artifactId>
366-
<version>${thymeleaf-testing.version}</version>
365+
<version>${version.thymeleaf-testing}</version>
367366
<scope>test</scope>
368367
</dependency>
369368
<dependency>
370369
<groupId>io.github.jpenren</groupId>
371370
<artifactId>thymeleaf-spring-data-dialect</artifactId>
372-
<version>${thymeleaf-spring-data-dialect.version}</version>
371+
<version>${version.thymeleaf-spring-data-dialect}</version>
373372
</dependency>
374373

375374
<!-- compile -->
@@ -452,7 +451,7 @@
452451
<dependency>
453452
<groupId>org.apache.maven.plugins</groupId>
454453
<artifactId>maven-enforcer-plugin</artifactId>
455-
<version>${maven-enforcer-plugin.version}</version>
454+
<version>${version.maven-enforcer-plugin}</version>
456455
<type>maven-plugin</type>
457456
<scope>provided</scope>
458457
</dependency>
@@ -512,35 +511,35 @@
512511
<dependency>
513512
<groupId>org.springframework.boot</groupId>
514513
<artifactId>spring-boot-maven-plugin</artifactId>
515-
<version>${spring-boot-maven-plugin.version}</version>
514+
<version>${version.spring-boot-maven-plugin}</version>
516515
<type>maven-plugin</type>
517516
<scope>provided</scope>
518517
</dependency>
519518
<dependency>
520519
<groupId>org.apache.maven.plugins</groupId>
521520
<artifactId>maven-site-plugin</artifactId>
522-
<version>${maven-site-plugin.version}</version>
521+
<version>${version.maven-site-plugin}</version>
523522
<type>maven-plugin</type>
524523
<scope>provided</scope>
525524
</dependency>
526525
<dependency>
527526
<groupId>org.apache.maven.plugins</groupId>
528527
<artifactId>maven-project-info-reports-plugin</artifactId>
529-
<version>${maven-project-info-reports-plugin.version}</version>
528+
<version>${version.maven-project-info-reports-plugin}</version>
530529
<type>maven-plugin</type>
531530
<scope>provided</scope>
532531
</dependency>
533532
<dependency>
534533
<groupId>org.apache.maven.plugins</groupId>
535534
<artifactId>maven-jxr-plugin</artifactId>
536-
<version>${maven-jxr-plugin.version}</version>
535+
<version>${version.maven-jxr-plugin}</version>
537536
<type>maven-plugin</type>
538537
<scope>provided</scope>
539538
</dependency>
540539
<dependency>
541540
<groupId>org.apache.maven.plugins</groupId>
542541
<artifactId>maven-checkstyle-plugin</artifactId>
543-
<version>${maven-checkstyle-plugin.version}</version>
542+
<version>${version.maven-checkstyle-plugin}</version>
544543
<type>maven-plugin</type>
545544
<scope>provided</scope>
546545
<exclusions>
@@ -553,7 +552,7 @@
553552
<dependency>
554553
<groupId>com.github.spotbugs</groupId>
555554
<artifactId>spotbugs-maven-plugin</artifactId>
556-
<version>${spotbugs-maven-plugin.version}</version>
555+
<version>${version.spotbugs-maven-plugin}</version>
557556
<type>maven-plugin</type>
558557
<scope>provided</scope>
559558
</dependency>
@@ -580,14 +579,14 @@
580579
<dependency>
581580
<groupId>org.apache.maven.plugins</groupId>
582581
<artifactId>maven-surefire-report-plugin</artifactId>
583-
<version>${maven-surefire-report-plugin.version}</version>
582+
<version>${version.maven-surefire-report-plugin}</version>
584583
<type>maven-plugin</type>
585584
<scope>provided</scope>
586585
</dependency>
587586
<dependency>
588587
<groupId>org.asciidoctor</groupId>
589588
<artifactId>asciidoctor-maven-plugin</artifactId>
590-
<version>${asciidoctor-maven-plugin.version}</version>
589+
<version>${version.asciidoctor-maven-plugin}</version>
591590
<type>maven-plugin</type>
592591
<scope>provided</scope>
593592
</dependency>
@@ -636,7 +635,7 @@
636635
<dependency>
637636
<groupId>org.apache.maven.doxia</groupId>
638637
<artifactId>doxia-module-markdown</artifactId>
639-
<version>${doxia-module-markdown.version}</version>
638+
<version>${version.doxia-module-markdown}</version>
640639
<scope>provided</scope>
641640
</dependency>
642641

@@ -1116,7 +1115,7 @@
11161115
<plugin>
11171116
<groupId>org.apache.maven.plugins</groupId>
11181117
<artifactId>maven-enforcer-plugin</artifactId>
1119-
<version>${maven-enforcer-plugin.version}</version>
1118+
<version>${version.maven-enforcer-plugin}</version>
11201119
</plugin>
11211120
<plugin>
11221121
<groupId>org.apache.maven.plugins</groupId>
@@ -1146,7 +1145,7 @@
11461145
<plugin>
11471146
<groupId>org.springframework.boot</groupId>
11481147
<artifactId>spring-boot-maven-plugin</artifactId>
1149-
<version>${spring-boot-maven-plugin.version}</version>
1148+
<version>${version.spring-boot-maven-plugin}</version>
11501149
</plugin>
11511150
<plugin>
11521151
<groupId>org.apache.maven.plugins</groupId>
@@ -1156,22 +1155,22 @@
11561155
<plugin>
11571156
<groupId>org.apache.maven.plugins</groupId>
11581157
<artifactId>maven-project-info-reports-plugin</artifactId>
1159-
<version>${maven-project-info-reports-plugin.version}</version>
1158+
<version>${version.maven-project-info-reports-plugin}</version>
11601159
</plugin>
11611160
<plugin>
11621161
<groupId>org.apache.maven.plugins</groupId>
11631162
<artifactId>maven-jxr-plugin</artifactId>
1164-
<version>${maven-jxr-plugin.version}</version>
1163+
<version>${version.maven-jxr-plugin}</version>
11651164
</plugin>
11661165
<plugin>
11671166
<groupId>org.apache.maven.plugins</groupId>
11681167
<artifactId>maven-checkstyle-plugin</artifactId>
1169-
<version>${maven-checkstyle-plugin.version}</version>
1168+
<version>${version.maven-checkstyle-plugin}</version>
11701169
</plugin>
11711170
<plugin>
11721171
<groupId>com.github.spotbugs</groupId>
11731172
<artifactId>spotbugs-maven-plugin</artifactId>
1174-
<version>${spotbugs-maven-plugin.version}</version>
1173+
<version>${version.spotbugs-maven-plugin}</version>
11751174
</plugin>
11761175
<plugin>
11771176
<groupId>org.apache.maven.plugins</groupId>
@@ -1181,7 +1180,7 @@
11811180
<plugin>
11821181
<groupId>org.apache.maven.plugins</groupId>
11831182
<artifactId>maven-surefire-report-plugin</artifactId>
1184-
<version>${maven-surefire-report-plugin.version}</version>
1183+
<version>${version.maven-surefire-report-plugin}</version>
11851184
</plugin>
11861185
<plugin>
11871186
<groupId>org.apache.maven.plugins</groupId>
@@ -1191,7 +1190,7 @@
11911190
<plugin>
11921191
<groupId>org.asciidoctor</groupId>
11931192
<artifactId>asciidoctor-maven-plugin</artifactId>
1194-
<version>${asciidoctor-maven-plugin.version}</version>
1193+
<version>${version.asciidoctor-maven-plugin}</version>
11951194
</plugin>
11961195
<plugin>
11971196
<groupId>org.apache.maven.plugins</groupId>
@@ -1237,7 +1236,7 @@
12371236
<plugin>
12381237
<groupId>org.apache.maven.plugins</groupId>
12391238
<artifactId>maven-site-plugin</artifactId>
1240-
<version>${maven-site-plugin.version}</version>
1239+
<version>${version.maven-site-plugin}</version>
12411240
<!--
12421241
<dependencies>
12431242
<dependency>

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

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,59 +8,76 @@
88
<div class="container" id="taskStateNavigationContainer" sec:authorize="isAuthenticated()">
99
<ul id="taskStateNavigation" class="nav nav-tabs">
1010
<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'}">
11+
<a id="taskstate_inbox" th:href="@{/taskstate/inbox}"
12+
th:class="${taskstateType == null or taskstateType == 'inbox' ? 'nav-link active' : 'nav-link'}">
1213
<i class="fas fa-inbox"></i>
1314
<span th:text="#{layout.page.inbox}">Inbox</span>
1415
</a>
1516
</li>
1617
<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+
<a id="taskstate_today" th:href="@{/taskstate/today}"
19+
th:class="${taskstateType == 'today' ? 'nav-link active' : 'nav-link'}">
1820
<i class="fas fa-clock"></i>
1921
<span th:text="#{layout.page.today}">Today</span>
2022
</a>
2123
</li>
2224
<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'}">
25+
<a id="taskstate_next" th:href="@{/taskstate/next}"
26+
th:class="${taskstateType == 'next' ? 'nav-link active' : 'nav-link'}">
2427
<i class="fas fa-cogs"></i>
2528
<span th:text="#{layout.page.next}">Next</span>
2629
</a>
2730
</li>
2831
<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'}">
32+
<a id="taskstate_waiting" th:href="@{/taskstate/waiting}"
33+
th:class="${taskstateType == 'waiting' ? 'nav-link active' : 'nav-link'}">
3034
<i class="fas fa-hourglass-half"></i>
3135
<span th:text="#{layout.page.waiting}">Waiting</span>
3236
</a>
3337
</li>
3438
<li class="nav-item">
35-
<a id="taskstate_scheduled" th:href="@{/taskstate/scheduled}" th:class="${taskstateType == 'scheduled' ? 'nav-link active' : 'nav-link'}">
39+
<a id="taskstate_scheduled" th:href="@{/taskstate/scheduled}"
40+
th:class="${taskstateType == 'scheduled' ? 'nav-link active' : 'nav-link'}">
3641
<i class="fas fa-calendar-alt"></i>
3742
<span th:text="#{layout.page.scheduled}">Scheduled</span>
3843
</a>
3944
</li>
4045
<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'}">
46+
<a id="taskstate_someday" th:href="@{/taskstate/someday}"
47+
th:class="${taskstateType == 'someday' ? 'nav-link active' : 'nav-link'}">
4248
<i class="fas fa-road"></i>
4349
<span th:text="#{layout.page.someday}">Someday</span>
4450
</a>
4551
</li>
4652
<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'}">
53+
<a id="taskstate_focus" th:href="@{/taskstate/focus}"
54+
th:class="${taskstateType == 'focus' ? 'nav-link active' : 'nav-link'}">
4855
<i class="fas fa-star"></i>
4956
<span th:text="#{layout.page.focus}">Focus</span>
5057
</a>
5158
</li>
5259
<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'}">
60+
<a id="taskstate_completed" th:href="@{/taskstate/completed}"
61+
th:class="${taskstateType == 'completed' ? 'nav-link active' : 'nav-link'}">
5462
<i class="fas fa-check-square"></i>
5563
<span th:text="#{layout.page.completed}">Completed Tasks</span>
5664
</a>
5765
</li>
5866
<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'}">
67+
<a id="taskstate_trash" th:href="@{/taskstate/trash}"
68+
th:class="${taskstateType == 'trash' ? 'nav-link active' : 'nav-link'}">
6069
<i class="fas fa-trash-alt"></i>
6170
<span th:text="#{layout.page.trash}">Trash</span>
6271
</a>
6372
</li>
73+
<li class="nav-item" ondrop="" ondragover="">
74+
<a id="taskstate_project_view"
75+
th:href="@{/project/root}"
76+
th:class="${taskstateType == 'trash' ? 'nav-link active' : 'nav-link'}">
77+
<i class="fas fa-folder-open"></i>
78+
<span th:text="#{right.nav.projects}">Projects</span>
79+
</a>
80+
</li>
6481
</ul>
6582
</div>
6683
</section>

0 commit comments

Comments
 (0)