Skip to content

Commit c8cfe56

Browse files
thomaswoehlkethomaswoehlke
committed
work
1 parent 572e3c5 commit c8cfe56

File tree

6 files changed

+86
-25
lines changed

6 files changed

+86
-25
lines changed

‎src/main/java/org/woehlke/java/simpleworklist/application/pages/PagesController.java‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
package org.woehlke.java.simpleworklist.application.pages;
2+
3+
import lombok.extern.slf4j.Slf4j;
4+
import org.springframework.stereotype.Controller;
5+
import org.springframework.ui.Model;
6+
import org.springframework.web.bind.annotation.ModelAttribute;
7+
import org.springframework.web.bind.annotation.RequestMapping;
8+
import org.springframework.web.bind.annotation.RequestMethod;
9+
import org.woehlke.java.simpleworklist.domain.session.UserSessionBean;
10+
11+
import javax.validation.constraints.NotNull;
12+
import java.util.Locale;
13+
14+
@Slf4j
15+
@Controller
16+
@RequestMapping(path = "/")
17+
public class PagesController {
18+
19+
20+
@RequestMapping(path = "/information", method = RequestMethod.GET)
21+
public final String renderPageInformation(
22+
@NotNull @ModelAttribute("userSession") UserSessionBean userSession,
23+
Locale locale, Model model
24+
) {
25+
log.info("addNewTaskToInboxGet");
26+
return "pages/information";
27+
}
28+
}

‎src/main/resources/application.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ org:
115115
- "/user/resetPassword/**"
116116
- "/user/resetPassword/confirm/**"
117117
- "/error*"
118+
- "/information*"
118119
logging:
119120
level:
120121
root: INFO

‎src/main/resources/messages_de.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ pages.chatMessages.newMessage=Neue Nachricht\:
6363
pages.chatMessages.newUserMessageButton=Sende Nachricht
6464
pages.chatMessages.showAllText1=Zeige alle Nachrichten
6565
pages.chatMessages.showAllText2=(hier werden nur die letzten 20 Angezeigt)
66+
pages.information.h1=Informationen
6667
project.add.h1=Neues Projekt
6768
project.add.description=Beschreibung
6869
project.add.button=Neues Projekt speichern

‎src/main/resources/messages_en.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,4 +270,5 @@ user.loginForm.email.placeholder=Enter your Email
270270
user.loginForm.password.label=Password
271271
user.loginForm.password.placeholder=Enter your Password
272272
user.registerSentMail.action=Please check the Inbox of your Email-Client.
273+
pages.information.h1=Information
273274

‎src/main/resources/templates/pages/information.html‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
<!DOCTYPE html>
2+
<html th:lang="${#locale.language}"
3+
xmlns="http://www.w3.org/1999/xhtml"
4+
xmlns:th="http://www.thymeleaf.org"
5+
xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
6+
xmlns:sd="http://www.thymeleaf.org/spring-data">
7+
<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
8+
<title th:text="'SimpleWorklist | ' + #{pages.information.h1}">Information</title>
9+
</head>
10+
<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
11+
12+
<div th:fragment="mytwtitle">
13+
<div id="tw-content-title">
14+
<div class="row">
15+
<h1 class="col-md-12 mb-12">
16+
<i class="fas fa-inbox"></i>
17+
<span th:utext="#{pages.information.h1}">Information</span>
18+
</h1>
19+
</div>
20+
</div>
21+
</div>
22+
23+
<div th:fragment="mytwcontent">
24+
<div>
25+
INFORMATION PAGE
26+
</div>
27+
<div id="user-login-form-more-information">
28+
<div>
29+
<span th:text="#{user.loginForm.moreInformation}">For More Information please visit:</span>
30+
<ul>
31+
<li><span th:utext="#{user.loginForm.github}">Github:</span> <a
32+
href="https://github.com/Spring-Framework-Java-Apps/simpleworklist/" target="_blank">https://github.com/Spring-Framework-Java-Apps/simpleworklist/</a>
33+
</li>
34+
<li><span th:utext="#{user.loginForm.myBlog}">My Blog:</span> <a href="http://thomas-woehlke.blogspot.de/"
35+
target="_blank">http://thomas-woehlke.blogspot.de/</a>
36+
</li>
37+
<li><span th:utext="#{user.loginForm.projectPage}">The Project Page:</span> <a
38+
href="http://woehlke.org/p/simpleworklist/" target="_blank">http://woehlke.org/p/simpleworklist/</a></li>
39+
<li>Getting Things Done&reg; @ Wikipedia:
40+
<a href="https://de.wikipedia.org/wiki/Getting_Things_Done" target="_blank" th:if="${locale == 'de'}">https://de.wikipedia.org/wiki/Getting_Things_Done/</a>
41+
<a href="https://en.wikipedia.org/wiki/Getting_Things_Done" target="_blank" th:if="${locale != 'de'}">https://en.wikipedia.org/wiki/Getting_Things_Done</a>
42+
</li>
43+
</ul>
44+
</div>
45+
<div>
46+
<small>
47+
<span th:utext="#{user.loginForm.gtd.copyright}">GTD&reg; and Getting Things Done&reg; are registered trademarks of the David Allen Company. SimpleWorklist is
48+
not affiliated with or endorsed by the David Allen Company.</span>
49+
</small>
50+
</div>
51+
</div>
52+
</div>
53+
54+
</body>
55+
</html>

‎src/main/resources/templates/user/login/loginForm.html‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -62,31 +62,6 @@ <h2><span th:utext="#{user.loginForm.h2}">Your Todo-List for Getting Things Done
6262
</div>
6363
</div>
6464
</form>
65-
<div id="user-login-form-more-information">
66-
<div>
67-
<span th:text="#{user.loginForm.moreInformation}">For More Information please visit:</span>
68-
<ul>
69-
<li><span th:utext="#{user.loginForm.github}">Github:</span> <a
70-
href="https://github.com/Spring-Framework-Java-Apps/simpleworklist/" target="_blank">https://github.com/Spring-Framework-Java-Apps/simpleworklist/</a>
71-
</li>
72-
<li><span th:utext="#{user.loginForm.myBlog}">My Blog:</span> <a href="http://thomas-woehlke.blogspot.de/"
73-
target="_blank">http://thomas-woehlke.blogspot.de/</a>
74-
</li>
75-
<li><span th:utext="#{user.loginForm.projectPage}">The Project Page:</span> <a
76-
href="http://woehlke.org/p/simpleworklist/" target="_blank">http://woehlke.org/p/simpleworklist/</a></li>
77-
<li>Getting Things Done&reg; @ Wikipedia:
78-
<a href="https://de.wikipedia.org/wiki/Getting_Things_Done" target="_blank" th:if="${locale == 'de'}">https://de.wikipedia.org/wiki/Getting_Things_Done/</a>
79-
<a href="https://en.wikipedia.org/wiki/Getting_Things_Done" target="_blank" th:if="${locale != 'de'}">https://en.wikipedia.org/wiki/Getting_Things_Done</a>
80-
</li>
81-
</ul>
82-
</div>
83-
<div>
84-
<small>
85-
<span th:utext="#{user.loginForm.gtd.copyright}">GTD&reg; and Getting Things Done&reg; are registered trademarks of the David Allen Company. SimpleWorklist is
86-
not affiliated with or endorsed by the David Allen Company.</span>
87-
</small>
88-
</div>
89-
</div>
9065
</div>
9166

9267
</body>

0 commit comments

Comments
 (0)