Skip to content

Commit f03ca14

Browse files
thomaswoehlkethomaswoehlke
authored
Merge pull request #354 from Spring-Framework-Java-Apps/master
deploy
2 parents fe28074 + 96818aa commit f03ca14

File tree

68 files changed

+296
-174
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+296
-174
lines changed

‎pom.xml‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>org.woehlke</groupId>
66
<artifactId>simpleworklist</artifactId>
7-
<version>2.3.62-SNAPSHOT</version>
7+
<version>2.3.62</version>
88
<packaging>jar</packaging>
99

1010
<parent>
@@ -17,7 +17,7 @@
1717
<connection>scm:git:git@github.com:Spring-Framework-Java-Apps/simpleworklist.git</connection>
1818
<developerConnection>scm:git:git@github.com:Spring-Framework-Java-Apps/simpleworklist.git</developerConnection>
1919
<url>https://github.com/Spring-Framework-Java-Apps/simpleworklist/tree/${project.scm.tag}</url>
20-
<tag>head</tag>
20+
<tag>v2.3.62</tag>
2121
</scm>
2222

2323
<name>simpleworklist</name>
@@ -125,7 +125,7 @@
125125
<version.asciidoctor-maven-plugin>2.2.2</version.asciidoctor-maven-plugin>
126126
<version.doxia-module-markdown>1.11.1</version.doxia-module-markdown>
127127
<version.maven-enforcer-plugin>3.1.0</version.maven-enforcer-plugin>
128-
<version.plantuml-maven-plugin>1.5.2</version.plantuml-maven-plugin>
128+
<version.plantuml-maven-plugin>1.4.0</version.plantuml-maven-plugin>
129129
<version.net.sourceforge.plantuml>1.2022.6</version.net.sourceforge.plantuml>
130130
</properties>
131131

@@ -1513,7 +1513,7 @@
15131513
<goal>tree</goal>
15141514
</goals>
15151515
</execution>
1516-
-->
1516+
15171517
<execution>
15181518
<id>report</id>
15191519
<phase>site</phase>
@@ -1535,7 +1535,7 @@
15351535
</reportSets>
15361536
</configuration>
15371537
</execution>
1538-
<!--
1538+
15391539
<execution>
15401540
<id>get-dependency-sources</id>
15411541
<phase>site</phase>
@@ -1558,13 +1558,15 @@
15581558
<execution>
15591559
<id>copy-dependencies</id>
15601560
<phase>package</phase>
1561-
<goals><goal>copy-dependencies</goal></goals>
1561+
<goals>
1562+
<goal>copy-dependencies</goal>
1563+
</goals>
15621564
<configuration>
15631565
<includeScope>compile</includeScope>
1564-
<excludeTypes>pom, maven-plugin</excludeTypes>
1566+
<excludeTypes>maven-plugin</excludeTypes>
15651567
<excludeScope>test,provided</excludeScope>
1566-
<excludeGroupIds>antlr,org.beanshell,org.apache.maven.plugins,org.apache.maven.scm,org.jruby</excludeGroupIds>
1567-
<excludeArtifactIds>weld-probe-core,antlr,bsh,velocity-tools,liquibase-core,jruby-complete,cdi-api</excludeArtifactIds>
1568+
<excludeGroupIds>antlr,org.beanshell,org.apache.maven.plugins,org.apache.maven.scm,org.jruby,com.vladsch.flexmark,org.apache.maven.doxia,org.codehaus.plexus,org.apache.maven.scm,io.netty,org.apache.groovy,org.eclipse.jetty,org.mockito,org.asciidoctor,com.github.jnr,org.apache.maven.surefire,net.sourceforge.saxon,net.sf.saxon,com.github.spotbugs,org.eclipse.jgit</excludeGroupIds>
1569+
<excludeArtifactIds>weld-probe-core,antlr,bsh,velocity-tools,liquibase-core,jruby-complete,cdi-api,lombok,jcommander</excludeArtifactIds>
15681570
</configuration>
15691571
</execution>
15701572
</executions>
@@ -1863,7 +1865,7 @@
18631865
<profiles>
18641866

