Skip to content

Commit 674088e

Browse files
thomaswoehlkethomaswoehlke
committed
work in progress
1 parent aa34833 commit 674088e

File tree

6 files changed

+48
-36
lines changed

6 files changed

+48
-36
lines changed

‎src/main/resources/templates/layout/taskedit.html‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</div>
2525
</div>
2626
<div class="form-row">
27-
<div class="col-md-12 mb-12">
27+
<div class="col-md-6 mb-6">
2828
<div class="form-group">
2929
<label th:for="${#ids.next('listTaskState')}" class="control-label">
3030
<span th:utext="#{tasks.col.taskState}">taskState</span>
@@ -41,9 +41,7 @@
4141
</div>
4242
</div>
4343
</div>
44-
</div>
45-
<div class="form-row">
46-
<div class="col-md-12 mb-12">
44+
<div class="col-md-6 mb-6">
4745
<div class="form-group">
4846
<label for="taskDueDate" class="control-label">
4947
<span th:utext="#{task.show.dueDate}">dueDate</span>
@@ -73,7 +71,7 @@
7371
</div>
7472
</div>
7573
<div class="form-row">
76-
<div class="col-md-6 mb-6">
74+
<div class="col-md-4 mb-4">
7775
<div class="form-group">
7876
<label th:for="${#ids.next('taskEnergy')}" class="control-label">
7977
<span th:utext="#{task.show.taskEnergy}">taskEnergy</span>
@@ -90,7 +88,7 @@
9088
</div>
9189
</div>
9290
</div>
93-
<div class="col-md-6 mb-6">
91+
<div class="col-md-4 mb-4">
9492
<div class="form-group">
9593
<label th:for="${#ids.next('taskTime')}" class="control-label">
9694
<span th:utext="#{task.show.taskTime}">Time</span>
@@ -107,9 +105,7 @@
107105
</div>
108106
</div>&nbsp;
109107
</div>
110-
</div>
111-
<div class="form-row">
112-
<div class="col-md-12 mb-12">
108+
<div class="col-md-4 mb-4">
113109
<div class="form-group">
114110
<label th:for="${#ids.next('context.id')}" class="control-label">
115111
<span th:utext="#{task.show.context}">Context</span>

‎src/main/resources/templates/project/id/task/edit.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ <h1>
2424
<div th:replace="layout/taskedit :: tw-task-edit-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
2525
<div class="form-row">
2626
<div class="col-md-6 mb-6">
27-
<button id="editTaskSubmit" type="submit" class="btn btn-primary">
27+
<button id="editTaskSubmit" type="submit" class="btn btn-primary btn-block">
2828
<i class="fas fa-save"></i>
2929
<span th:utext="#{task.show.button}">Save Task</span>
3030
</button>
3131
</div>
3232
<div class="col-md-6 mb-6">
33-
<a class="btn btn-secondary" role="button"
33+
<a class="btn btn-secondary btn-block" role="button"
3434
th:href="@{/project/{projectId}/task/{id}/transform(id=${task.id},projectId=${thisProject.id})}">
3535
<i class="fas fa-project-diagram"></i>
3636
<span th:utext="#{task.show.transform}">Transform into Project</span>

‎src/main/resources/templates/project/root/task/edit.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ <h1 class="tw-title">
2424
<div th:replace="layout/taskedit :: tw-task-edit-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
2525
<div class="form-row">
2626
<div class="col-md-6 mb-6">
27-
<button id="editTaskSubmit" type="submit" class="btn btn-primary">
27+
<button id="editTaskSubmit" type="submit" class="btn btn-primary btn-block">
2828
<i class="fas fa-save"></i>
2929
<span th:utext="#{task.show.button}">Save Task</span>
3030
</button>
3131
</div>
3232
<div class="col-md-6 mb-6">
33-
<a th:href="@{/task/{id}/transform(id=${task.id})}" class="btn btn-secondary" role="button">
33+
<a th:href="@{/task/{id}/transform(id=${task.id})}" class="btn btn-secondary btn-block" role="button">
3434
<i class="fas fa-project-diagram"></i>
3535
<span th:utext="#{task.show.transform}">Transform into Project</span>
3636
</a>

‎src/main/resources/templates/taskstate/task/edit.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ <h1>
2424
<div th:replace="layout/taskedit :: tw-task-edit-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
2525
<div class="form-row">
2626
<div class="col-md-6 mb-6">
27-
<button id="editTaskSubmit" type="submit" class="btn btn-primary">
27+
<button id="editTaskSubmit" type="submit" class="btn btn-primary btn-block">
2828
<i class="fas fa-save"></i>
2929
<span th:utext="#{task.show.button}">Save Task</span>
3030
</button>
3131
</div>
3232
<div class="col-md-6 mb-6">
33-
<a th:href="@{/taskstate/task/{id}/transform(id=${task.id})}" class="btn btn-secondary" role="button">
33+
<a th:href="@{/taskstate/task/{id}/transform(id=${task.id})}" class="btn btn-secondary btn-block" role="button">
3434
<i class="fas fa-project-diagram"></i>
3535
<span th:utext="#{task.show.transform}">Transform into Project</span>
3636
</a>

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

Lines changed: 36 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,28 +24,44 @@ <h2><span th:utext="#{user.loginForm.h2}">Your Todo-List for Getting Things Done
2424
</a>.
2525
</div>
2626
<div class="card-body">
27-
<div class="alert alert-danger" role="alert" th:if="${param.login_error != null}">
27+
<div class="invalid-feedback" role="alert" th:if="${param.login_error != null}">
2828
<span th:text="#{user.loginForm.loginError}">Your login attempt was not successful, try again.</span>
2929
</div>
30-
<input type="hidden"
31-
name="${_csrf.parameterName}"
32-
value="${_csrf.token}"/>
33-
<div class="form-group form-control-lg">
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 form-control-lg">
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="@{/user/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>
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 class="form-row">
52+
<div class="col-md-6 mb-6">
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-md-6 mb-6">
59+
<a th:href="@{/user/resetPassword}" class="btn btn-block btn-secondary" role="button">
60+
<i class="fas fa-question-circle"></i>
61+
<span th:utext="#{user.loginForm.passwordReset}">Password forgotten?</span>
62+
</a>
63+
</div>
64+
</div>
4965
</div>
5066
</div>
5167
</form>

‎src/main/resources/templates/user/messages/all.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ <h1>
4646
th:field="*{messageText}" class="form-control" />
4747
<div>
4848
<div th:each="err : ${#fields.errors('messageText')}"
49-
th:text="${err}" class="alert alert-danger" />
49+
th:text="${err}" class="invalid-feedback" />
5050
</div>
5151
</div>
5252
<div class="form-group form-control-lg">

0 commit comments

Comments
 (0)