Skip to content

Commit a679a52

Browse files
thomaswoehlkethomaswoehlke
authored
Merge pull request #280 from Spring-Framework-Java-Apps/master
Deployment
2 parents 9979d23 + f5022d0 commit a679a52

File tree

5 files changed

+88
-49
lines changed

5 files changed

+88
-49
lines changed

‎etc/TODO.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,4 +122,6 @@ Caused by: org.postgresql.util.PSQLException: ERROR: relation "spring_session" d
122122
* fixed #272 prepare Release 2.3.23
123123
* fixed #265 make release with maven plugin
124124

125-
125+
## 2.3.24
126+
* issue #277 heroku: Compiled slug size: 617.9M is too large (max is 500M)
127+
* fixed #279 Formular Layout Errors

‎src/main/bash/stop_services.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
2+
sudo systemctl stop mysql
3+
sudo systemctl stop apache2
4+
sudo systemctl stop docker
5+
sudo systemctl stop docker-registry
6+
sudo systemctl stop virtualbox
7+
sudo systemctl stop openvpn
8+
sudo systemctl stop crtmpserver
9+

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

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -49,28 +49,30 @@ <h2><span th:utext="#{user.loginForm.h2}">Your Todo-List for Getting Things Done
4949
</div>
5050
</div>
5151
</div>
52-
<div class="card-footer form-row">
53-
<div class="col-md-4 mb-4">
54-
<button id="loginButton" type="submit" class="btn btn-block btn-primary">
55-
<i class="fas fa-sign-in-alt"></i>
56-
<span th:utext="#{user.loginForm.loginButton}"></span>
57-
</button>
58-
</div>
59-
<div class="col-md-4 mb-4">
60-
<a id="passwordResetButton" th:href="@{/user/resetPassword}" role="button"
61-
class="btn btn-block btn-secondary">
62-
<i class="fas fa-question-circle"></i>
63-
<span th:utext="#{user.loginForm.passwordReset}">Password forgotten?</span>
64-
</a>
65-
</div>
66-
<div class="col-md-4 mb-4">
67-
<a id="registerButton" th:href="@{/user/register}" role="button"
68-
class="btn btn-block btn-secondary">
69-
<i class="fas fa-user"></i>
70-
<span th:utext="#{user.loginForm.register}">register as new user</span>
71-
</a>
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>
7274
</div>
73-
</div>
75+
</div>
7476
</div>
7577
</form>
7678
<div id="user-login-form-more-information">

‎src/main/resources/templates/user/register/registerForm.html

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,34 @@ <h1>
1616
</div>
1717

1818
<div th:fragment="mytwcontent">
19-
<div class="card card-body">
20-
<form id="formId" th:action="@{/user/register}" th:object="${userRegistrationForm}" method="post">
21-
<div class="form-group form-control-lg">
22-
<label th:for="${#ids.next('email')}" class="control-label">Email</label>
23-
<input type="email" th:field="*{email}" class="form-control" />
24-
<div>
25-
<div th:each="err : ${#fields.errors('email')}" th:text="${err}" class="alert alert-danger" >
26-
</div>
27-
</div>
28-
</div>
29-
<button id="registerButton" type="submit" class="btn btn-primary">
30-
<span th:utext="#{user.registerForm.button}">Register</span>
31-
</button>
32-
</form>
33-
</div>
19+
<form id="formId" th:action="@{/user/register}" th:object="${userRegistrationForm}" method="post">
20+
<div class="card">
21+
<div class="card-header">
22+
<span th:utext="#{user.loginForm.register}">register as new user</span>
23+
</div>
24+
<div class="card-body">
25+
<div class="form-row">
26+
<div class="col-md-12 mb-12">
27+
<div class="form-group">
28+
<label th:for="${#ids.next('email')}" class="control-label">Email</label>
29+
<input type="email" th:field="*{email}" class="form-control form-control-lg" />
30+
<div>
31+
<div th:each="err : ${#fields.errors('email')}" th:text="${err}" class="alert alert-danger" >
32+
</div>
33+
</div>
34+
</div>
35+
</div>
36+
</div>
37+
</div>
38+
<div class="card-footer">
39+
<div class="form-row">
40+
<button id="registerButton" type="submit" class="btn btn-primary">
41+
<span th:utext="#{user.registerForm.button}">Register</span>
42+
</button>
43+
</div>
44+
</div>
45+
</div>
46+
</form>
3447
</div>
3548

3649

‎src/main/resources/templates/user/resetPassword/resetPasswordForm.html

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,34 @@ <h1>
1616
</div>
1717

1818
<div th:fragment="mytwcontent">
19-
<div class="card card-body">
20-
<form id="formId" th:action="@{/user/resetPassword}" th:object="${userRegistrationForm}" method="post">
21-
<div class="form-group form-control-lg">
22-
<label th:for="${#ids.next('email')}" class="control-label">Email</label>
23-
<input type="email" th:field="*{email}" class="form-control" />
24-
<div>
25-
<div th:each="err : ${#fields.errors('email')}" th:text="${err}" class="alert alert-danger" >
19+
<form id="formId" th:action="@{/user/resetPassword}" th:object="${userRegistrationForm}" method="post">
20+
<div class="card">
21+
<div class="card-header">
22+
<span th:utext="#{user.resetPasswordForm.h1}">Password Reset</span>
23+
</div>
24+
<div class="card-body">
25+
<div class="form-row">
26+
<div class="col-md-12 mb-12">
27+
<div class="form-group">
28+
<label th:for="${#ids.next('email')}" class="control-label">Email</label>
29+
<input type="email" th:field="*{email}" class="form-control form-control-lg" />
30+
<div>
31+
<div th:each="err : ${#fields.errors('email')}" th:text="${err}" class="alert alert-danger" >
32+
</div>
33+
</div>
34+
</div>
2635
</div>
2736
</div>
2837
</div>
29-
<button id="requestPasswordReset" type="submit" class="btn btn-primary">
30-
<span th:utext="#{user.resetPasswordForm.button}">Request Password Reset</span>
31-
</button>
32-
</form>
33-
</div>
38+
<div class="card-footer">
39+
<div class="form-row">
40+
<button id="requestPasswordReset" type="submit" class="btn btn-primary">
41+
<span th:utext="#{user.resetPasswordForm.button}">Request Password Reset</span>
42+
</button>
43+
</div>
44+
</div>
45+
</div>
46+
</form>
3447
</div>
3548

3649

0 commit comments

Comments
 (0)