merge
This commit is contained in:
commit
f4d0a88575
@ -14,13 +14,22 @@
|
|||||||
{{ macros::header(loggedin_user=loggedin_user) }}
|
{{ macros::header(loggedin_user=loggedin_user) }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if show_kiosk_header %}
|
{% if show_kiosk_header %}
|
||||||
<a href="/log">Ausfahrt eintragen</a>
|
<header class="bg-primary-900 text-white flex justify-between px-4 py-3 w-full z-10 ">
|
||||||
<a href="/log/show">Logbuch</a>
|
<div>
|
||||||
<a href="/stat">Statistik</a>
|
<a href="/">
|
||||||
<a href="/boatdamage">Bootsschaden</a>
|
Hü
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<a href="/log" class="px-2">Ausfahrt eintragen</a>
|
||||||
|
<a href="/log/show" class="px-2">Logbuch</a>
|
||||||
|
<a href="/stat" class="px-2">Statistik</a>
|
||||||
|
<a href="/boatdamage" class="px-2">Bootsschaden</a>
|
||||||
|
</div>
|
||||||
|
</header>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
<div class="flex min-h-screen {%if not loggedin_user %} items-center {% else %} items-start {% endif %} justify-center px-4 py-12 sm:px-6 lg:px-8"> {% block content %}{% endblock content %}
|
<div class="flex min-h-screen {%if not loggedin_user and not show_kiosk_header %} items-center {% else %} items-start {% endif %} justify-center px-4 py-12 sm:px-6 lg:px-8"> {% block content %}{% endblock content %}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{% if loggedin_user %}
|
{% if loggedin_user %}
|
||||||
|
@ -162,17 +162,17 @@
|
|||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<div id="log{{ log.id }}">
|
<div id="log{{ log.id }}">
|
||||||
{% if log.destination %}
|
{% if log.destination %}
|
||||||
{{ log.destination }}
|
{{ log.destination }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% for user in users %}
|
{% for user in users %}
|
||||||
{% if user.id == log.shipmaster %}
|
{% if user.id == log.shipmaster %}
|
||||||
<p>
|
<p>
|
||||||
<strong>{{ user.name }}</strong>
|
<strong>{{ user.name }}</strong>
|
||||||
</p>
|
</p>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|
||||||
{% for rower in log.rowers %}
|
{% for rower in log.rowers %}
|
||||||
<p>{{ rower.name }}</p>
|
<p>{{ rower.name }}</p>
|
||||||
@ -184,9 +184,9 @@
|
|||||||
Gäste (ohne Account): {{ amount_guests }}
|
Gäste (ohne Account): {{ amount_guests }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% if allowed_to_close and state == "on_water" %}
|
{% if allowed_to_close and state == "on_water" %}
|
||||||
<a href="/log/{{ log.id }}/delete" onclick="return confirm('Willst du diesen Eintrag wirklich löschen? Die Daten gehen verloren :O');">LÖSCHEN</a>
|
<a href="/log/{{ log.id }}/delete" class="btn btn-alert w-full absolute bottom-0 left-0" style="border-radius: 0;" onclick="return confirm('Willst du diesen Eintrag wirklich löschen? Die Daten gehen verloren');">Löschen</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
Reference in New Issue
Block a user