Skip to content

Commit 2ea76b3

Browse files
thomaswoehlkethomaswoehlke
committed
Fixed #86, Fixed #87 
1 parent 9a398b3 commit 2ea76b3

File tree

1 file changed

+75
-75
lines changed

1 file changed

+75
-75
lines changed

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

Lines changed: 75 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,75 @@
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=true)">
8-
<title th:text="'SimpleWorklist | ' + #{user.loginForm.h2}">Title</title>
9-
</head>
10-
<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
11-
12-
<div th:fragment="mytwtitle">
13-
<h1><span th:utext="#{user.loginForm.h1}">Welcome to SimpleWorklist</span></h1>
14-
<h2><span th:utext="#{user.loginForm.h2}">Your Todo-List for Getting Things Done&reg;</span></h2>
15-
</div>
16-
17-
<div th:fragment="mytwcontent">
18-
<form id="user-login-form" th:action="@{/j_spring_security_check}" method="post">
19-
<div class="card">
20-
<div class="card-header">
21-
<span th:utext="#{user.loginForm.login}">Please login or</span>
22-
<a th:href="@{/register}">
23-
<span th:utext="#{user.loginForm.register}">register as new user</span>
24-
</a>.
25-
</div>
26-
<div class="card-body">
27-
<div class="alert alert-danger" role="alert" th:if="${param.login_error != null}">
28-
<span th:text="#{user.loginForm.loginError}">Your login attempt was not successful, try again.</span>
29-
</div>
30-
<input type="hidden"
31-
name="${_csrf.parameterName}"
32-
value="${_csrf.token}"/>
33-
<div class="form-group">
34-
<label for="j_username">Email</label>
35-
<input id="j_username" type="email" name="j_username" class="form-control" placeholder="Enter email"/>
36-
</div>
37-
<div class="form-group">
38-
<label for="j_password" th:text="#{user.loginForm.password}">Password</label>
39-
<input id="j_password" type="password" name="j_password" class="form-control" placeholder="Password"/>
40-
</div>
41-
<button id="loginButton" type="submit" class="btn btn-primary">
42-
<i class="fas fa-sign-in-alt"></i>
43-
<span th:utext="#{user.loginForm.loginButton}"></span>
44-
</button>
45-
<a th:href="@{/resetPassword}" class="btn btn-secondary" role="button">
46-
<i class="fas fa-question-circle"></i>
47-
<span th:utext="#{user.loginForm.passwordReset}">Password forgotten?</span>
48-
</a>
49-
</div>
50-
</div>
51-
</form>
52-
<div id="user-login-form-more-information">
53-
<div>
54-
<span th:text="#{user.loginForm.moreInformation}">For More Information please visit:</span>
55-
<ul>
56-
<li><span th:utext="#{user.loginForm.github}">Github:</span> <a href="https://github.com/phasenraum2010/simpleworklist" target="_blank">https://github.com/phasenraum2010/simpleworklist</a></li>
57-
<li><span th:utext="#{user.loginForm.myBlog}">My Blog:</span> <a href="http://thomas-woehlke.blogspot.de/" target="_blank">http://thomas-woehlke.blogspot.de/</a></li>
58-
<li><span th:utext="#{user.loginForm.projectPage}">The Project Page:</span> <a href="http://woehlke.org/p/simpleworklist/" target="_blank">http://woehlke.org/p/simpleworklist/</a></li>
59-
<li>Getting Things Done&reg; @ Wikipedia:
60-
<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>
61-
<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>
62-
</li>
63-
</ul>
64-
</div>
65-
<div>
66-
<small>
67-
<span th:utext="#{user.loginForm.gtd.copyright}">GTD&reg; and Getting Things Done&reg; are registered trademarks of the David Allen Company. SimpleWorklist is
68-
not affiliated with or endorsed by the David Allen Company.</span>
69-
</small>
70-
</div>
71-
</div>
72-
</div>
73-
74-
</body>
75-
</html>
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=true)">
8+
<title th:text="'SimpleWorklist | ' + #{user.loginForm.h2}">Title</title>
9+
</head>
10+
<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
11+
12+
<div th:fragment="mytwtitle">
13+
<h1><span th:utext="#{user.loginForm.h1}">Welcome to SimpleWorklist</span></h1>
14+
<h2><span th:utext="#{user.loginForm.h2}">Your Todo-List for Getting Things Done&reg;</span></h2>
15+
</div>
16+
17+
<div th:fragment="mytwcontent">
18+
<form id="user-login-form" th:action="@{/j_spring_security_check}" method="post">
19+
<div class="card">
20+
<div class="card-header">
21+
<span th:utext="#{user.loginForm.login}">Please login or</span>
22+
<a th:href="@{/register}">
23+
<span th:utext="#{user.loginForm.register}">register as new user</span>
24+
</a>.
25+
</div>
26+
<div class="card-body">
27+
<div class="alert alert-danger" role="alert" th:if="${param.login_error != null}">
28+
<span th:text="#{user.loginForm.loginError}">Your login attempt was not successful, try again.</span>
29+
</div>
30+
<input type="hidden"
31+
name="${_csrf.parameterName}"
32+
value="${_csrf.token}"/>
33+
<div class="form-group">
34+
<label for="j_username">Email</label>
35+
<input id="j_username" type="email" name="j_username" class="form-control" placeholder="Enter email"/>
36+
</div>
37+
<div class="form-group">
38+
<label for="j_password" th:text="#{user.loginForm.password}">Password</label>
39+
<input id="j_password" type="password" name="j_password" class="form-control" placeholder="Password"/>
40+
</div>
41+
<button id="loginButton" type="submit" class="btn btn-primary">
42+
<i class="fas fa-sign-in-alt"></i>
43+
<span th:utext="#{user.loginForm.loginButton}"></span>
44+
</button>
45+
<a th:href="@{/resetPassword}" class="btn btn-secondary" role="button">
46+
<i class="fas fa-question-circle"></i>
47+
<span th:utext="#{user.loginForm.passwordReset}">Password forgotten?</span>
48+
</a>
49+
</div>
50+
</div>
51+
</form>
52+
<div id="user-login-form-more-information">
53+
<div>
54+
<span th:text="#{user.loginForm.moreInformation}">For More Information please visit:</span>
55+
<ul>
56+
<li><span th:utext="#{user.loginForm.github}">Github:</span> <a href="https://github.com/Spring-Framework-Java-Apps/simpleworklist/" target="_blank">https://github.com/Spring-Framework-Java-Apps/simpleworklist/</a></li>
57+
<li><span th:utext="#{user.loginForm.myBlog}">My Blog:</span> <a href="http://thomas-woehlke.blogspot.de/" target="_blank">http://thomas-woehlke.blogspot.de/</a></li>
58+
<li><span th:utext="#{user.loginForm.projectPage}">The Project Page:</span> <a href="http://woehlke.org/p/simpleworklist/" target="_blank">http://woehlke.org/p/simpleworklist/</a></li>
59+
<li>Getting Things Done&reg; @ Wikipedia:
60+
<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>
61+
<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>
62+
</li>
63+
</ul>
64+
</div>
65+
<div>
66+
<small>
67+
<span th:utext="#{user.loginForm.gtd.copyright}">GTD&reg; and Getting Things Done&reg; are registered trademarks of the David Allen Company. SimpleWorklist is
68+
not affiliated with or endorsed by the David Allen Company.</span>
69+
</small>
70+
</div>
71+
</div>
72+
</div>
73+
74+
</body>
75+
</html>

0 commit comments

Comments
 (0)