Skip to content

Commit 70acedd

Browse files
thomaswoehlkethomaswoehlke
committed
work
1 parent 4e6e159 commit 70acedd

File tree

3 files changed

+60
-44
lines changed

3 files changed

+60
-44
lines changed

‎src/main/resources/messages_en.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ user.loginForm.gtd.copyright=GTD® and Getting Things Done® are registere
88
user.loginForm.h1 = Welcome to SimpleWorklist
99
user.loginForm.h2=Your Todo-List for Getting Things Done®
1010
user.loginForm.login=Log in to your account
11-
user.loginForm.loginButton=Sign in
11+
user.loginForm.loginButton=Log 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\:

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ header {
2525
border-radius: 0 !important;
2626
}
2727

28+
#user-login-form {
29+
30+
}
31+
2832
div#tw-content-title-actionbuttons {
2933
/* margin-top: 1rem; */
3034
}

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

Lines changed: 55 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -10,56 +10,68 @@
1010
<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
1111

1212
<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>
13+
<div class="row my-5 py-5">
14+
<div class="col-3"></div>
15+
<div class="col-6">
16+
<h1><span th:utext="#{user.loginForm.h1}">Welcome to SimpleWorklist</span></h1>
17+
<h2><span th:utext="#{user.loginForm.h2}">Your Todo-List for Getting Things Done&reg;</span></h2>
18+
</div>
19+
<div class="col-3"></div>
20+
</div>
1521
</div>
1622

1723
<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}" class="m-1 p-1">Please login</span>
22-
</div>
23-
<div class="card-body">
24-
<div class="invalid-feedback" role="alert" th:if="${param.login_error != null}">
25-
<span th:text="#{user.loginForm.loginError}">Your login attempt was not successful, try again.</span>
26-
</div>
27-
<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
28-
<label for="j_username" th:text="#{user.loginForm.email.label}" class="form-label">Email</label>
29-
<div class="m-2 pe-3 input-group">
30-
<span class="input-group-text"><i class="fa-solid fa-user"></i></span>
31-
<input id="j_username" type="email" class="form-control" name="j_username"
32-
th:placeholder="#{user.loginForm.email.placeholder}"/>
33-
</div>
34-
<label for="j_password" th:text="#{user.loginForm.password.label}" class="form-label">Password</label>
35-
<div class="m-2 pe-3 input-group">
36-
<span class="input-group-text"><i class="fa-solid fa-lock"></i></span>
37-
<input id="j_password" type="password" class="form-control" name="j_password"
38-
th:placeholder="#{user.loginForm.password.placeholder}"/>
39-
</div>
40-
</div>
41-
<div class="card-footer">
42-
<div class="row">
43-
<div class="col m-2 p-1 ps-3">
44-
<button id="loginButton" type="submit" class="btn btn-block btn-primary">
45-
<i class="fas fa-sign-in-alt"></i>
46-
<span th:utext="#{user.loginForm.loginButton}"></span>
47-
</button>
24+
<div class="row">
25+
<div class="col-3"></div>
26+
<div class="col-6">
27+
<form id="user-login-form" th:action="@{/j_spring_security_check}" method="post">
28+
<div class="card my-5">
29+
<div class="card-header">
30+
<span th:utext="#{user.loginForm.login}" class="m-1 p-1">Please login</span>
4831
</div>
49-
<div class="col align-middle m-2 p-1">
50-
<a id="registerButton" th:href="@{/user/register/}" class="btn btn-outline-secondary btn-block">
51-
<i class="fas fa-user"></i><span th:utext="#{user.loginForm.register}"></span>
52-
</a>
32+
<div class="card-body">
33+
<div class="invalid-feedback" role="alert" th:if="${param.login_error != null}">
34+
<span th:text="#{user.loginForm.loginError}">Your login attempt was not successful, try again.</span>
35+
</div>
36+
<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
37+
<label for="j_username" th:text="#{user.loginForm.email.label}" class="form-label">Email</label>
38+
<div class="m-2 pe-3 input-group">
39+
<span class="input-group-text"><i class="fa-solid fa-user"></i></span>
40+
<input id="j_username" type="email" class="form-control" name="j_username"
41+
th:placeholder="#{user.loginForm.email.placeholder}"/>
42+
</div>
43+
<label for="j_password" th:text="#{user.loginForm.password.label}" class="form-label">Password</label>
44+
<div class="m-2 pe-3 input-group">
45+
<span class="input-group-text"><i class="fa-solid fa-lock"></i></span>
46+
<input id="j_password" type="password" class="form-control" name="j_password"
47+
th:placeholder="#{user.loginForm.password.placeholder}"/>
48+
</div>
5349
</div>
54-
<div class="col align-middle m-2 p-1">
55-
<a id="passwordResetButton" th:href="@{/user/resetPassword}" class="btn btn-outline-secondary btn-block">
56-
<i class="fas fa-question-circle"></i><span th:utext="#{user.loginForm.passwordReset}"></span>
57-
</a>
50+
<div class="card-footer">
51+
<div class="row">
52+
<div class="col text-left m-2 p-1 ps-3">
53+
<button id="loginButton" type="submit" class="btn btn-block btn-primary">
54+
<i class="fas fa-sign-in-alt"></i>
55+
<span th:utext="#{user.loginForm.loginButton}"></span>
56+
</button>
57+
</div>
58+
<div class="col text-center m-2 p-1">
59+
<a id="registerButton" th:href="@{/user/register/}" class="btn btn-outline-secondary btn-block">
60+
<i class="fas fa-user"></i><span th:utext="#{user.loginForm.register}"></span>
61+
</a>
62+
</div>
63+
<div class="col text-right m-2 p-1">
64+
<a id="passwordResetButton" th:href="@{/user/resetPassword}" class="btn btn-outline-secondary btn-block">
65+
<i class="fas fa-question-circle"></i><span th:utext="#{user.loginForm.passwordReset}"></span>
66+
</a>
67+
</div>
68+
</div>
5869
</div>
5970
</div>
60-
</div>
61-
</div>
62-
</form>
71+
</form>
72+
</div>
73+
<div class="col-3"></div>
74+
</div>
6375
</div>
6476

6577
</body>

0 commit comments

Comments
 (0)