philipp/hacky-ruadat
1
0
Fork 0
forked from Ruderverein-Donau-Linz/rowt
Code Issues Pull Requests Actions Activity

Merge branch 'main' into show-waterlevel

Browse Source
This commit is contained in:
philipp
2024-05-16 14:45:31 +02:00
parent e4ef1f1584 ebb4fe84bb
commit 3d45310c73
24 changed files with 314 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/admin/user/index.html.tera
View File

@ -58,6 +58,10 @@
<a class="block mt-1 font-normal text-primary-600 dark:text-primary-200 hover:text-primary-900 dark:hover:text-primary-300 underline"
href="/admin/user/{{ user.id }}/reset-pw">Passwort zurücksetzen</a>
{% endif %}
{% if not user.last_access and "admin" in loggedin_user.roles %}
<a class="block mt-1 font-normal text-primary-600 dark:text-primary-200 hover:text-primary-900 dark:hover:text-primary-300 underline"
href="/admin/user/{{ user.id }}/send-welcome-mail">Willkommensmail verschicken</a>
{% endif %}
</div>
<div class="grid sm:grid-cols-2 lg:grid-cols-4 gap-3">
{% for role in roles %}

2
templates/includes/forms/log.html.tera
View File

@ -152,7 +152,7 @@
{% endfor %}
{% set amount_rowers = log.rowers | length %}
{% set amount_guests = log.boat.amount_seats - amount_rowers %}
{% if amount_guests > 0 %}
{% if amount_guests > 0 and not log.boat.external %}
Gäste
<small class="text-gray-600">(ohne Account)</small>:
{{ amount_guests }}

2
templates/includes/macros.html.tera
View File

@ -191,7 +191,7 @@
{% if rower.is_real_guest %}
<small class="text-gray-600 dark:text-gray-100">(Gast)</small>
{% if allow_removing %}
<a href="/planned/remove/{{ trip_details_id }}/{{ rower.name }}"
<a href="/planned/remove/{{ trip_details_id }}/{{ rower.name | urlencode }}"
class="absolute r-0 bg-red-500 w-5 h-5 text-white rounded-full flex items-center justify-center transform rotate-45 top-0 right-0">
<svg class="inline h-5 w-5"
width="16"