forked from Ruderverein-Donau-Linz/rowt
		
	merge
This commit is contained in:
		@@ -14,13 +14,22 @@
 | 
			
		||||
			{{ macros::header(loggedin_user=loggedin_user) }}
 | 
			
		||||
		{% endif %}
 | 
			
		||||
		{% if show_kiosk_header %}
 | 
			
		||||
			<a href="/log">Ausfahrt eintragen</a>
 | 
			
		||||
			<a href="/log/show">Logbuch</a>
 | 
			
		||||
			<a href="/stat">Statistik</a>
 | 
			
		||||
			<a href="/boatdamage">Bootsschaden</a>
 | 
			
		||||
      <header class="bg-primary-900 text-white flex justify-between px-4 py-3 w-full z-10 ">
 | 
			
		||||
        <div>
 | 
			
		||||
          <a href="/">
 | 
			
		||||
            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 %}
 | 
			
		||||
 | 
			
		||||
			<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>
 | 
			
		||||
 | 
			
		||||
				{% if loggedin_user %}
 | 
			
		||||
 
 | 
			
		||||
@@ -162,17 +162,17 @@
 | 
			
		||||
						</div>
 | 
			
		||||
					{% endif %}
 | 
			
		||||
					<div id="log{{ log.id }}">
 | 
			
		||||
						{% if log.destination %}
 | 
			
		||||
							{{ log.destination }}
 | 
			
		||||
						{% endif %}
 | 
			
		||||
             {% if log.destination %}
 | 
			
		||||
                {{ log.destination }}
 | 
			
		||||
              {% endif %}
 | 
			
		||||
 | 
			
		||||
						{% for user in users %}
 | 
			
		||||
							{% if user.id == log.shipmaster %}
 | 
			
		||||
								<p>
 | 
			
		||||
									<strong>{{ user.name }}</strong>
 | 
			
		||||
								</p>
 | 
			
		||||
							{% endif %}
 | 
			
		||||
						{% endfor %}
 | 
			
		||||
              {% for user in users %}
 | 
			
		||||
                {% if user.id == log.shipmaster %}
 | 
			
		||||
                  <p>
 | 
			
		||||
                    <strong>{{ user.name }}</strong>
 | 
			
		||||
                  </p>
 | 
			
		||||
                {% endif %}
 | 
			
		||||
              {% endfor %}
 | 
			
		||||
 | 
			
		||||
						{% for rower in log.rowers %}
 | 
			
		||||
							<p>{{ rower.name }}</p>
 | 
			
		||||
@@ -184,9 +184,9 @@
 | 
			
		||||
							Gäste (ohne Account): {{ amount_guests }}
 | 
			
		||||
						{% endif %}
 | 
			
		||||
 | 
			
		||||
						{% 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>
 | 
			
		||||
						{% endif %}
 | 
			
		||||
              {% if allowed_to_close and state == "on_water" %}
 | 
			
		||||
                <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 %}
 | 
			
		||||
					</div>
 | 
			
		||||
				</div>
 | 
			
		||||
			</div>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user