From 558e45fe5f380e9ccd1ac1d7a0c127e93a7d5479 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= Date: Fri, 13 Nov 2026 11:51:46 +0100 Subject: [PATCH] feat: restyle admin views in corporate design --- templates/admin/accommodation/_form.html.twig | 28 +++++------ templates/admin/accommodation/index.html.twig | 2 +- .../accommodation/modal_create.html.twig | 2 +- .../_period_row.html.twig | 4 +- .../_price_breakdown.html.twig | 14 +++--- .../_price_period.html.twig | 2 +- .../accommodation_booking/edit.html.twig | 26 +++++----- .../accommodation_booking/index.html.twig | 2 +- .../modal_change_accommodation.html.twig | 4 +- .../modal_create.html.twig | 2 +- .../modal_period.html.twig | 12 ++--- .../accommodation_booking/show.html.twig | 48 +++++++++---------- .../admin/accommodation_price/_form.html.twig | 4 +- .../admin/additional_service/_form.html.twig | 4 +- templates/admin/board_service/_form.html.twig | 4 +- .../admin/booking_edit_draft/show.html.twig | 4 +- templates/admin/dashboard.html.twig | 2 +- .../admin/travel_mailing/index.html.twig | 25 +++++----- .../admin/user/modal_permissions.html.twig | 12 ++--- 19 files changed, 100 insertions(+), 101 deletions(-) diff --git a/templates/admin/accommodation/_form.html.twig b/templates/admin/accommodation/_form.html.twig index 73cadd98..5a9deaf1 100644 --- a/templates/admin/accommodation/_form.html.twig +++ b/templates/admin/accommodation/_form.html.twig @@ -39,24 +39,24 @@ {% endif %}
- + zurück -
{{ form_rest(form) }} {{ form_end(form) }} -
- - +
+ +

-

+

Preise

@@ -160,7 +160,7 @@
@@ -169,7 +169,7 @@
-

+

Verpflegungsleistungen

@@ -227,7 +227,7 @@
@@ -238,10 +238,10 @@
-

+

Optionale Zusatzleistungen

-

+

Die Reihenfolge wird per Drag & Drop festgelegt und gilt auch für das Buchungsformular.

