Skip to content

Commit c72a88b

Browse files
thomaswoehlkethomaswoehlke
committed
work
1 parent b72219d commit c72a88b

File tree

3 files changed

+102
-97
lines changed

3 files changed

+102
-97
lines changed

‎src/html/SimpleWorklist _ login.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4254,8 +4254,8 @@ <h2><span>Ihre Todo-Liste für Getting Things Done®</span></h2>
42544254
</div>
42554255
</div>
42564256
<div class="card-footer">
4257-
<div class="form-row">
4258-
<div class="col-md-4 mb-4">
4257+
<div class="row">
4258+
<div class="col">
42594259
<button id="loginButton" type="submit" class="btn btn-block btn-primary">
42604260
<svg class="svg-inline--fa fa-right-to-bracket" aria-hidden="true" focusable="false"
42614261
data-prefix="fas" data-icon="right-to-bracket" role="img" xmlns="http://www.w3.org/2000/svg"
@@ -4266,7 +4266,7 @@ <h2><span>Ihre Todo-Liste für Getting Things Done®</span></h2>
42664266
<span>Anmelden</span>
42674267
</button>
42684268
</div>
4269-
<div class="col-md-4 mb-4">
4269+
<div class="col">
42704270
<a id="passwordResetButton" href="http://localhost:9010/user/resetPassword" role="button"
42714271
class="btn btn-block btn-secondary">
42724272
<svg class="svg-inline--fa fa-circle-question" aria-hidden="true" focusable="false"
@@ -4278,7 +4278,7 @@ <h2><span>Ihre Todo-Liste für Getting Things Done®</span></h2>
42784278
<span>Passwort vergessen?</span>
42794279
</a>
42804280
</div>
4281-
<div class="col-md-4 mb-4">
4281+
<div class="col">
42824282
<a id="registerButton" href="http://localhost:9010/user/register/" role="button"
42834283
class="btn btn-block btn-secondary">
42844284
<svg class="svg-inline--fa fa-user" aria-hidden="true" focusable="false" data-prefix="fas"

‎src/main/resources/messages_en.properties‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ user.loginForm.gtd.copyright=GTD&reg; and Getting Things Done&reg; are registere
88
user.loginForm.h1 = Welcome to SimpleWorklist
99
user.loginForm.h2=Your Todo-List for Getting Things Done&reg;
1010
user.loginForm.login=Please login or
11-
user.loginForm.loginButton=Login
11+
user.loginForm.loginButton=Sign in
1212
user.loginForm.loginError=Your login attempt was not successful, try again.
1313
user.loginForm.loginError.caused=Caused\:
1414
user.loginForm.moreInformation=For More Information please visit\:
1515
user.loginForm.myBlog=My Blog\:
1616
user.loginForm.password=Password
17-
user.loginForm.passwordReset=Password forgotten?
18-
user.loginForm.projectPage=The Project Page\:
19-
user.loginForm.register=register as new user
17+
user.loginForm.passwordReset=Forgot your password?
18+
user.loginForm.projectPage=The Project Page:
19+
user.loginForm.register=sign up
2020
user.registerNotConfirmed.h1=Register as new User
2121
user.registerForm.button=Register
2222
user.registerForm.h1=Register as new User

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

