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

finetuning in layout

Browse Source
This commit is contained in:
Jottyfan 2024-02-23 11:50:33 +01:00
parent 8f69320505
commit 72952b9c7b
3 changed files with 31 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -8,7 +8,7 @@ plugins {
} }
group = 'de.jottyfan.camporganizer' group = 'de.jottyfan.camporganizer'
version = '0.6.9' version = '0.7.0'
description = """CampOrganizer2""" description = """CampOrganizer2"""

4
src/main/resources/templates/camplist.html
View File

@ -7,10 +7,6 @@
<body> <body>
<th:block layout:fragment="content"> <th:block layout:fragment="content">
<div class="mainpage"> <div class="mainpage">
<div class="alert alert-warning alert-dismissible fade show block660" role="alert">
<span>alte Zugangsdaten ins neue System </span><a th:href="@{/migration/login}">umziehen</a>
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Schließen"></button>
</div>
<div th:replace="~{/fragments/camplist.html::camplist(camps=${camps})}"></div> <div th:replace="~{/fragments/camplist.html::camplist(camps=${camps})}"></div>
</div> </div>
</th:block> </th:block>

61
src/main/resources/templates/fragments/camplist.html
View File

@ -12,40 +12,37 @@
</h2> </h2>
<div th:id="'collapse' + ${c.pk}" class="accordion-collapse collapse" th:aria-labelledby="'heading' + ${c.pk}" data-bs-parent="#accordionExample"> <div th:id="'collapse' + ${c.pk}" class="accordion-collapse collapse" th:aria-labelledby="'heading' + ${c.pk}" data-bs-parent="#accordionExample">
<div class="accordion-body"> <div class="accordion-body">
<table style="width: 100%"> <div class="container">
<tr> <div class="row g-5">
<td rowspan="5"><img th:src="@{/images/Icon_Stern.svg}" width="36px" height="36px" style="margin-left: 24px" /></td> <div class="col-2 d-flex align-items-center">
<td rowspan="5"> <img th:src="@{/images/Icon_Stern.svg}" width="36px" height="36px" />
<div> </div>
<div class="col-4 d-flex align-items-center">
Biblische Geschichten<br /> Nachtwanderung<br /> Gruppenspiele<br /> Ausflüge<br /> Überraschungen Biblische Geschichten<br /> Nachtwanderung<br /> Gruppenspiele<br /> Ausflüge<br /> Überraschungen
</div> </div>
</td> <div class="col-6">
<td><span class="cabin">Ort</span></td> <div class="container">
<td><a th:href="${c.url}" th:text="${c.locationName}" target="_blank"></a></td> <div class="row g-3">
</tr> <div class="col-4 cabin">Ort</div>
<tr> <div class="col-8">
<td><img th:src="@{/images/Icon_Alter.svg}" width="36px" height="36px" style="margin-top: 24px" /></td> <a th:href="${c.url}" th:text="${c.locationName}" target="_blank"></a>
<td><div th:text="${c.minAge} + ' - ' + ${c.maxAge} + ' Jahre'" style="margin-top: 24px"></div></td> </div>
</tr> <div class="col-4"><img th:src="@{/images/Icon_Alter.svg}" width="36px" height="36px" /></div>
<tr> <div class="col-8" th:text="${c.minAge} + ' - ' + ${c.maxAge} + ' Jahre'"></div>
<td><img th:src="@{/images/Icon_Datum.svg}" width="36px" height="36px" style="margin-top: 24px" /></td> <div class="col-4"><img th:src="@{/images/Icon_Datum.svg}" width="36px" height="36px" /></div>
<td><div th:text="${#temporals.format(c.arrive, 'dd.MM.')} + ' - ' + ${#temporals.format(c.depart, 'dd.MM.yyyy')}" th:if="${c.arrive != null&& c.depart != null}" <div class="col-8"><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>
style="margin-top: 24px"></div></td> <div class="col-4"><img th:src="@{/images/Icon_Preis.svg}" width="36px" height="36px" /></div>
</tr> <div class="col-8"><p th:text="${c.price}"></p></div>
<tr> </div>
<td><img th:src="@{/images/Icon_Preis.svg}" width="36px" height="36px" style="margin-top: 24px" /></td> </div>
<td><div style="margin-top: 24px"> </div>
<p th:text="${c.price}"></p> </div>
</div></td> <div class="row g-5" th:if="${c.bedsFemale + c.bedsMale > 0}">
</tr> <div class="col-2"><img th:src="@{/images/Icon_Bett.svg}" width="48px" height="48px" /></div>
<tr th:if="${c.bedsFemale + c.bedsMale > 0}"> <div class="col-10 d-flex align-items-center" th:text="${'es sind nur noch ' + (c.bedsFemale - c.blockedBedsFemale - c.usedBedsFemale) + ' Mädchen- und ' + (c.bedsMale - c.blockedBedsMale - c.usedBedsMale) + ' Jungs- von ' + (c.bedsFemale + c.bedsMale) + ' Betten frei'}"></div>
<td><img th:src="@{/images/Icon_Bett.svg}" width="36px" height="36px" style="margin-top: 24px" /></td> </div>
<td><div style="margin-top: 24px"> </div>
<p style="width: 200px" th:utext="${'es sind nur noch <br />' + (c.bedsFemale - c.blockedBedsFemale - c.usedBedsFemale) + ' Mädchen- und ' + (c.bedsMale - c.blockedBedsMale - c.usedBedsMale) + ' Jungs-<br />von ' + (c.bedsFemale + c.bedsMale) + ' Betten frei'}"></p> <div style="text-align: center; margin-top: 48px">
</div></td>
</tr>
</table>
<div style="text-align: center; margin-top: 64px">
<a class="btn btn-linda buttonfont" th:href="@{/registration/{id}(id=${c.pk})}">jetzt anmelden</a> <a class="btn btn-linda buttonfont" th:href="@{/registration/{id}(id=${c.pk})}">jetzt anmelden</a>
</div> </div>
</div> </div>