Skip to content

Commit 055b797

Browse files
thomaswoehlkethomaswoehlke
committed
work
1 parent a069c3e commit 055b797

File tree

3 files changed

+45
-40
lines changed

3 files changed

+45
-40
lines changed

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

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,18 @@
2727
<div style="background-color: rgba(255, 255, 255, 0.3)">
2828
<div th:replace="layout/navbartop :: navbartop(contexts=${contexts},locale=${locale},thisProject=${thisProject},numberOfNewIncomingMessages=${numberOfNewIncomingMessages},ctx=${ctx})">
2929
</div>
30-
<div class="jumbotron pt-3" id="tw-title-section" >
30+
<div class="jumbotron pt-3" id="tw-title-section">
3131
<div class="container">
3232
<th:block th:replace="${twtitle}" />
3333
</div>
3434
</div>
35-
<!-- Breadcrumb -->
36-
<div th:replace="layout/breadcrumb :: breadcrumb(breadcrumb=${breadcrumb})">
37-
</div>
38-
<!-- taskstates -->
39-
<div th:replace="layout/taskstates :: navigation-taskstates(rootProjects=${rootProjects},thisProject=${thisProject})" class="link-dark">
35+
<div th:if="${taskstateType != null}">
36+
<!-- Breadcrumb -->
37+
<div th:replace="layout/breadcrumb :: breadcrumb(breadcrumb=${breadcrumb})" th:if="${taskstateType == ''}">
38+
</div>
39+
<!-- taskstates -->
40+
<div th:replace="layout/taskstates :: navigation-taskstates(rootProjects=${rootProjects},thisProject=${thisProject})" class="link-dark">
41+
</div>
4042
</div>
4143
</div>
4244
</header>
@@ -51,15 +53,18 @@
5153
</div>
5254
</div>
5355
<div class="container" sec:authorize="isAuthenticated()">
54-
<div class="row">
55-
<div class="col-md-8">
56+
<div class="row" th:if="${taskstateType != null}">
57+
<div class="col-8">
5658
<th:block th:replace="${twcontent}" />
5759
</div>
58-
<div class="col-md-4">
59-
<div th:replace="layout/projects :: navigation-projects(rootProjects=${rootProjects},thisProject=${thisProject})">
60-
</div>
60+
<div class="col-4">
61+
<div th:replace="layout/projects :: navigation-projects(rootProjects=${rootProjects},thisProject=${thisProject})"></div>
6162
</div>
62-
</div>
63+
</div>
64+
<div class="row" th:if="${taskstateType == null}">
65+
<div class="col">
66+
<th:block th:replace="${twcontent}" />
67+
</div>
6368
</div>
6469
</section>
6570

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

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -6,33 +6,33 @@
66

77
<section th:fragment="navigation-projects(rootProjects,thisProject)">
88
<div class="border-top shadow-lg" id="projectNavigationWell" sec:authorize="isAuthenticated()">
9-
<div class="row col" id="tw-project-submenu-col">
10-
<nav>
11-
<ul id="rootProject" style="list-style: none;">
12-
<li id="tw-project-submenu-root">
13-
<span id="project_0"
14-
ondrop="drop2project(event)" ondragover="allowDrop2Project(event)">
15-
<a th:href="@{/project/root}"
16-
th:if="${thisProject != null or taskstateType != null}"
17-
class="m-2 btn btn-outline-dark btn-sm" id="project_0_a">
18-
<i class="fas fa-folder-open" id="project_0_a_i"></i>
19-
<span th:text="#{right.nav.projects}" id="project_0_a_span">Projects</span>
20-
</a>
21-
<a th:if="${thisProject == null and taskstateType == null}"
22-
th:href="@{/project/root}" class="m-2 btn btn-dark btn-sm" id="project_0_aa">
23-
<i class="fas fa-folder-open" id="project_0_aa_i"></i>
24-
<span th:text="#{right.nav.projects}" id="project_0_aa_span">Projects</span>
25-
</a>
26-
</span>
27-
<span th:if="${rootProjects != null and rootProjects.size() gt 0}">
28-
<ul
29-
th:include="this :: tw-project-submenu(projectList=${rootProjects},thisProject=${thisProject})"
30-
style="list-style: none;">
31-
</ul>
32-
</span>
33-
</li>
34-
</ul>
35-
</nav>
9+
<div class="row col" id="tw-project-submenu-col">
10+
<nav>
11+
<ul id="rootProject" style="list-style: none;">
12+
<li id="tw-project-submenu-root">
13+
<span id="project_0"
14+
ondrop="drop2project(event)" ondragover="allowDrop2Project(event)">
15+
<a th:href="@{/project/root}"
16+
th:if="${thisProject != null or taskstateType != null}"
17+
class="m-2 btn btn-outline-dark btn-sm" id="project_0_a">
18+
<i class="fas fa-folder-open" id="project_0_a_i"></i>
19+
<span th:text="#{right.nav.projects}" id="project_0_a_span">Projects</span>
20+
</a>
21+
<a th:if="${thisProject == null and taskstateType == null}"
22+
th:href="@{/project/root}" class="m-2 btn btn-dark btn-sm" id="project_0_aa">
23+
<i class="fas fa-folder-open" id="project_0_aa_i"></i>
24+
<span th:text="#{right.nav.projects}" id="project_0_aa_span">Projects</span>
25+
</a>
26+
</span>
27+
<span th:if="${rootProjects != null and rootProjects.size() gt 0}">
28+
<ul
29+
th:include="this :: tw-project-submenu(projectList=${rootProjects},thisProject=${thisProject})"
30+
style="list-style: none;">
31+
</ul>
32+
</span>
33+
</li>
34+
</ul>
35+
</nav>
3636
</div>
3737
</div>
3838
</section>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
</a>
135135
</li>
136136
</ul>
137-
</div>
137+
</div>
138138
</section>
139139

140140
</html>

0 commit comments

Comments
 (0)