Lines changed: 94 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -1,101 +1,106 @@
11
<!DOCTYPE html>
22
<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">
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">
77
<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=true)">
8-
<title th:text="'SimpleWorklist | ' + #{user.loginForm.h2}">Title</title>
8+
<title th:text="'SimpleWorklist | ' + #{user.loginForm.h2}">Title</title>
99
</head>
1010
<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
1111

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>
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>
1616

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="@{/user/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="invalid-feedback" 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" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
31-
<div class="form-row">
32-
<div class="col-md-12 mb-12">
33-
<div class="form-group">
34-
<label for="j_username" th:text="#{user.loginForm.email.label}">Email</label>
35-
<input id="j_username" type="email" class="form-control form-control-lg"
36-
name="j_username"
37-
th:placeholder="#{user.loginForm.email.placeholder}"/>
38-
</div>
39-
</div>
40-
</div>
41-
<div class="form-row">
42-
<div class="col-md-12 mb-12">
43-
<div class="form-group">
44-
<label for="j_password" th:text="#{user.loginForm.password.label}">Password</label>
45-
<input id="j_password" type="password" class="form-control form-control-lg"
46-
name="j_password"
47-
th:placeholder="#{user.loginForm.password.placeholder}"/>
48-
</div>
49-
</div>
50-
</div>
51-
</div>
52-
<div class="card-footer">
53-
<div class="form-row">
54-
<div class="col-md-4 mb-4">
55-
<button id="loginButton" type="submit" class="btn btn-block btn-primary">
56-
<i class="fas fa-sign-in-alt"></i>
57-
<span th:utext="#{user.loginForm.loginButton}"></span>
58-
</button>
59-
</div>
60-
<div class="col-md-4 mb-4">
61-
<a id="passwordResetButton" th:href="@{/user/resetPassword}" role="button"
62-
class="btn btn-block btn-secondary">
63-
<i class="fas fa-question-circle"></i>
64-
<span th:utext="#{user.loginForm.passwordReset}">Password forgotten?</span>
65-
</a>
66-
</div>
67-
<div class="col-md-4 mb-4">
68-
<a id="registerButton" th:href="@{/user/register/}" role="button"
69-
class="btn btn-block btn-secondary">
70-
<i class="fas fa-user"></i>
71-
<span th:utext="#{user.loginForm.register}">register as new user</span>
72-
</a>
73-
</div>
74-
</div>
75-
</div>
76-
</div>
77-
</form>
78-
<div id="user-login-form-more-information">
79-
<div>
80-
<span th:text="#{user.loginForm.moreInformation}">For More Information please visit:</span>
81-
<ul>
82-
<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>
83-
<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>
84-
<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>
85-
<li>Getting Things Done&reg; @ Wikipedia:
86-
<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>
87-
<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>
88-
</li>
89-
</ul>
90-
</div>
91-
<div>
92-
<small>
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="@{/user/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="invalid-feedback" 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" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
31+
<div class="form-row">
32+
<div class="col-md-12 mb-12">
33+
<div class="form-group">
34+
<label for="j_username" th:text="#{user.loginForm.email.label}">Email</label>
35+
<input id="j_username" type="email" class="form-control form-control-lg"
36+
name="j_username"
37+
th:placeholder="#{user.loginForm.email.placeholder}"/>
38+
</div>
39+
</div>
40+
</div>
41+
<div class="form-row">
42+
<div class="col-md-12 mb-12">
43+
<div class="form-group">
44+
<label for="j_password" th:text="#{user.loginForm.password.label}">Password</label>
45+
<input id="j_password" type="password" class="form-control form-control-lg"
46+
name="j_password"
47+
th:placeholder="#{user.loginForm.password.placeholder}"/>
48+
</div>
49+
</div>
50+
</div>
51+
</div>
52+
<div class="card-footer">
53+
<div class="row">
54+
<div class="col">
55+
<button id="loginButton" type="submit" class="btn btn-block btn-primary">
56+
<i class="fas fa-sign-in-alt"></i>
57+
<span th:utext="#{user.loginForm.loginButton}"></span>
58+
</button>
59+
</div>
60+
<div class="col">
61+
<a id="passwordResetButton" th:href="@{/user/resetPassword}" role="button"
62+
class="btn btn-block btn-secondary">
63+
<i class="fas fa-question-circle"></i>
64+
<span th:utext="#{user.loginForm.passwordReset}">Password forgotten?</span>
65+
</a>
66+
</div>
67+
<div class="col">
68+
<a id="registerButton" th:href="@{/user/register/}" role="button"
69+
class="btn btn-block btn-secondary">
70+
<i class="fas fa-user"></i>
71+
<span th:utext="#{user.loginForm.register}">register as new user</span>
72+
</a>
73+
</div>
74+
</div>
75+
</div>
76+
</div>
77+
</form>
78+
<div id="user-login-form-more-information">
79+
<div>
80+
<span th:text="#{user.loginForm.moreInformation}">For More Information please visit:</span>
81+
<ul>
82+
<li><span th:utext="#{user.loginForm.github}">Github:</span> <a
83+
href="https://github.com/Spring-Framework-Java-Apps/simpleworklist/" target="_blank">https://github.com/Spring-Framework-Java-Apps/simpleworklist/</a>
84+
</li>
85+
<li><span th:utext="#{user.loginForm.myBlog}">My Blog:</span> <a href="http://thomas-woehlke.blogspot.de/"
86+
target="_blank">http://thomas-woehlke.blogspot.de/</a>
87+
</li>
88+
<li><span th:utext="#{user.loginForm.projectPage}">The Project Page:</span> <a
89+
href="http://woehlke.org/p/simpleworklist/" target="_blank">http://woehlke.org/p/simpleworklist/</a></li>
90+
<li>Getting Things Done&reg; @ Wikipedia:
91+
<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>
92+
<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>
93+
</li>
94+
</ul>
95+
</div>
96+
<div>
97+
<small>
9398
<span th:utext="#{user.loginForm.gtd.copyright}">GTD&reg; and Getting Things Done&reg; are registered trademarks of the David Allen Company. SimpleWorklist is
9499
not affiliated with or endorsed by the David Allen Company.</span>
95-
</small>
96-
</div>
97-
</div>
98-
</div>
100+
</small>
101+
</div>
102+
</div>
103+
</div>
99104

100105
</body>
101106
</html>

0 commit comments

Comments
 (0)