Merge pull request 'format frontend code' (#725) from format into main

Reviewed-on: #725

templates/includes/macros.html.tera

@@ -24,14 +24,14 @@ function setChoiceByLabel(choicesInstance, label) {
                 {% for planned_trip in planned_trips | sort(attribute='planned_starting_time') %}
                     <div class="pt-2 px-3 {% if not loop.first %}border-t{% endif %} text-primary-900 dark:text-white flex justify-between items-center">
                         <strong class="block">
-                {% set amount_members = planned_trip.rower | length + 1 %}
+                            {% set amount_members = planned_trip.rower | length + 1 %}
                             {{ planned_trip.cox_name }} ({{ amount_members }}&nbsp;Person{{ amount_members | pluralize(singular="", plural="en") }})
                             <small class="block">{{ planned_trip.planned_starting_time }}</small>
-                            
-                        </strong><button class="btn btn-primary ml-3"
-					    onclick="choiceObjects['newrower'].removeActiveItems(-2);choiceObjects['newrower'].setChoiceByValue('{{ planned_trip.cox_id }}'); {% for rower in planned_trip.rower %}setChoiceByLabel(choiceObjects['newrower'], '{{ rower.name }}');{% endfor %}window.scrollTo(0,0); ">
-                                👥
-                            </button>
+                        </strong>
+                        <button class="btn btn-primary ml-3"
+                                onclick="choiceObjects['newrower'].removeActiveItems(-2);choiceObjects['newrower'].setChoiceByValue('{{ planned_trip.cox_id }}'); {% for rower in planned_trip.rower %}setChoiceByLabel(choiceObjects['newrower'], '{{ rower.name }}');{% endfor %}window.scrollTo(0,0); ">
+                            👥
+                        </button>
                     </div>
                 {% endfor %}
             </div>

templates/planned.html.tera

@@ -100,7 +100,9 @@
                                          style="order: {{ event.planned_starting_time | replace(from=":", to="") }}">
                                         <div class="flex justify-between items-center">
                                             <div class="mr-1">
-					    {% if event.always_show and not day.regular_sees_this_day %}<span title="Du siehst diese Ausfahrt schon, obwohl sie mehr als {{ amount_days_to_show_trips_ahead }} Tage in der Zukunft liegt. Du Magier!">🔮</span>{% endif -%}
+                                                {% if event.always_show and not day.regular_sees_this_day %}
+                                                    <span title="Du siehst diese Ausfahrt schon, obwohl sie mehr als {{ amount_days_to_show_trips_ahead }} Tage in der Zukunft liegt. Du Magier!">🔮</span>
+                                                {% endif -%}
                                                 {%- if event.max_people == 0 %}
                                                     <strong class="text-[#f43f5e]">&#9888; Absage
                                                         {{ event.planned_starting_time }}
@@ -275,7 +277,9 @@
                                      data-coxneeded="false">
                                     <div class="flex justify-between items-center">
                                         <div class="mr-1">
-					    {% if trip.always_show and not day.regular_sees_this_day %}<span title="Du siehst diese Ausfahrt schon, obwohl sie mehr als {{ amount_days_to_show_trips_ahead }} Tage in der Zukunft liegt. Du Magier!">🔮</span>{% endif -%}
+                                            {% if trip.always_show and not day.regular_sees_this_day %}
+                                                <span title="Du siehst diese Ausfahrt schon, obwohl sie mehr als {{ amount_days_to_show_trips_ahead }} Tage in der Zukunft liegt. Du Magier!">🔮</span>
+                                            {% endif -%}
                                             {% if trip.max_people == 0 %}
                                                 <strong class="text-[#f43f5e]">&#9888;
                                                     {{ trip.planned_starting_time }}
@@ -384,20 +388,20 @@
                                         {% if allowed_to_update_always_show_trip %}
                                             <div class="bg-gray-100 dark:bg-primary-900 p-3 mt-4 rounded-md">
                                                 <h3 class="text-primary-950 dark:text-white font-bold uppercase tracking-wide mb-2">Admin-Modus</h3>
-						{% if not day.regular_sees_this_day %}
-                                                <form action="/cox/trip/{{ trip.id }}/toggle-always-show"
-                                                      method="get"
-                                                      class="grid gap-3">
-                                                    {% if not trip.always_show %}
-                                                        <small>Diese Ausfahrt sehen aktuell nur Steuerleute (und Admins). {{ amount_days_to_show_trips_ahead }} Tage vorher sehen sie dann alle.</small>
-                                                    {% else %}
-                                                        <small>Diese Ausfahrt sehen alle Mitglieder.</small>
-                                                    {% endif %}
-                                                    <input value="{% if trip.always_show %}Ausfahrt nur Steuerleute (und Admins) anzeigen{% else %}Ausfahrt allen anzeigen{% endif %}"
-                                                           class="btn btn-primary"
-                                                           type="submit" />
-                                                </form>
-						{% endif %}
+                                                {% if not day.regular_sees_this_day %}
+                                                    <form action="/cox/trip/{{ trip.id }}/toggle-always-show"
+                                                          method="get"
+                                                          class="grid gap-3">
+                                                        {% if not trip.always_show %}
+                                                            <small>Diese Ausfahrt sehen aktuell nur Steuerleute (und Admins). {{ amount_days_to_show_trips_ahead }} Tage vorher sehen sie dann alle.</small>
+                                                        {% else %}
+                                                            <small>Diese Ausfahrt sehen alle Mitglieder.</small>
+                                                        {% endif %}
+                                                        <input value="{% if trip.always_show %}Ausfahrt nur Steuerleute (und Admins) anzeigen{% else %}Ausfahrt allen anzeigen{% endif %}"
+                                                               class="btn btn-primary"
+                                                               type="submit" />
+                                                    </form>
+                                                {% endif %}
                                                 <a href="/cox/remove/trip/{{ trip.id }}"
                                                    class="inline-block btn btn-alert mt-5 w-full">
                                                     {% include "includes/delete-icon" %}