Merge remote-tracking branch 'origin/main' into feat/add-pkp

lenderom · lenderom · commit 38fc30c13fac · 2025-06-21T09:54:04.000+02:00
Signed-off-by: lennartrommeiss &lt;lennart.rommeiss@deutschebahn.com&gt;
diff --git a/archetypes/operator/index.de.md b/archetypes/operator/index.de.md
@@ -51,7 +51,7 @@ FIP Globalpreis: <✅/⛔>
   - ⛔ für eine Nichtanerkennung von FIP
   - ℹ️ für Verwechslungsgefahr mit anderen Bahngesellschaften/Zugkategorien
 -->
-{{% expander "Zugkategorie" "category" %}}
+{{% expander "Zugkategorie" traincategory "category" %}}
 <!-- Ersetze Zugkategorie mit dem Name der Zugkategorie, z.B. ICE. -->
 **Beschreibung:**
 <!-- Füge hier eine Beschreibung der Zugkategorie ein -->
diff --git a/archetypes/operator/index.en.md b/archetypes/operator/index.en.md
@@ -51,7 +51,7 @@ FIP Global Fare: <✅/⛔>
   - ⛔ for a non-acceptance of FIP
   - ℹ️ for confusion with other railway companies/train categories
 -->
-{{% expander "Train category" "category" %}}
+{{% expander "Train category" traincategory "category" %}}
 <!-- Replace "Train category" with the name of the category, e.g. ICE. -->
 **Description:**
 <!-- Description of the category -->
diff --git a/assets/sass/_variables.scss b/assets/sass/_variables.scss
@@ -3,32 +3,33 @@ $breakpoint-md: 768px;
 $breakpoint-lg: 992px;
 $breakpoint-xl: 1200px;
 
+$link-hovered: #8F2501;
+$link-default: #BA3D12;
+$link-special: #000000;
+$bg-default: #FFFFFF;
+$bg-neutral: #EBE9E1;
+$bg-accent: #FFD900;
+$bg-accent2: #DABA00;
+$bg-accent3: #fff284;
+$color-onDark: #FFFFFF;
+$color-onLight: #000000;
+$color-table-border: #5B5B5B;
+
 body {
   --bs-light-rgb: 219, 224, 229;
   --pagefind-ui-scale: 1;
   --pagefind-ui-text: #000;
-  --link-default: #BA3D12;
-  --link-default-rgb: 186, 61, 18;
-  --link-hovered: #8F2501;
-  --link-hovered-rgb: 143, 37, 1;
-  --link-special: #000000;
-  --link-special-rgb: 0, 0, 0;
-  --bg-default: #FFFFFF;
-  --bg-default-rgb: 255, 255, 255;
-  --bg-neutral: #EBE9E1;
-  --bg-neutral-rgb: 235, 233, 225;
-  --bg-accent: #FFD900;
-  --bg-accent-rgb: 255, 217, 0;
-  --bg-accent2: #DABA00;
-  --bg-accent2-rgb: 218, 186, 0;
-  --bg-accent3: #fff284;
-  --bg-accent3-rgb: 255, 242, 132;
-  --color-onDark: #FFFFFF;
-  --color-onDark-rgb: 255, 255, 255;
-  --color-onLight: #000000;
-  --color-onLight-rgb: 0, 0, 0;
-  --color-table-border: #5B5B5B;
-  --color-table-border-rgb: 91, 91, 91;
+  --link-default: #{$link-default};
+  --link-hovered: #{$link-hovered};
+  --link-special: #{$link-special};
+  --bg-default: #{$bg-default};
+  --bg-neutral: #{$bg-neutral};
+  --bg-accent: #{$bg-accent};
+  --bg-accent2: #{$bg-accent2};
+  --bg-accent3: #{$bg-accent3};
+  --color-onDark: #{$color-onDark};
+  --color-onLight: #{$color-onLight};
+  --color-table-border: #{$color-table-border};
   --border-radius-s: .4rem;
   --border-radius-m: .8rem;
   --border-radius-l: 1.2rem;
diff --git a/assets/sass/booking.scss b/assets/sass/booking.scss
@@ -8,34 +8,33 @@
     }
 }
 
