Skip to content

Commit 9d130ba

Browse files
thomaswoehlkethomaswoehlke
committed
* fixed #311 User Selfservice is broken
* Issue #312 User2UserMessage Chat is broken * Issue #313 Change Password - update HTML Layout to current Bootstrap Version * Issue #314 Set Default Language - update HTML Layout to current Bootstrap Version * Issue #315 Add Context - update HTML Layout to current Bootstrap Version * Issue #316 Add Context - add Back Button * Issue #317 switch Context is broken * Issue #318 Broken: http://localhost:8080/taskstate/task/1153/changeorderto/1051
1 parent 020e329 commit 9d130ba

File tree

4 files changed

+38
-42
lines changed

4 files changed

+38
-42
lines changed

‎src/main/resources/templates/user/selfservice/context/add.html‎

Lines changed: 18 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -25,38 +25,33 @@ <h1>
2525
<div th:fragment="mytwcontent">
2626
<div>
2727
<form id="formId" th:action="@{/user/selfservice/context/add}" th:object="${newContext}" method="post">
28-
<td>
29-
<div class="form-group form-control-lg">
30-
<label th:for="${#ids.next('nameEn')}" class="control-label">
31-
<span th:utext="#{enum.language.en}">Englisch</span>
32-
</label>
33-
<input type="text" th:field="*{nameEn}" class="form-control" />
34-
<div>
35-
<div th:each="err : ${#fields.errors('nameEn')}" th:text="${err}" class="alert alert-danger" />
36-
</div>
28+
<div class="form-group">
29+
<label th:for="${#ids.next('nameEn')}" class="control-label">
30+
<span th:utext="#{enum.language.en}">Englisch</span>
31+
</label>
32+
<input type="text" th:field="*{nameEn}" class="form-control form-control-lg" />
33+
<div>
34+
<div th:each="err : ${#fields.errors('nameEn')}" th:text="${err}" class="alert alert-danger" />
3735
</div>
38-
</td>
39-
<td>
40-
<div class="form-group form-control-lg">
41-
<label th:for="${#ids.next('nameDe')}" class="control-label">
42-
<span th:utext="#{enum.language.de}">Deutsch</span>
43-
</label>
44-
<input type="text" th:field="*{nameDe}" class="form-control" />
45-
<div>
46-
<div th:each="err : ${#fields.errors('nameDe')}" th:text="${err}" class="alert alert-danger" />
47-
</div>
36+
</div>
37+
<div class="form-group">
38+
<label th:for="${#ids.next('nameDe')}" class="control-label">
39+
<span th:utext="#{enum.language.de}">Deutsch</span>
40+
</label>
41+
<input type="text" th:field="*{nameDe}" class="form-control form-control-lg" />
42+
<div>
43+
<div th:each="err : ${#fields.errors('nameDe')}" th:text="${err}" class="alert alert-danger" />
4844
</div>
49-
</td>
50-
<td>
45+
</div>
46+
<div class="form-group">
5147
<a th:href="@{/user/selfservice/profile}" class="btn btn-secondary" role="button">
5248
<span th:utext="#{button.back}">back</span>
5349
</a>
5450
<button id="createNewProject" type="submit" class="btn btn-primary">
5551
<i class="fas fa-save"></i>
5652
<span th:utext="#{user.selfservice.contexts.add.button}">Add Area</span>
5753
</button>
58-
</td>
59-
<td>&nbsp;</td>
54+
</div>
6055
</form>
6156
</div>
6257
</div>

‎src/main/resources/templates/user/selfservice/context/all.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@ <h1>
7676
th:text="${locale == 'de' ? context.nameDe : context.nameEn}">Wireframe</option>
7777
</select>
7878
<div>
79-
<div th:each="err : ${#fields.errors('defaultContext.id')}" th:text="${err}" class="alert alert-danger" />
79+
<div th:each="err : ${#fields.errors('defaultContext.id')}"
80+
th:text="${err}" class="alert alert-danger" />
8081
</div>
8182
</div>
8283
<input type="hidden" th:field="*{id}" />

‎src/main/resources/templates/user/selfservice/context/edit.html‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,39 +24,37 @@ <h1>
2424

2525
<div th:fragment="mytwcontent">
2626
<div>
27-
<form id="formId" th:action="@{/user/selfservice/context/edit/{id}(id=${contextId})}" th:object="${editContext}" method="post">
28-
<td>
29-
<div class="form-group">
27+
<form id="formId" th:action="@{/user/selfservice/context/edit/{id}(id=${contextId})}"
28+
th:object="${editContext}" method="post">
29+
<div class="form-group">
3030
<label th:for="${#ids.next('nameEn')}" class="control-label">
3131
<span th:utext="#{enum.language.en}">Englisch</span>
3232
</label>
3333
<input type="text" th:field="*{nameEn}" class="form-control form-control-lg" />
3434
<div>
35-
<div th:each="err : ${#fields.errors('nameEn')}" th:text="${err}" class="alert alert-danger" />
35+
<div th:each="err : ${#fields.errors('nameEn')}"
36+
th:text="${err}" class="alert alert-danger" />
3637
</div>
3738
</div>
38-
</td>
39-
<td>
4039
<div class="form-group">
4140
<label th:for="${#ids.next('nameDe')}" class="control-label">
4241
<span th:utext="#{enum.language.de}">Deutsch</span>
4342
</label>
4443
<input type="text" th:field="*{nameDe}" class="form-control form-control-lg" />
4544
<div>
46-
<div th:each="err : ${#fields.errors('nameDe')}" th:text="${err}" class="alert alert-danger" />
45+
<div th:each="err : ${#fields.errors('nameDe')}"
46+
th:text="${err}" class="alert alert-danger" />
4747
</div>
4848
</div>
49-
</td>
50-
<td>
51-
<a th:href="@{/user/selfservice/profile}" class="btn btn-secondary" role="button">
52-
<span th:utext="#{button.back}">back</span>
53-
</a>
54-
<button id="editContextButton" type="submit" class="btn btn-primary">
55-
<i class="fas fa-save"></i>
56-
<span th:utext="#{user.selfservice.contexts.edit.button}">Edit Area</span>
57-
</button>
58-
</td>
59-
<td>&nbsp;</td>
49+
<div class="form-group">
50+
<a th:href="@{/user/selfservice/profile}" class="btn btn-secondary" role="button">
51+
<span th:utext="#{button.back}">back</span>
52+
</a>
53+
<button id="editContextButton" type="submit" class="btn btn-primary">
54+
<i class="fas fa-save"></i>
55+
<span th:utext="#{user.selfservice.contexts.edit.button}">Edit Area</span>
56+
</button>
57+
</div>
6058
</form>
6159
</div>
6260
</div>

‎src/main/resources/templates/user/selfservice/language.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,15 @@ <h1>
3838
</div>
3939
</div>
4040
</div>
41+
<div class="form-group">
4142
<a th:href="@{/user/selfservice/profile}" class="btn btn-secondary" role="button">
4243
<span th:utext="#{button.back}">back</span>
4344
</a>
4445
<button id="saveLanguageButton" type="submit" class="btn btn-primary">
4546
<i class="fas fa-save"></i>
4647
<span th:utext="#{user.selfservice.language.button}">Save Language</span>
4748
</button>
49+
</div>
4850
</form>
4951
</div>
5052

0 commit comments

Comments
 (0)