18651867
<profile>
1866-
<id>war</id>
1868+
<id>jar</id>
18671869
<properties>
18681870
<skip.unit.tests>false</skip.unit.tests>
18691871
<skip.integration.tests>true</skip.integration.tests>

‎src/main/resources/static/css/main.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ tt, th, code, kbd, samp, pre {
2121
font-family: 'Varela Round', sans-serif;
2222
}
2323

24-
.jumbotron {
24+
header {
2525
border-radius: 0 !important;
2626
}
2727

‎src/main/resources/static/img/jumbotron/berlin_skyline.png‎

687 KB
Loading

‎src/main/resources/static/img/jumbotron/brandenburger_gate.png‎

575 KB
Loading

‎src/main/resources/static/img/jumbotron/oberbaumbridge.png‎

687 KB
Loading

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
<section class="container" sec:authorize="isAuthenticated()" th:if="${breadcrumb != null}">
99

1010
<nav aria-label="breadcrumb">
11-
<ol class="breadcrumb">
11+
<ol class="breadcrumb text-dark">
1212
<li th:each="bc,iterStat : ${breadcrumb.getBreadcrumb()}"
1313
th:class="${iterStat == breadcrumb.size()-1 ? 'breadcrumb-item active' : 'breadcrumb-item'}">
1414
<span th:if="${iterStat == breadcrumb.size()-1}" th:text="${bc.name}"></span>
1515
<a th:if="${iterStat != breadcrumb.size()-1}"
1616
th:href="@{{url}(url=${bc.url})}"
17-
th:text="${bc.name}">
17+
th:text="${bc.name}" class="link-dark">
1818
</a>
1919
</li>
2020
</ol>

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

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,23 @@
2323
<body th:fragment="tw-page-body(twcontent,twtitle,scripts)">
2424

2525
<!-- Navbar on Top -->
26-
<header>
27-
<div th:replace="layout/navbartop :: navbartop(contexts=${contexts},locale=${locale},thisProject=${thisProject},numberOfNewIncomingMessages=${numberOfNewIncomingMessages},ctx=${ctx})" >
28-
</div>
29-
<div class="jumbotron mt-3" id="tw-title-section">
30-
<div class="container">
31-
<th:block th:replace="${twtitle}" />
32-
</div>
33-
</div>
34-
</header>
35-
36-
<!-- Breadcrumb -->
37-
<div th:replace="layout/breadcrumb :: breadcrumb(breadcrumb=${breadcrumb})">
38-
</div>
39-
40-
<!-- taskstates -->
41-
<section th:replace="layout/taskstates :: navigation-taskstates(rootProjects=${rootProjects},thisProject=${thisProject})">
42-
</section>
43-
26+
<header style="background-image: url('/img/jumbotron/2012-06-07_20.58.02.png')" >
27+
<div style="background-color: rgba(255, 255, 255, 0.3)">
28+
<div th:replace="layout/navbartop :: navbartop(contexts=${contexts},locale=${locale},thisProject=${thisProject},numberOfNewIncomingMessages=${numberOfNewIncomingMessages},ctx=${ctx})">
29+
</div>
30+
<div class="jumbotron pt-3" id="tw-title-section" >
31+
<div class="container">
32+
<th:block th:replace="${twtitle}" />
33+
</div>
34+
</div>
35+
<!-- Breadcrumb -->
36+
<div th:replace="layout/breadcrumb :: breadcrumb(breadcrumb=${breadcrumb})">
37+
</div>
38+
<!-- taskstates -->
39+
<div th:replace="layout/taskstates :: navigation-taskstates(rootProjects=${rootProjects},thisProject=${thisProject})" class="link-dark">
40+
</div>
41+
</div>
42+
</header>
4443

4544
<!-- Menu on Left Column and Document Window on the Right Column -->
4645
<section id="tw-main-section">
@@ -143,7 +142,7 @@
143142
function drop2completed(ev) {
144143
ev.preventDefault();
145144
var taskId = ev.dataTransfer.getData("task").split("_")[1];
146-
var myUrl = '[(@{/taskstate/task/})]'+taskId+'/move/to/completed';
145+
var myUrl = '[(@{/taskstate/task/})]'+taskId+'/move/to/taskstate/completed';
147146
window.location.replace(myUrl);
148147
}
149148

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

Lines changed: 88 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,69 +5,132 @@
55
xmlns:sd="http://www.thymeleaf.org/spring-data">
66

77
<section th:fragment="navigation-taskstates(rootProjects,thisProject)">
8-
<div class="container mb-3" id="taskStateNavigationContainer" sec:authorize="isAuthenticated()">
8+
<div class="container mb-3 text-dark" 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}"
12-
th:class="${taskstateType == null or taskstateType == 'inbox' ? 'nav-link active' : 'nav-link'}">
13-
<i class="fas fa-inbox"></i>
14-
<span th:text="#{layout.page.inbox}">Inbox</span>
11+
<a id="taskstate_inbox" class="nav-link active link-dark"
12+
th:href="@{/taskstate/inbox}"
13+
th:if="${taskstateType == 'inbox'}">
14+
<i class="fas fa-inbox link-dark"></i>
15+
<span th:text="#{layout.page.inbox}" class="link-dark">Inbox</span>
16+
</a>
17+
<a id="taskstate_inbox" class="nav-link link-light"
18+
th:href="@{/taskstate/inbox}"
19+
th:if="${taskstateType != 'inbox'}">
20+
<i class="fas fa-inbox link-light"></i>
21+
<span th:text="#{layout.page.inbox}" class="link-light">Inbox</span>
1522
</a>
1623
</li>
1724
<li class="nav-item" ondrop="drop2today(event)" ondragover="allowDropOfTask(event)">
18-
<a id="taskstate_today" th:href="@{/taskstate/today}"
19-
th:class="${taskstateType == 'today' ? 'nav-link active' : 'nav-link'}">
20-
<i class="fas fa-clock"></i>
21-
<span th:text="#{layout.page.today}">Today</span>
25+
<a id="taskstate_today" class="nav-link active link-dark"
26+
th:href="@{/taskstate/today}"
27+
th:if="${taskstateType == 'today'}">
28+
<i class="fas fa-clock link-dark"></i>
29+
<span th:text="#{layout.page.today}" class="link-dark">Today</span>
30+
</a>
31+
<a id="taskstate_today" class="nav-link link-light"
32+
th:href="@{/taskstate/today}"
33+
th:if="${taskstateType != 'today'}">
34+
<i class="fas fa-clock link-light"></i>
35+
<span th:text="#{layout.page.today}" class="link-light">Today</span>
2236
</a>
2337
</li>
2438
<li class="nav-item" ondrop="drop2next(event)" ondragover="allowDropOfTask(event)">
25-
<a id="taskstate_next" th:href="@{/taskstate/next}"
26-
th:class="${taskstateType == 'next' ? 'nav-link active' : 'nav-link'}">
39+
<a id="taskstate_next" class="nav-link active link-dark"
40+
th:href="@{/taskstate/next}"
41+
th:if="${taskstateType == 'next'}">
2742
<i class="fas fa-cogs"></i>
2843
<span th:text="#{layout.page.next}">Next</span>
2944
</a>
45+
<a id="taskstate_next" class="nav-link link-light"
46+
th:href="@{/taskstate/next}"
47+
th:if="${taskstateType != 'next'}">
48+
<i class="fas fa-cogs"></i>
49+
<span th:text="#{layout.page.next}">Next</span>
50+
</a>
3051
</li>
3152
<li class="nav-item" ondrop="drop2waiting(event)" ondragover="allowDropOfTask(event)">
32-
<a id="taskstate_waiting" th:href="@{/taskstate/waiting}"
33-
th:class="${taskstateType == 'waiting' ? 'nav-link active' : 'nav-link'}">
53+
<a id="taskstate_waiting" class="nav-link active link-dark"
54+
th:href="@{/taskstate/waiting}"
55+
th:if="${taskstateType == 'waiting'}">
3456
<i class="fas fa-hourglass-half"></i>
3557
<span th:text="#{layout.page.waiting}">Waiting</span>
3658
</a>
59+
<a id="taskstate_waiting" class="nav-link link-light"
60+
th:href="@{/taskstate/waiting}"
61+
th:if="${taskstateType != 'waiting'}">
62+
<i class="fas fa-hourglass-half"></i>
63+
<span th:text="#{layout.page.waiting}">Waiting</span>
64+
</a>
3765
</li>
3866
<li class="nav-item">
39-
<a id="taskstate_scheduled" th:href="@{/taskstate/scheduled}"
40-
th:class="${taskstateType == 'scheduled' ? 'nav-link active' : 'nav-link'}">
67+
<a id="taskstate_scheduled" class="nav-link active link-dark"
68+
th:href="@{/taskstate/scheduled}"
69+
th:if="${taskstateType == 'scheduled'}">
4170
<i class="fas fa-calendar-alt"></i>
4271
<span th:text="#{layout.page.scheduled}">Scheduled</span>
4372
</a>
73+
<a id="taskstate_scheduled" class="nav-link link-light"
74+
th:href="@{/taskstate/scheduled}"
75+
th:if="${taskstateType != 'scheduled'}">
76+
<i class="fas fa-calendar-alt"></i>
77+
<span th:text="#{layout.page.scheduled}">Scheduled</span>
78+
</a>
4479
</li>
4580
<li class="nav-item" ondrop="drop2someday(event)" ondragover="allowDropOfTask(event)">
46-
<a id="taskstate_someday" th:href="@{/taskstate/someday}"
47-
th:class="${taskstateType == 'someday' ? 'nav-link active' : 'nav-link'}">
81+
<a id="taskstate_someday" class="nav-link active link-dark"
82+
th:href="@{/taskstate/someday}"
83+
th:if="${taskstateType == 'someday'}">
4884
<i class="fas fa-road"></i>
4985
<span th:text="#{layout.page.someday}">Someday</span>
5086
</a>
87+
<a id="taskstate_someday" class="nav-link link-light"
88+
th:href="@{/taskstate/someday}"
89+
th:if="${taskstateType != 'someday'}">
90+
<i class="fas fa-road"></i>
91+
<span th:text="#{layout.page.someday}">Someday</span>
92+
</a>
5193
</li>
5294
<li class="nav-item" ondrop="drop2focus(event)" ondragover="allowDropOfTask(event)">
53-
<a id="taskstate_focus" th:href="@{/taskstate/focus}"
54-
th:class="${taskstateType == 'focus' ? 'nav-link active' : 'nav-link'}">
95+
<a id="taskstate_focus" class="nav-link active link-dark"
96+
th:href="@{/taskstate/focus}"
97+
th:if="${taskstateType == 'focus'}">
5598
<i class="fas fa-star"></i>
5699
<span th:text="#{layout.page.focus}">Focus</span>
57100
</a>
101+
<a id="taskstate_focus" class="nav-link link-light"
102+
th:href="@{/taskstate/focus}"
103+
th:if="${taskstateType != 'focus'}">
104+
<i class="fas fa-star"></i>
105+
<span th:text="#{layout.page.focus}">Focus</span>
106+
</a>
58107
</li>
59108
<li class="nav-item" ondrop="drop2completed(event)" ondragover="allowDropOfTask(event)">
60-
<a id="taskstate_completed" th:href="@{/taskstate/completed}"
61-
th:class="${taskstateType == 'completed' ? 'nav-link active' : 'nav-link'}">
109+
<a id="taskstate_completed" class="nav-link active link-dark"
110+
th:href="@{/taskstate/completed}"
111+
th:if="${taskstateType == 'completed'}">
62112
<i class="fas fa-check-square"></i>
63113
<span th:text="#{layout.page.completed}">Completed Tasks</span>
64114
</a>
115+
<a id="taskstate_completed" class="nav-link link-light"
116+
th:href="@{/taskstate/completed}"
117+
th:if="${taskstateType != 'completed'}">
118+
<i class="fas fa-check-square"></i>
119+
<span th:text="#{layout.page.completed}">Completed Tasks</span>
120+
</a>
65121
</li>
66122
<li class="nav-item" ondrop="drop2trash(event)" ondragover="allowDropOfTask(event)">
67-
<a id="taskstate_trash" th:href="@{/taskstate/trash}"
68-
th:class="${taskstateType == 'trash' ? 'nav-link active' : 'nav-link'}">
69-
<i class="fas fa-trash-alt"></i>
70-
<span th:text="#{layout.page.trash}">Trash</span>
123+
<a id="taskstate_trash" class="nav-link active link-dark"
124+
th:href="@{/taskstate/trash}"
125+
th:if="${taskstateType == 'trash'}">
126+
<i class="fas fa-trash-alt link-dark"></i>
127+
<span th:text="#{layout.page.trash}" class="link-dark">Trash</span>
128+
</a>
129+
<a id="taskstate_trash" class="nav-link link-light"
130+
th:href="@{/taskstate/trash}"
131+
th:if="${taskstateType != 'trash'}">
132+
<i class="fas fa-trash-alt link-light"></i>
133+
<span th:text="#{layout.page.trash}" class="link-light">Trash</span>
71134
</a>
72135
</li>
73136
</ul>

