Onkel-Werner-Freizeiten/CampOrganizer2
1
1
Fork 0
Code Issues 8 Pull Requests Packages Projects Releases Wiki Activity

https://gitlab.com/jottyfan/camporganizer2/-/issues/33

Browse Source
This commit is contained in:
Jottyfan 2022-12-23 20:52:27 +01:00
parent a3fb7fcacc
commit 5ae31684a5
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -18,7 +18,7 @@ apply plugin: 'war'
apply plugin: 'application' apply plugin: 'application'
group = 'de.jottyfan.camporganizer' group = 'de.jottyfan.camporganizer'
version = '0.2.2' version = '0.2.3'
sourceCompatibility = 17 sourceCompatibility = 17
mainClassName = "de.jottyfan.camporganizer.Main" mainClassName = "de.jottyfan.camporganizer.Main"

19
src/main/resources/templates/dashboard.html
View File

@ -7,8 +7,19 @@
<body> <body>
<th:block layout:fragment="header"> <th:block layout:fragment="header">
<ul class="navbar-nav mb-2 mb-lg-0"> <ul class="navbar-nav mb-2 mb-lg-0">
<li class="nav-item"><a th:href="@{${keycloakProfileUrl}}" class="btn btn-secondary btn-icon-silent" target="_blank"><img th:src="@{/images/Icon_Profil.svg}" width="24px" <li class="nav-item">
height="24px" /></a></li> <div class="dropdown">
<button class="btn btn-hoverborder navbar-collapse" type="button" data-bs-toggle="dropdown" aria-expanded="false">
<img th:src="@{/images/Icon_Profil.svg}" width="24px" height="24px" />
</button>
<ul class="dropdown-menu">
<li><a class="dropdown-item" th:href="@{${keycloakProfileUrl}}" target="_blank">Benutzername ändern</a></li>
<li><a class="dropdown-item" th:href="@{${keycloakProfileUrl} + '/password'}" target="_blank">Password ändern</a></li>
<li><hr /></li>
<li><a class="dropdown-item" th:href="@{/logout}"><b th:inline="text">[[${currentUser}]]</b> ausloggen</a></li>
</ul>
</div>
</li>
</ul> </ul>
<ul class="navbar-nav mb-2 mb-lg-0" sec:authorize="hasRole('business')"> <ul class="navbar-nav mb-2 mb-lg-0" sec:authorize="hasRole('business')">
<li class="nav-item"><a th:href="@{/business}" class="btn btn-secondary btn-icon-silent">Abrechnung</a></li> <li class="nav-item"><a th:href="@{/business}" class="btn btn-secondary btn-icon-silent">Abrechnung</a></li>
@ -47,8 +58,8 @@
</div> </div>
<br /> <br />
<div> <div>
<span style="margin: 24px"><img th:src="@{/images/Icon_Datum.svg}" width="24px" height="24px" /></span> <span class="menufont" th:text="${#temporals.format(c.arrive, 'dd.MM.')} + ' - ' + ${#temporals.format(c.depart, 'dd.MM.yyyy')}" <span style="margin: 24px"><img th:src="@{/images/Icon_Datum.svg}" width="24px" height="24px" /></span> <span class="menufont"
th:if="${c.arrive != null && c.depart != null}"></span> th:text="${#temporals.format(c.arrive, 'dd.MM.')} + ' - ' + ${#temporals.format(c.depart, 'dd.MM.yyyy')}" th:if="${c.arrive != null && c.depart != null}"></span>
</div> </div>
<br /> <br />
<div> <div>