Skip to content

Commit cd66aa3

Browse files
thomaswoehlkethomaswoehlke
committed
work
1 parent c72a88b commit cd66aa3

File tree

3 files changed

+20
-35
lines changed

3 files changed

+20
-35
lines changed

‎src/main/resources/messages_de.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ user.loginForm.github=Quellcode bei Github\:
77
user.loginForm.gtd.copyright=GTD® und Getting Things Done® sind eingetragene Warenzeichen der David Allen Company. SimpleWorklist ist nicht verbunden mit oder empfohlen von der David Allen Company.
88
user.loginForm.h1=Willkommen bei SimpleWorklist
99
user.loginForm.h2=Ihre Todo-Liste für Getting Things Done®
10-
user.loginForm.login=Bitte melden Sie sich hier an oder
10+
user.loginForm.login=Bitte melden Sie sich hier an
1111
user.loginForm.loginButton=Anmelden
1212
user.loginForm.loginError=Ihre Anmeldung war nicht erfolgreich, bitte versuchen Sie es noch einmal.
1313
user.loginForm.loginError.caused=Ursache\:

‎src/main/resources/messages_en.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ user.loginForm.github=Sourcecode at Github\:
77
user.loginForm.gtd.copyright=GTD® and Getting Things Done® are registered trademarks of the David Allen Company. SimpleWorklist is not affiliated with or endorsed by the David Allen Company.
88
user.loginForm.h1 = Welcome to SimpleWorklist
99
user.loginForm.h2=Your Todo-List for Getting Things Done®
10-
user.loginForm.login=Please login or
10+
user.loginForm.login=Log in to your account
1111
user.loginForm.loginButton=Sign in
1212
user.loginForm.loginError=Your login attempt was not successful, try again.
1313
user.loginForm.loginError.caused=Caused\:
@@ -19,7 +19,7 @@ user.loginForm.projectPage=The Project Page:
1919
user.loginForm.register=sign up
2020
user.registerNotConfirmed.h1=Register as new User
2121
user.registerForm.button=Register
22-
user.registerForm.h1=Register as new User
22+
user.registerForm.h1=Sign Up
2323
user.registerSentMail.h1=Register as new User
2424
user.registerSentMail.text=Verification needed. Sent an email to the given address. Please check your Inbox.
2525
user.resetPasswordConfirmed.button=Save New Password

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

Lines changed: 17 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -18,57 +18,42 @@ <h2><span th:utext="#{user.loginForm.h2}">Your Todo-List for Getting Things Done
1818
<form id="user-login-form" th:action="@{/j_spring_security_check}" method="post">
1919
<div class="card">
2020
<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>.
21+
<span th:utext="#{user.loginForm.login}" class="m-1 p-1">Please login</span>
2522
</div>
2623
<div class="card-body">
2724
<div class="invalid-feedback" role="alert" th:if="${param.login_error != null}">
2825
<span th:text="#{user.loginForm.loginError}">Your login attempt was not successful, try again.</span>
2926
</div>
3027
<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>
28+
<div class="m-2">
29+
<label for="j_username" th:text="#{user.loginForm.email.label}" class="form-label">Email</label>
30+
<input id="j_username" type="email" class="form-control" name="j_username"
31+
th:placeholder="#{user.loginForm.email.placeholder}"/>
4032
</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"
33+
<div class="m-2">
34+
<label for="j_password" th:text="#{user.loginForm.password.label}" class="form-label">Password</label>
35+
<input id="j_password" type="password" class="form-control" name="j_password"
4736
th:placeholder="#{user.loginForm.password.placeholder}"/>
48-
</div>
49-
</div>
5037
</div>
5138
</div>
5239
<div class="card-footer">
5340
<div class="row">
54-
<div class="col">
41+
<div class="col m-2 p-1">
5542
<button id="loginButton" type="submit" class="btn btn-block btn-primary">
5643
<i class="fas fa-sign-in-alt"></i>
5744
<span th:utext="#{user.loginForm.loginButton}"></span>
5845
</button>
5946
</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>
47+
<div class="col align-middle m-2 p-1">
48+
<i class="fas fa-user"></i>
49+
<a id="registerButton" th:href="@{/user/register/}" class="align-middle">
50+
<span th:utext="#{user.loginForm.register}" class="align-middle">register as new user</span>
6551
</a>
6652
</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>
53+
<div class="col align-middle m-2 p-1">
54+
<i class="fas fa-question-circle"></i>
55+
<a id="passwordResetButton" th:href="@{/user/resetPassword}" class="align-middle">
56+
<span th:utext="#{user.loginForm.passwordReset}" class="align-middle">Password forgotten?</span>
7257
</a>
7358
</div>
7459
</div>

0 commit comments

Comments
 (0)