Skip to content

Commit 5baa74b

Browse files
thomaswoehlkethomaswoehlke
committed
work in progress
1 parent 96b8458 commit 5baa74b

File tree

3 files changed

+84
-84
lines changed

3 files changed

+84
-84
lines changed

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

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
<!DOCTYPE html>
2+
<html xmlns="http://www.w3.org/1999/xhtml"
3+
xmlns:th="http://www.thymeleaf.org"
4+
xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
5+
xmlns:sd="http://www.thymeleaf.org/spring-data">
6+
7+
<div th:fragment="tw-project-form(project,contexts)">
8+
<input type="hidden" th:field="*{id}" />
9+
<input type="hidden" th:field="*{uuid}" />
10+
<input type="hidden" th:field="*{rowCreatedAt.time}" />
11+
<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
12+
<div class="form-row">
13+
<div class="col-md-12 mb-12">
14+
<div class="form-group">
15+
<label th:for="${#ids.next('name')}" class="control-label">Name</label>
16+
<input type="text" th:field="*{name}" class="form-control form-control-lg" />
17+
<div th:each="err : ${#fields.errors('name')}">
18+
<div class="invalid-feedback" th:text="${err}" >err</div>
19+
</div>
20+
</div>
21+
</div>
22+
</div>
23+
<div class="form-row">
24+
<div class="col-md-12 mb-12">
25+
<div class="form-group">
26+
<label th:for="textEditor" class="control-label">
27+
<span th:utext="#{project.add.description}">Description</span>
28+
</label>
29+
<textarea id="textEditor" name="textEditor" rows="10" cols="50"
30+
class="form-control form-control-lg"
31+
th:field="*{description}" >
32+
</textarea>
33+
<div th:each="err : ${#fields.errors('description')}">
34+
<div class="invalid-feedback" th:text="${err}" >err</div>
35+
</div>
36+
</div>
37+
</div>
38+
</div>
39+
<div class="form-row">
40+
<div class="col-md-12 mb-12">
41+
<div class="form-group">
42+
<label th:for="${#ids.next('context.id')}" class="control-label">
43+
<span th:utext="#{project.edit.context}">context</span>
44+
</label>
45+
<select th:field="*{context.id}" class="form-control form-control-lg">
46+
<option th:each="contextOption : ${contexts}"
47+
th:value="${contextOption.id}"
48+
th:text="${locale == 'de' ? contextOption.nameDe : contextOption.nameEn}">
49+
contextOption
50+
</option>
51+
</select>
52+
<div th:each="err : ${#fields.errors('context.id')}">
53+
<div class="invalid-feedback" th:text="${err}" >err</div>
54+
</div>
55+
</div>
56+
</div>
57+
</div>
58+
</div>
59+
60+
</html>

‎src/main/resources/templates/project/id/project/add.html‎

Lines changed: 12 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -18,48 +18,18 @@ <h1>
1818
</div>
1919

2020
<div th:fragment="mytwcontent">
21-
<div>
22-
<form id="formId" th:action="@{/project/{id}/project/add(id=${thisProject.id})}" th:object="${project}" method="post">
23-
<div class="form-group form-control-lg">
24-
<label th:for="${#ids.next('name')}" class="control-label">Name</label>
25-
<input type="text" th:field="*{name}" class="form-control" />
26-
<div>
27-
<div th:each="err : ${#fields.errors('name')}" th:text="${err}" class="alert alert-danger"></div>
28-
</div>
29-
</div>
30-
<div class="form-group form-control-lg">
31-
<label th:for="textEditor" class="control-label">
32-
<span th:utext="#{project.add.description}">Description</span>
33-
</label>
34-
<textarea id="textEditor" name="textEditor" rows="10" cols="50" th:field="*{description}" class="form-control"></textarea>
35-
<div>
36-
<div th:each="err : ${#fields.errors('description')}" th:text="${err}" class="alert alert-danger"></div>
37-
</div>
38-
</div>
39-
<div class="form-group form-control-lg">
40-
<label th:for="${#ids.next('context.id')}" class="control-label">
41-
<span th:utext="#{project.edit.context}">Area</span>
42-
</label>
43-
<select th:field="*{context.id}">
44-
<option th:each="areaOption : ${contexts}"
45-
th:value="${areaOption.id}"
46-
th:text="${locale == 'de' ? areaOption.nameDe : areaOption.nameEn}">Wireframe</option>
47-
</select>
48-
<div>
49-
<div th:each="err : ${#fields.errors('context.id')}" th:text="${err}" class="alert alert-danger"></div>
50-
</div>
51-
</div>
52-
<button id="createNewProject" type="submit" class="btn btn-primary">
53-
<i class="fas fa-save"></i>
54-
<span th:utext="#{project.add.button}">Add Project</span>
55-
</button>
56-
<input type="hidden"
57-
name="${_csrf.parameterName}"
58-
value="${_csrf.token}"/>
59-
</form>
60-
</div>
61-
<!-- Document Window End -->
62-
21+
<form id="formId" class="was-validated" method="post"
22+
th:action="@{/project/{id}/project/add(id=${thisProject.id})}" th:object="${project}">
23+
<div th:replace="layout/project :: tw-project-form(project=${project},contexts=${contexts})"></div>
24+
<div class="form-row">
25+
<div class="col-md-12 mb-12">
26+
<button id="createNewProject" type="submit" class="btn btn-block btn-primary">
27+
<i class="fas fa-save"></i>
28+
<span th:utext="#{project.add.button}">Add Project</span>
29+
</button>
30+
</div>
31+
</div>
32+
</form>
6333
</div>
6434

