Merge pull request 'staging' (#373) from staging into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m7s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m32s

Reviewed-on: #373
This commit is contained in:
philipp 2024-04-15 11:26:20 +02:00
commit 13808d0103
2 changed files with 56 additions and 52 deletions

View File

@ -218,6 +218,7 @@
{% if log.comments %}<span class="text-sm italic">- "{{ log.comments }}"</span>{% endif %} {% if log.comments %}<span class="text-sm italic">- "{{ log.comments }}"</span>{% endif %}
</div> </div>
{% if amount_guests > 0 or log.rowers | length > 0 %} {% if amount_guests > 0 or log.rowers | length > 0 %}
{% if not log.boat.amount_seats == 1 %}
<div class="text-sm text-gray-600 dark:text-gray-100"> <div class="text-sm text-gray-600 dark:text-gray-100">
Ruderer: Ruderer:
{% for rower in log.rowers -%} {% for rower in log.rowers -%}
@ -232,6 +233,7 @@
</div> </div>
{% endif %} {% endif %}
{% endif %} {% endif %}
{% endif %}
</div> </div>
</div> </div>
{% endmacro show_old %} {% endmacro show_old %}

View File

@ -70,7 +70,8 @@
class="block w-100 py-2 hover:text-primary-600 border-t">Boote</a> class="block w-100 py-2 hover:text-primary-600 border-t">Boote</a>
{% endif %} {% endif %}
<a href="/auth/logout" <a href="/auth/logout"
class="block w-100 py-2 hover:text-primary-600 border-t">Ausloggen<svg class="inline h-4" class="block w-100 py-2 hover:text-primary-600 border-t">Ausloggen
<svg class="inline h-4"
width="24" width="24"
height="24" height="24"
viewbox="0 0 24 24" viewbox="0 0 24 24"
@ -83,7 +84,8 @@
<path d="M9 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h4"></path> <path d="M9 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h4"></path>
<polyline points="16 17 21 12 16 7"></polyline> <polyline points="16 17 21 12 16 7"></polyline>
<line x1="21" y1="12" x2="9" y2="12"></line> <line x1="21" y1="12" x2="9" y2="12"></line>
</svg></a> </svg>
</a>
</div> </div>
</div> </div>
</div> </div>