staging #337

Merged
philipp merged 3 commits from staging into main 2024-04-03 08:07:54 +02:00
3 changed files with 26 additions and 26 deletions
Showing only changes of commit 4e1de0c886 - Show all commits

View File

@ -1,5 +1,4 @@
{% macro boatreservation() %} {% macro boatreservation() %}
{% if reservations %}
<div class="bg-white dark:bg-primary-900 rounded-md shadow pb-2 mt-3"> <div class="bg-white dark:bg-primary-900 rounded-md shadow pb-2 mt-3">
<h2 class="h2">Reservierungen ({{ reservations | length }})</h2> <h2 class="h2">Reservierungen ({{ reservations | length }})</h2>
<div class="grid grid-cols-1 gap-3 mb-3 w-full"> <div class="grid grid-cols-1 gap-3 mb-3 w-full">
@ -19,10 +18,11 @@
</span> </span>
<span class="text-sm italic">{{ reservation.usage }}</span> <span class="text-sm italic">{{ reservation.usage }}</span>
</div> </div>
{% else %}
<p class="p-3 text-center text-black dark:text-white">Keine Reservierung</p>
{% endfor %} {% endfor %}
</div> </div>
</div> </div>
{% endif %}
{% endmacro boatreservation %} {% endmacro boatreservation %}
{% macro header(loggedin_user) %} {% macro header(loggedin_user) %}
<header class="bg-primary-900 text-white flex justify-center p-3 fixed w-full z-10"> <header class="bg-primary-900 text-white flex justify-center p-3 fixed w-full z-10">

View File

@ -16,12 +16,12 @@
<div>{{ log::show_boats(only_ones=false) }}</div> <div>{{ log::show_boats(only_ones=false) }}</div>
</div> </div>
</div> </div>
<div class="md:col-span-3 bg-white dark:bg-primary-900 rounded-md shadow"> <div class="lg:col-span-3 bg-white dark:bg-primary-900 rounded-md shadow">
<h2 class="h2">Neue Ausfahrt</h2> <h2 class="h2">Neue Ausfahrt</h2>
<div class="p-3">{{ log::new(only_ones=false, shipmaster=-1) }}</div> <div class="p-3">{{ log::new(only_ones=false, shipmaster=-1) }}</div>
</div> </div>
<div> <div>
<div class="bg-white dark:bg-primary-900 rounded-md shadow"> <div class="bg-white dark:bg-primary-900 rounded-md shadow pb-2">
<h2 class="h2">Am Wasser</h2> <h2 class="h2">Am Wasser</h2>
<div> <div>
{% if on_water | length > 0 %} {% if on_water | length > 0 %}

View File

@ -11,7 +11,7 @@
<div>{{ log::show_boats(only_ones=false) }}</div> <div>{{ log::show_boats(only_ones=false) }}</div>
</div> </div>
</div> </div>
<div class="md:col-span-3 bg-white dark:bg-primary-900 rounded-md shadow"> <div class="lg:col-span-3 bg-white dark:bg-primary-900 rounded-md shadow">
<h2 class="h2">Neue Ausfahrt</h2> <h2 class="h2">Neue Ausfahrt</h2>
<div class="p-3">{{ log::new(shipmaster=loggedin_user.id) }}</div> <div class="p-3">{{ log::new(shipmaster=loggedin_user.id) }}</div>
</div> </div>