6535
<script th:src="@{/webjars/ckeditor/4.14.0/full/ckeditor.js}"></script>

‎src/main/resources/templates/project/root/project/add.html‎

Lines changed: 12 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -18,48 +18,18 @@ <h1>
1818
</div>
1919

2020
<div th:fragment="mytwcontent">
21-
<div>
22-
<form id="formId" th:action="@{/project/root/project/add}" th:object="${project}" method="post">
23-
<div class="form-group form-control-lg">
24-
<label th:for="${#ids.next('name')}" class="control-label">Name</label>
25-
<input type="text" th:field="*{name}" class="form-control" />
26-
<div>
27-
<div th:each="err : ${#fields.errors('name')}" th:text="${err}" class="alert alert-danger"></div>
28-
</div>
29-
</div>
30-
<div class="form-group form-control-lg">
31-
<label th:for="textEditor" class="control-label">
32-
<span th:utext="#{project.add.description}">Description</span>
33-
</label>
34-
<textarea id="textEditor" name="textEditor" rows="10" cols="50" th:field="*{description}" class="form-control"></textarea>
35-
<div>
36-
<div th:each="err : ${#fields.errors('description')}" th:text="${err}" class="alert alert-danger"></div>
37-
</div>
38-
</div>
39-
<div class="form-group form-control-lg">
40-
<label th:for="${#ids.next('context.id')}" class="control-label">
41-
<span th:utext="#{project.edit.context}">Area</span>
42-
</label>
43-
<select th:field="*{context.id}">
44-
<option th:each="areaOption : ${contexts}"
45-
th:value="${areaOption.id}"
46-
th:text="${locale == 'de' ? areaOption.nameDe : areaOption.nameEn}">Wireframe</option>
47-
</select>
48-
<div>
49-
<div th:each="err : ${#fields.errors('context.id')}" th:text="${err}" class="alert alert-danger"></div>
50-
</div>
51-
</div>
52-
<button id="createNewProject" type="submit" class="btn btn-primary">
53-
<i class="fas fa-save"></i>
54-
<span th:utext="#{project.add.button}">Add Project</span>
55-
</button>
56-
<input type="hidden"
57-
name="${_csrf.parameterName}"
58-
value="${_csrf.token}"/>
59-
</form>
60-
</div>
61-
<!-- Document Window End -->
62-
21+
<form id="formId" class="was-validated" method="post"
22+
th:action="@{/project/root/project/add}" th:object="${project}">
23+
<div th:replace="layout/project :: tw-project-form(project=${project},contexts=${contexts})"></div>
24+
<div class="form-row">
25+
<div class="col-md-12 mb-12">
26+
<button id="createNewProject" type="submit" class="btn btn-block btn-primary">
27+
<i class="fas fa-save"></i>
28+
<span th:utext="#{project.add.button}">Add Project</span>
29+
</button>
30+
</div>
31+
</div>
32+
</form>
6333
</div>
6434

6535
<script th:src="@{/webjars/ckeditor/4.14.0/full/ckeditor.js}"></script>

0 commit comments

Comments
 (0)