Merge branch 'main' of gitlab.com:PhilippHofer/rot

This commit is contained in:
Philipp 2023-06-08 15:38:54 +02:00
commit 17581df6f1

View File

@ -43,9 +43,9 @@
<strong class="text-primary-900"> <strong class="text-primary-900">
{{ planned_event.planned_starting_time }} Uhr {{ planned_event.planned_starting_time }} Uhr
</strong> </strong>
<small class="text-gray-600">({{ planned_event.name }} - <small class="text-gray-600">({{ planned_event.name }}
{% if planned_event.trip_type %} {% if planned_event.trip_type %}
{{ planned_event.trip_type.icon | safe }}{{ planned_event.trip_type.name }} - {{ planned_event.trip_type.icon | safe }}{{ planned_event.trip_type.name }}
{% endif %}) {% endif %})
</small><br /> </small><br />
@ -165,16 +165,16 @@
<div class="mr-1"> <div class="mr-1">
{% if trip.max_people == 0 %} {% if trip.max_people == 0 %}
<strong class="text-[#f43f5e]">&#9888; {{ trip.planned_starting_time }} Uhr</strong> <strong class="text-[#f43f5e]">&#9888; {{ trip.planned_starting_time }} Uhr</strong>
<small class="text-[#f43f5e]">(Absage {{ trip.cox_name }} - <small class="text-[#f43f5e]">(Absage {{ trip.cox_name }}
{% if trip.trip_type %} {% if trip.trip_type %}
{{ trip.trip_type.icon | safe }}{{ trip.trip_type.name }} - {{ trip.trip_type.icon | safe }}{{ trip.trip_type.name }}
{% endif %}) {% endif %})
</small> </small>
{% else %} {% else %}
<strong class="text-primary-900">{{ trip.planned_starting_time }} Uhr</strong> <strong class="text-primary-900">{{ trip.planned_starting_time }} Uhr</strong>
<small class="text-gray-600">({{ trip.cox_name }} - <small class="text-gray-600">({{ trip.cox_name }}
{% if trip.trip_type %} {% if trip.trip_type %}
{{ trip.trip_type.icon | safe }}{{ trip.trip_type.name }} - {{ trip.trip_type.icon | safe }}{{ trip.trip_type.name }}
{% endif %}) {% endif %})
</small> </small>
{% endif %} {% endif %}