@@ -268,7 +268,7 @@ {% for service in additionalServices %} - + {{ icon('draggable', 'w-4 h-4') }} @@ -309,8 +309,8 @@
diff --git a/templates/admin/accommodation/index.html.twig b/templates/admin/accommodation/index.html.twig index 50475678..c6e165a3 100644 --- a/templates/admin/accommodation/index.html.twig +++ b/templates/admin/accommodation/index.html.twig @@ -70,7 +70,7 @@ hx-get="{{ path('app_admin_accommodation_create') }}" hx-target="body" hx-swap="beforeend" - class="button button--primary button--small"> + class="btn-primary"> neu diff --git a/templates/admin/accommodation/modal_create.html.twig b/templates/admin/accommodation/modal_create.html.twig index c91dab5c..e760c201 100644 --- a/templates/admin/accommodation/modal_create.html.twig +++ b/templates/admin/accommodation/modal_create.html.twig @@ -15,7 +15,7 @@ {{ form_row(form.maxAdolescentAge) }}
-
diff --git a/templates/admin/accommodation_booking/_period_row.html.twig b/templates/admin/accommodation_booking/_period_row.html.twig index 47b8632c..44c58645 100644 --- a/templates/admin/accommodation_booking/_period_row.html.twig +++ b/templates/admin/accommodation_booking/_period_row.html.twig @@ -3,7 +3,7 @@ {% if app.request.query.get('r') %} {% set period_params = period_params | merge({ r: app.request.query.get('r') }) %} {% endif %} - + {{ period.dateFrom | date('d.m.Y') }} – {{ period.dateTo | date('d.m.Y') }} {{ period.nights }} {{ period.nights != 1 ? 'Nächte' : 'Nacht' }} @@ -13,7 +13,7 @@ {% for line in period.lines %}
{{ line.label }}
{% else %} -
keine Positionen
+
keine Positionen
{% endfor %} diff --git a/templates/admin/accommodation_booking/_price_breakdown.html.twig b/templates/admin/accommodation_booking/_price_breakdown.html.twig index bfa4945c..dd938a9d 100644 --- a/templates/admin/accommodation_booking/_price_breakdown.html.twig +++ b/templates/admin/accommodation_booking/_price_breakdown.html.twig @@ -4,7 +4,7 @@ {% include 'admin/accommodation_booking/_price_period.html.twig' %} {% endfor %} {% if priceBreakdown.periods is not empty %} - + Gruppe · {{ booking.mainDateFrom | date('d.m.Y') }} – {{ booking.mainDateTo | date('d.m.Y') }}, {{ priceBreakdown.nights }} {{ priceBreakdown.nights != 1 ? 'Nächte' : 'Nacht' }} @@ -15,7 +15,7 @@ Basispreis - für {{ priceBreakdown.includedPax }} Pers. + für {{ priceBreakdown.includedPax }} Pers. {{ (priceBreakdown.basePrice / 100) | format_currency(currency) }} @@ -24,7 +24,7 @@ Aufpreis Personenzahl - für {{ priceBreakdown.effectivePax - priceBreakdown.includedPax }} Pers. + für {{ priceBreakdown.effectivePax - priceBreakdown.includedPax }} Pers. {{ (priceBreakdown.additionalPersonsPrice / 100) | format_currency(currency) }} @@ -64,10 +64,10 @@ {% for period in priceBreakdown.periods | filter(p => p.position == 'trailing') %} {% include 'admin/accommodation_booking/_price_period.html.twig' %} {% endfor %} - + Gesamtpreis - zzgl. ortsabhängiger Gebühren + zzgl. ortsabhängiger Gebühren {{ (priceBreakdown.total / 100) | format_currency(currency) }} @@ -78,7 +78,7 @@ {% endfor %} {% if priceBreakdown.discountSubtotal is not null %} - + Zwischensumme {{ (priceBreakdown.discountSubtotal / 100) | format_currency(currency) }} @@ -90,7 +90,7 @@ {% endif %} {% if priceBreakdown.discounts is not empty or priceBreakdown.totalDiscountDetails is not null %} - + Gesamtpreis nach Rabatt {{ (priceBreakdown.discountedTotal / 100) | format_currency(currency) }} diff --git a/templates/admin/accommodation_booking/_price_period.html.twig b/templates/admin/accommodation_booking/_price_period.html.twig index 21025fc4..62307128 100644 --- a/templates/admin/accommodation_booking/_price_period.html.twig +++ b/templates/admin/accommodation_booking/_price_period.html.twig @@ -1,5 +1,5 @@ {#- One split-off period of the admin price table. Context: period, currency. -#} - + {% if period.label ?? null %}{{ period.label }} · {% endif %} {{ period.dateFrom | date('d.m.Y') }} – {{ period.dateTo | date('d.m.Y') }}, diff --git a/templates/admin/accommodation_booking/edit.html.twig b/templates/admin/accommodation_booking/edit.html.twig index 40807a1f..6acc30ad 100644 --- a/templates/admin/accommodation_booking/edit.html.twig +++ b/templates/admin/accommodation_booking/edit.html.twig @@ -7,7 +7,7 @@ {% endif %} {{ booking.recordLabel }} {{ booking.groupName }} -

+

{{ booking.accommodation.name }} {# Only an Entwurf may still move house — see ChangeAccommodationController. #} {% if booking.draft %} @@ -15,7 +15,7 @@ hx-get="{{ path('app_admin_accommodationbooking_change_accommodation', back_params) }}" hx-target="body" hx-swap="beforeend" - class="button button--secondary button--small">ändern + class="btn-tool">ändern {% endif %}

@@ -39,9 +39,9 @@ {# Saved by their own modals, which reprice the booking on the spot — see SplitPeriodController. #} -
+
Zeiträume
-

+

Anreise und Abreise umfassen den ganzen Aufenthalt. Abgeteilte Zeiträume, etwa für ein Vorausteam, werden mit eigenen Positionen berechnet; Personen und Leistungen gelten nur für den Zeitraum der Gruppe. @@ -50,7 +50,7 @@ {% if booking.leadingPeriod %} {% include 'admin/accommodation_booking/_period_row.html.twig' with { period: booking.leadingPeriod } %} {% endif %} - + {{ booking.mainDateFrom | date('d.m.Y') }} – {{ booking.mainDateTo | date('d.m.Y') }} {{ booking.mainNights }} {{ booking.mainNights != 1 ? 'Nächte' : 'Nacht' }} Gruppe @@ -94,7 +94,7 @@ {% for child in form.selectedAdditionalServices %}

-
@@ -149,16 +149,16 @@ {# Read-only: the status only ever moves through a named action on the detail page, so that it cannot be set without the email and timestamp that belong to it. #}
-
Status
+
Status
{% include 'admin/accommodation_booking/_status_label.html.twig' %}
-
Herkunft
+
Herkunft
{{ booking.origin.label }}
{% if booking.acceptedAt is not null %} -
Angenommen
+
Angenommen
{{ booking.acceptedAt | date('d.m.Y, H:i') }}
{% endif %} {% if booking.confirmedAt is not null %} -
Bestätigt
+
Bestätigt
{{ booking.confirmedAt | date('d.m.Y, H:i') }}
{% endif %}
@@ -173,17 +173,17 @@ {% set currency = booking.pricingCurrency ?? priceBreakdown.currency %} {% include 'admin/accommodation_booking/_price_breakdown.html.twig' %} -

+

Stand der letzten Speicherung. Änderungen oben werden erst beim Speichern neu berechnet.

{% endif %} diff --git a/templates/admin/accommodation_booking/index.html.twig b/templates/admin/accommodation_booking/index.html.twig index a4bcad23..7789681b 100644 --- a/templates/admin/accommodation_booking/index.html.twig +++ b/templates/admin/accommodation_booking/index.html.twig @@ -132,7 +132,7 @@ hx-get="{{ path('app_admin_accommodationbooking_create') }}" hx-target="body" hx-swap="beforeend" - class="button button--primary button--small"> + class="btn-primary"> neu
diff --git a/templates/admin/accommodation_booking/modal_change_accommodation.html.twig b/templates/admin/accommodation_booking/modal_change_accommodation.html.twig index 22afec30..55d33d2b 100644 --- a/templates/admin/accommodation_booking/modal_change_accommodation.html.twig +++ b/templates/admin/accommodation_booking/modal_change_accommodation.html.twig @@ -5,13 +5,13 @@
Gruppenhaus ändern
-

+

Achtung: Die gewählte Verpflegung und alle Zusatzleistungen müssen anschließend neu ausgewählt werden.

{{ form_start(form) }} {{ form_row(form.accommodation) }}
-
diff --git a/templates/admin/accommodation_booking/modal_create.html.twig b/templates/admin/accommodation_booking/modal_create.html.twig index eccc3d8a..aa78dd47 100644 --- a/templates/admin/accommodation_booking/modal_create.html.twig +++ b/templates/admin/accommodation_booking/modal_create.html.twig @@ -20,7 +20,7 @@
-
diff --git a/templates/admin/accommodation_booking/modal_period.html.twig b/templates/admin/accommodation_booking/modal_period.html.twig index 1387229f..5f8e4983 100644 --- a/templates/admin/accommodation_booking/modal_period.html.twig +++ b/templates/admin/accommodation_booking/modal_period.html.twig @@ -15,7 +15,7 @@ {{ form_errors(line.amount) }} @@ -64,7 +64,7 @@ {% do form.lines.setRendered %}
-
diff --git a/templates/admin/accommodation_booking/show.html.twig b/templates/admin/accommodation_booking/show.html.twig index 829de065..3127f406 100644 --- a/templates/admin/accommodation_booking/show.html.twig +++ b/templates/admin/accommodation_booking/show.html.twig @@ -10,7 +10,7 @@ {{ booking.recordLabel }} · {% include 'admin/accommodation_booking/_status_label.html.twig' %} {{ booking.groupName }} -

{{ booking.accommodation.name }}

+

{{ booking.accommodation.name }}

{# Same arrangement as the edit form: what was booked in the main column, status, the next step and the actions in a sidebar that stays in view on wide screens. #} @@ -102,50 +102,50 @@ diff --git a/templates/admin/accommodation_price/_form.html.twig b/templates/admin/accommodation_price/_form.html.twig index 9c950a80..bed8dd33 100644 --- a/templates/admin/accommodation_price/_form.html.twig +++ b/templates/admin/accommodation_price/_form.html.twig @@ -17,11 +17,11 @@
+ class="btn-secondary"> zurück
diff --git a/templates/admin/additional_service/_form.html.twig b/templates/admin/additional_service/_form.html.twig index 91d0dc23..717536dd 100644 --- a/templates/admin/additional_service/_form.html.twig +++ b/templates/admin/additional_service/_form.html.twig @@ -18,11 +18,11 @@
+ class="btn-secondary"> zurück
diff --git a/templates/admin/board_service/_form.html.twig b/templates/admin/board_service/_form.html.twig index bcf0faf6..917dbfb4 100644 --- a/templates/admin/board_service/_form.html.twig +++ b/templates/admin/board_service/_form.html.twig @@ -12,11 +12,11 @@
+ class="btn-secondary"> zurück
diff --git a/templates/admin/booking_edit_draft/show.html.twig b/templates/admin/booking_edit_draft/show.html.twig index 4ca9df5a..8c3620d5 100644 --- a/templates/admin/booking_edit_draft/show.html.twig +++ b/templates/admin/booking_edit_draft/show.html.twig @@ -2,12 +2,12 @@ {% block content %} Buchungsentwurf -

+

Vorgang {{ draft.bookingNumber }}

{% include('_partials/_json.html.twig') with { 'value': draft.formData } %} diff --git a/templates/admin/dashboard.html.twig b/templates/admin/dashboard.html.twig index f05ab2c8..822f03e1 100644 --- a/templates/admin/dashboard.html.twig +++ b/templates/admin/dashboard.html.twig @@ -10,7 +10,7 @@ {% if widget.actionUrl %} - {{ widget.actionLabel }} + {{ widget.actionLabel }} {% endif %} {% for entry in widget.entries %} diff --git a/templates/admin/travel_mailing/index.html.twig b/templates/admin/travel_mailing/index.html.twig index 853fb1c5..e72659d1 100644 --- a/templates/admin/travel_mailing/index.html.twig +++ b/templates/admin/travel_mailing/index.html.twig @@ -12,8 +12,9 @@
{{ form_row(form.busOnly) }}
+ {# the main action until there is a result; then creating the list is #} @@ -21,22 +22,20 @@ {{ form_end(form) }} {% if failed %} - {% include '_partials/_alert.html.twig' with { - level: 'warning', - messages: ['Die Teilnehmerliste konnte nicht von BusPro abgerufen werden. Bitte später erneut versuchen.'], + {% include 'admin/_partials/_alert.html.twig' with { + type: 'error', + message: 'Die Teilnehmerliste konnte nicht von BusPro abgerufen werden. Bitte später erneut versuchen.', } %} {% elseif result is not null %} {% if result.data is empty %} - {% include '_partials/_alert.html.twig' with { - level: 'warning', - messages: ['Keine Empfänger für %s gefunden: Reisecode unbekannt oder keine bestätigten Teilnehmer%s.'|format(result.travelCode|e, result.busLeg ? ' unter den ' ~ result.busLeg.label : '')], - } %} + {% set message %}Keine Empfänger für {{ result.travelCode }} gefunden: Reisecode unbekannt oder keine bestätigten Teilnehmer{{ result.busLeg ? ' unter den ' ~ result.busLeg.label }}.{% endset %} + {% include 'admin/_partials/_alert.html.twig' with {type: 'warning', message: message} %} {% else %}
-

+

{{ travel_label|default('Reise nicht im lokalen Reisebestand') }}

-

+

{{ result.data|length }} Empfänger für {{ result.travelCode }}{% if result.busLeg %}, nur {{ result.busLeg.label }}{% endif %}

@@ -52,7 +51,7 @@ {% if mailing_list is not null %} {# the list for this filter exists and is listed above #} {% elseif travel_starts_at is null %} -

+

Kein Reisebeginn bekannt, daher kann keine Mailjet-Liste angelegt werden.

{% else %} @@ -62,10 +61,10 @@ {% endif %} - - + Alle Empfänger werden ohne Opt-in eingetragen; die Liste wird 30 Tage nach Reisebeginn ({{ travel_starts_at|date('d.m.Y') }}) gelöscht. diff --git a/templates/admin/user/modal_permissions.html.twig b/templates/admin/user/modal_permissions.html.twig index f7330e01..e8a9287d 100644 --- a/templates/admin/user/modal_permissions.html.twig +++ b/templates/admin/user/modal_permissions.html.twig @@ -5,12 +5,12 @@ {% endblock %} {% block content %} -
+
{{ user.email }}
Aus BusPro
-
+
Rollen
{{ user.roles | effective_roles | join(', ') | default('–') }}
@@ -26,18 +26,18 @@
Freischaltung
{% if approvableRoles is empty and selfRefusedRoles is empty %} -
+
Keine offenen Freischaltungen.
{% else %} -
+
BusPro meldet diese Rollen für den Account. Sie sind erst nach der Freischaltung wirksam.
{% if approvableRoles is not empty %}
{% for role, label in approvableRoles %}
{% endif %} {% if selfRefusedRoles is not empty %} -
+
{{ selfRefusedRoles | join(', ') }}: diese Rolle kannst du dir nicht selbst freischalten. Bitte wende dich an eine:n andere:n Administrator:in.