-.details-screen > .o-booking__summary::before {
+.details-screen .o-booking__header-actions::before {
   content: "keyboard_arrow_down";
-  position: absolute;
-  right: 0;
   font-size: 2.4rem;
-  top: calc(50% - 1.2rem);
   @extend .material-symbols-rounded
 }
 
-.details-screen[open] > .o-booking__summary::before {
+.details-screen[open] .o-booking__header-actions::before {
   content: "keyboard_arrow_up";
   font-size: 2.4rem;
-  top: calc(50% - 1.2rem);
   @extend .material-symbols-rounded
 }
 
+.o-booking__header-actions {
+    width: 24px;
+    height: 24px;
+}
+
 .o-booking__header-content {
     display: grid;
     grid-template-columns: 1.5fr 1fr 1fr;
     gap: 2rem;
     width: 100%;
-    align-content: center;
 
     @media (max-width: #{$breakpoint-md}) {
         display: flex;
         flex-direction: column;;
         gap: 1rem;
-        align-content: start;
     }
 }
 
@@ -44,32 +43,39 @@
     justify-content: space-between;
     gap: 2rem;
     width: 100%;
-    align-content: center;
+    align-items: center;
 }
 
 .o-booking__classes {
     display: flex;
     align-items: flex-start;
     justify-content: center;
+    align-items: center;
     flex-direction: column;
     > p {
         margin-bottom: 0rem;
     }
 
-@media (max-width: #{$breakpoint-md}) {
-        align-items: start;
+    @media (max-width: #{$breakpoint-md}) {
+        align-items: flex-start;
     }
 }
 
+.o-booking__classes-title {
+    font-size: 1.6rem;
+    font-style: italic;
+}
+
 .o-booking__title-wrapper {
     display: flex;
     flex-direction: column;
-    justify-content: space-between;
+    justify-content: center;
+    gap: 0.4rem;
 }
 
 .o-booking__title {
     display: flex;
-    gap: 0.5rem;
+    gap: 0.4rem;
     align-items: flex-start;
     font-weight: 600;
 }
@@ -85,14 +91,14 @@
 }
 
 .o-booking__meta {
-    text-align: left;
+    text-align: center;
     display: flex;
     flex-direction: column;
-    align-items: flex-start;
+    align-items: center;
     justify-content: center;
 
     @media (max-width: #{$breakpoint-md}) {
-        align-items: start;
+        align-items: flex-start;
     }
 }
 
diff --git a/assets/sass/button.scss b/assets/sass/button.scss
@@ -1,4 +1,4 @@
-a.c-button {
+a.a-button {
     padding: 1rem;
     display: inline-flex;
     align-items: center;
@@ -12,6 +12,6 @@ a.c-button {
 
     &:hover,
     &:focus {
-        background: rgba(var(--link-hovered-rgb), 0.15);
+        background: rgba($link-hovered, 0.15);
     }
 }
diff --git a/assets/sass/expander.scss b/assets/sass/expander.scss
@@ -4,10 +4,12 @@
   gap: 0.5rem;
   align-items: center;
 
-  .o-expander__summary-text:hover,
-  .o-expander__summary-text:focus {
-    font-weight: 700;
-    text-decoration: underline;
+  &:hover,
+  &:focus {
+    .o-expander__summary-text {
+      font-weight: 700;
+      text-decoration: underline;
+    }
   }
 }
 
@@ -31,7 +33,6 @@ details > summary {
   list-style-type: none;
 }
 
-.details-screen.o-expander > div,
 .details-screen > .o-expander__summary {
   margin-right: 3.2rem;
 }
diff --git a/content/booking/db_website_fip_db/index.en.md b/content/booking/db_website_fip_db/index.en.md
@@ -5,8 +5,8 @@ description: "Booking information for FIP tickets for DB employees for neighbori
 
 params:
     classes:
-        first: "6,90€"
-        second: "5,50€"
+        first: "€6,90"
+        second: "€5,50"
     fip_50: true
     reservations: true
     additional_info_link: "https://int.bahn.de/en/offers/additional-services/seat-reservation"
diff --git a/content/booking/db_website_fip_international/index.en.md b/content/booking/db_website_fip_international/index.en.md
@@ -5,8 +5,8 @@ description: "Booking information for FIP Tickets with a section in Germany."
 
 params:
     classes:
-        first: "6,90€"
-        second: "5,50€"
+        first: "€6,90"
+        second: "€5,50"
     fip_50: true
     reservations: true
     booking_link: "https://www.bahn.de/buchung/start?KL=2&ET=FIP_SONSTIGE"
diff --git a/content/country/_index.de.md b/content/country/_index.de.md
@@ -3,4 +3,4 @@ title: "Länder"
 description: "Überblick über die Länder, in denen FIP-Vergünstigungen genutzt werden können."
 ---
 
-Momemtan sind noch nicht für alle Länder und Betreiber Informationen verfügbar. Den aktuellen Bearbeitungsstand findest du auf [GitHub](https://github.com/orgs/fipguide/projects/3).
+Für einige Länder sind bereits Informationen verfügbar und kontinuierlich kommen weitere Länder hinzu. Den aktuellen Bearbeitungsstand findest du auf [GitHub](https://github.com/orgs/fipguide/projects/3).
diff --git a/content/country/_index.en.md b/content/country/_index.en.md
@@ -3,4 +3,4 @@ title: "Countries"
 description: "Overview of the countries where FIP benefits are available."
 ---
 
-Currently, information is not yet available for all countries and operators. You can see the current information status on [GitHub](https://github.com/orgs/fipguide/projects/3).
+Information is available for several countries, and more countries are continually being added. You can see the current information status on [GitHub](https://github.com/orgs/fipguide/projects/3).
diff --git a/content/news/4/index.de.md b/content/news/4/index.de.md
@@ -1,7 +1,7 @@
 ---
 date: "2025-05-16"
 draft: false
-title: "Eurostar Preiserhöhung"
+title: "Update: Eurostar Preiserhöhung"
 country:
     - belgium
     - netherlands
@@ -11,6 +11,7 @@ operator:
 
 Ab dem 1. Mai 2025 erhöht Eurostar die Preise auf alle FIP Fahrkarten um 5€ bzw. 5£. Die Preiserhöhung betrifft alle FIP Globalpreise bei Eurostar Blue und Eurostar Red (Thalys) in allen Klassen. Die neuen Preise gelten für alle Buchungen, die ab dem 1. Mai 2025 getätigt werden. [^1]
 
-Die neuen Preise sind auf der [Eurostar Seite]({{< ref "/operator/eurostar" >}} "Eurostar") zu finden.
+**Update 17.06.2025:** \
+Die Ankündingung ist inzwischen von der Seite der Rail Delivery Group entfernt worden. Es ist unklar, ob die Preiserhöhung noch in Kraft tritt oder ob sie zurückgezogen wurde. Wir werden die Situation weiter beobachten und informieren, sobald es Neuigkeiten gibt. Aktuell ist eine Buchung zu den alten Preisen weiterhin möglich.
 
 [^1]: [Rail Delivery Group News](https://www.raildeliverygroup.com/rst/stop-press.html#Surchares)
diff --git a/content/news/4/index.en.md b/content/news/4/index.en.md
@@ -1,7 +1,7 @@
 ---
 date: "2025-05-16"
 draft: false
-title: "Eurostar Price Increase"
+title: "Update: Eurostar Price Increase"
 country:
     - belgium
     - netherlands
@@ -11,6 +11,7 @@ operator:
 
 Starting May 1, 2025, Eurostar will increase prices on all FIP tickets by €5 or £5. The price increase applies to all FIP Global Fares for Eurostar Blue and Eurostar Red (Thalys) in all classes. The new prices apply to all bookings made from May 1, 2025 onwards. [^1]
 
-The new prices can be found on the [Eurostar page]({{< ref "/operator/eurostar" >}} "Eurostar").
+**Update 17.06.2025:** \
+The announcement has since been removed from the Rail Delivery Group's website. It is unclear whether the price increase will still take effect or if it has been withdrawn. We will continue to monitor the situation and provide updates as soon as there is news. Currently, bookings at the old prices are still possible.
 
 [^1]: [Rail Delivery Group News](https://www.raildeliverygroup.com/rst/stop-press.html#Surchares)
diff --git a/content/operator/_index.de.md b/content/operator/_index.de.md
@@ -3,4 +3,4 @@ title: "Betreiber mit FIP"
 description: "Überblick über die Betreiber, die FIP-Vergünstigungen anbieten."
 ---
 
-Momemtan sind noch nicht für alle Länder und Betreiber Informationen verfügbar. Den aktuellen Bearbeitungsstand findest du auf [GitHub](https://github.com/orgs/fipguide/projects/3).
+Für einige Betreiber sind bereits Informationen verfügbar und kontinuierlich kommen weitere Betreiber hinzu. Den aktuellen Bearbeitungsstand findest du auf [GitHub](https://github.com/orgs/fipguide/projects/3).
diff --git a/content/operator/_index.en.md b/content/operator/_index.en.md
@@ -3,4 +3,4 @@ title: "Operators supporting FIP"
 description: "Overview of the operators providing FIP benefits."
 ---
 
-Currently, information is not yet available for all countries and operators. You can see the current information status on [GitHub](https://github.com/orgs/fipguide/projects/3).
+Information is available for several operators, and more operators are continually being added. You can see the current information status on [GitHub](https://github.com/orgs/fipguide/projects/3).
diff --git a/content/operator/eurostar/index.de.md b/content/operator/eurostar/index.de.md
@@ -39,9 +39,9 @@ Hochgeschwindigkeitszug zwischen Großbritannien und Europa \
 **FIP Globalpreis:**
 | Relation    | Standard | Plus |
 | ----------- | -------- | ---- |
-| London - Paris / Brüssel | 44 € / 39,50 £ | 65 € / 57,50 £ |
-| London - Amsterdam / Rotterdam | ? € / 49,50 £ | ? € / 67 £ |
-| Brüssel - Amsterdam / Rotterdam  | ? € / 20,50 £ | ? € / 35,50 £ |
+| London - Paris / Brüssel | 39 € / 34,50 £ | 60 € / 52,50 £ |
+| London - Amsterdam / Rotterdam | ? € / 44,50 £ | ? € / 62 £ |
+| Brüssel - Amsterdam / Rotterdam  | ? € / 15,50 £ | ? € / 30,50 £ |
 {{% /expander %}}
 
 {{% expander "Eurostar (Red): Paris - Amsterdam / Brüssel / Köln / Dortmund ⚠️" traincategory category %}}
@@ -53,8 +53,8 @@ Hochgeschwindigkeitszug zwischen Belgien, Deutschland, Frankreich und den Nieder
 | Relation    | Standard | Plus |
 | ----------- | -------- | ---- |
 | Fahrt in einem Land | Kein FIP | Kein FIP |
-| Fahrt zwischen 2 Ländern | 23 € | 40 € |
-| Fahrt zwischen 3 Ländern | 25 € | 45 € |
+| Fahrt zwischen 2 Ländern | 18 € | 35 € |
+| Fahrt zwischen 3 Ländern | 20 € | 40 € |
 {{% /expander %}}
 
 {{% expander "Eurostar Snow: Amsterdam / Brüssel - Französische Alpen ⛔⚠️" traincategory category %}}
@@ -102,6 +102,8 @@ Wenn bei der Buchung eine Mailadresse angegeben wird, für die ein Eurostar Kont
     fip_global_fare=true
     reservations=nil
 %}}
+**FIP Globalpreis**
+
 Bei der Buchung muss der FIP Ausweise aller Reisenden vorgezeigt werden.
 {{% /booking %}}
 
diff --git a/content/operator/eurostar/index.en.md b/content/operator/eurostar/index.en.md
@@ -38,9 +38,9 @@ High-speed train between Great Britain and Europe \
 **FIP Global Fare:**
 | Route       | Standard | Plus |
 | ----------- | -------- | ---- |
-| London - Paris / Brussels | 44 € / 39.50 £ | 65 € / 57.50 £ |
-| London - Amsterdam / Rotterdam | ? € / 49.50 £ | ? € / 67 £ |
-| Brussels - Amsterdam / Rotterdam  | ? € / 20.50 £ | ? € / 35.50 £ |
+| London - Paris / Brussels | 39 € / 34.50 £ | 60 € / 52.50 £ |
+| London - Amsterdam / Rotterdam | ? € / 44.50 £ | ? € / 62 £ |
+| Brussels - Amsterdam / Rotterdam  | ? € / 15.50 £ | ? € / 30.50 £ |
 {{% /expander %}}
 
 {{% expander "Eurostar (Red): Paris - Amsterdam / Brussels / Cologne / Dortmund ⚠️" traincategory category %}}
@@ -52,8 +52,8 @@ High-speed train between Belgium, Germany, France, and the Netherlands \
 | Route       | Standard | Plus |
 | ----------- | -------- | ---- |
 | Travel within one country | No FIP | No FIP |
-| Travel between 2 countries | 23 € | 40 € |
-| Travel between 3 countries | 25 € | 45 € |
+| Travel between 2 countries | 18 € | 35 € |
+| Travel between 3 countries | 20 € | 40 € |
 {{% /expander %}}
 
 {{% expander "Eurostar Snow: Amsterdam / Brussels - French Alps ⛔⚠️" traincategory category %}}
@@ -101,6 +101,8 @@ If an email address associated with an existing Eurostar account is provided dur
     fip_global_fare=true
     reservations=nil
 %}}
+**FIP Global Fare**
+
 When booking, the FIP cards of all travelers must be presented.
 {{% /booking %}}
 
diff --git a/i18n/de.yaml b/i18n/de.yaml
@@ -10,6 +10,7 @@ booking:
   fip-50: FIP 50 Fahrkarten
   fip-global-fare: FIP Globalpreis
   reservation: Reservierung
+  reservation-costs: Reservierungskosten
   title: Buchungsplattformen
   visit-additional-information-website: Weitere Informationen
   visit-booking-website: Zur Buchungsseite
diff --git a/i18n/en.yaml b/i18n/en.yaml
@@ -9,6 +9,7 @@ booking:
   fip-50: FIP 50 Tickets
   fip-global-fare: FIP Global Fare
   reservation: Reservation
+  reservation-costs: Reservation Costs
   title: Booking platforms
   visit-additional-information-website: Additional Information
   visit-booking-website: To Booking Website
diff --git a/layouts/partials/booking.html b/layouts/partials/booking.html
diff --git a/layouts/partials/button.html b/layouts/partials/button.html
diff --git a/layouts/partials/headMeta.html b/layouts/partials/headMeta.html
diff --git a/layouts/shortcodes/expander.html b/layouts/shortcodes/expander.html

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-a.c-button {`
	`1`	`+a.a-button {`
`2`	`2`	`padding: 1rem;`
`3`	`3`	`display: inline-flex;`
`4`	`4`	`align-items: center;`
`@@ -12,6 +12,6 @@ a.c-button {`
`12`	`12`
`13`	`13`	`&:hover,`
`14`	`14`	`&:focus {`
`15`		`- background: rgba(var(--link-hovered-rgb), 0.15);`
	`15`	`+ background: rgba($link-hovered, 0.15);`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,12 @@`
`4`	`4`	`gap: 0.5rem;`
`5`	`5`	`align-items: center;`
`6`	`6`
`7`		`- .o-expander__summary-text:hover,`
`8`		`- .o-expander__summary-text:focus {`
`9`		`- font-weight: 700;`
`10`		`- text-decoration: underline;`
	`7`	`+ &:hover,`
	`8`	`+ &:focus {`
	`9`	`+ .o-expander__summary-text {`
	`10`	`+ font-weight: 700;`
	`11`	`+ text-decoration: underline;`
	`12`	`+ }`
`11`	`13`	`}`
`12`	`14`	`}`
`13`	`15`
`@@ -31,7 +33,6 @@ details > summary {`
`31`	`33`	`list-style-type: none;`
`32`	`34`	`}`
`33`	`35`
`34`		`-.details-screen.o-expander > div,`
`35`	`36`	`.details-screen > .o-expander__summary {`
`36`	`37`	`margin-right: 3.2rem;`
`37`	`38`	`}`