‎src/test/java/org/woehlke/java/simpleworklist/test/SmokeTests.java‎ renamed to ‎src/test/java/org/woehlke/java/simpleworklist/SmokeTests.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.woehlke.java.simpleworklist.test;
1+
package org.woehlke.java.simpleworklist;
22

33
import lombok.extern.slf4j.Slf4j;
44
import org.junit.jupiter.api.*;
@@ -14,9 +14,7 @@
1414
import org.springframework.test.web.servlet.MockMvc;
1515
import org.springframework.test.web.servlet.ResultActions;
1616
import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
17-
import org.woehlke.java.simpleworklist.SimpleworklistApplication;
18-
import org.woehlke.java.simpleworklist.test.application.config.FunctionalRequirements;
19-
import org.woehlke.java.simpleworklist.test.application.config.UserAccountTestDataService;
17+
import org.woehlke.java.simpleworklist.config.UserAccountTestDataService;
2018

2119
import java.net.URL;
2220

@@ -26,7 +24,7 @@
2624
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
2725
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
2826
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
29-
import static org.woehlke.java.simpleworklist.test.application.config.Requirements.*;
27+
import static org.woehlke.java.simpleworklist.config.Requirements.*;
3028

3129
@Slf4j
3230
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)

‎src/test/java/org/woehlke/java/simpleworklist/test/application/helper/TestHelperService.java‎ renamed to ‎src/test/java/org/woehlke/java/simpleworklist/application/helper/TestHelperService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.woehlke.java.simpleworklist.test.application.helper;
1+
package org.woehlke.java.simpleworklist.application.helper;
22

33
import org.woehlke.java.simpleworklist.domain.user.passwordrecovery.UserPasswordRecovery;
44
import org.woehlke.java.simpleworklist.domain.user.signup.UserRegistration;

0 commit comments

Comments
 (0)