diff --git a/assets/js/dropdown.js b/assets/js/dropdown.js index 3a4bf267c..bf760472f 100644 --- a/assets/js/dropdown.js +++ b/assets/js/dropdown.js @@ -29,6 +29,7 @@ document.addEventListener("DOMContentLoaded", function () { registerEventListeners("language-switcher"); registerEventListeners("navbar-country-selection"); + registerEventListeners("navbar-generalinformation-selection"); registerEventListeners("navbar-operator-selection"); [ "fip-validity-issuer", diff --git a/content/general/_index.de.md b/content/general/_index.de.md new file mode 100644 index 000000000..4947b7b9c --- /dev/null +++ b/content/general/_index.de.md @@ -0,0 +1,6 @@ +--- +draft: false +title: "Allgemeines" +--- + +Hier findest du nützliche, allgemeine Informationen zur Reise mit FIP. diff --git a/content/general/_index.en.md b/content/general/_index.en.md new file mode 100644 index 000000000..57fb6b5fd --- /dev/null +++ b/content/general/_index.en.md @@ -0,0 +1,6 @@ +--- +draft: false +title: "General" +--- + +On this pages you can find useful, general information regarding FIP. diff --git a/content/general/_index.fr.md b/content/general/_index.fr.md new file mode 100644 index 000000000..7f14f5915 --- /dev/null +++ b/content/general/_index.fr.md @@ -0,0 +1,6 @@ +--- +draft: false +title: "Générales" +--- + +bla bla de baguette diff --git a/content/general/faq/_index.de.md b/content/general/faq/_index.de.md new file mode 100644 index 000000000..6372bb363 --- /dev/null +++ b/content/general/faq/_index.de.md @@ -0,0 +1,10 @@ +--- +title: "FAQ" +layout: "single" +url: "general/faq/" +aliases: + - "generalinformation/faq/" +--- + +Test +{{< faq >}} diff --git a/content/general/faq/_index.en.md b/content/general/faq/_index.en.md new file mode 100644 index 000000000..f81e8572b --- /dev/null +++ b/content/general/faq/_index.en.md @@ -0,0 +1,9 @@ +--- +title: "FAQ" +layout: "single" +url: "general/faq/" +aliases: + - "generalinformation/faq/" +--- + +{{< faq >}} diff --git a/content/general/faq/_index.fr.md b/content/general/faq/_index.fr.md new file mode 100644 index 000000000..f81e8572b --- /dev/null +++ b/content/general/faq/_index.fr.md @@ -0,0 +1,9 @@ +--- +title: "FAQ" +layout: "single" +url: "general/faq/" +aliases: + - "generalinformation/faq/" +--- + +{{< faq >}} diff --git a/content/generalinformation/faq/does-fip-also-apply-to-dependents/_index.de.md b/content/general/faq/does-fip-also-apply-to-dependents/_index.de.md similarity index 100% rename from content/generalinformation/faq/does-fip-also-apply-to-dependents/_index.de.md rename to content/general/faq/does-fip-also-apply-to-dependents/_index.de.md diff --git a/content/generalinformation/faq/does-fip-also-apply-to-dependents/_index.en.md b/content/general/faq/does-fip-also-apply-to-dependents/_index.en.md similarity index 100% rename from content/generalinformation/faq/does-fip-also-apply-to-dependents/_index.en.md rename to content/general/faq/does-fip-also-apply-to-dependents/_index.en.md diff --git a/content/generalinformation/faq/does-fip-also-apply-to-dependents/_index.fr.md b/content/general/faq/does-fip-also-apply-to-dependents/_index.fr.md similarity index 100% rename from content/generalinformation/faq/does-fip-also-apply-to-dependents/_index.fr.md rename to content/general/faq/does-fip-also-apply-to-dependents/_index.fr.md diff --git a/content/generalinformation/faq/exceptions-fip-coupon/_index.de.md b/content/general/faq/exceptions-fip-coupon/_index.de.md similarity index 100% rename from content/generalinformation/faq/exceptions-fip-coupon/_index.de.md rename to content/general/faq/exceptions-fip-coupon/_index.de.md diff --git a/content/generalinformation/faq/exceptions-fip-coupon/_index.en.md b/content/general/faq/exceptions-fip-coupon/_index.en.md similarity index 100% rename from content/generalinformation/faq/exceptions-fip-coupon/_index.en.md rename to content/general/faq/exceptions-fip-coupon/_index.en.md diff --git a/content/generalinformation/faq/exceptions-fip-coupon/_index.fr.md b/content/general/faq/exceptions-fip-coupon/_index.fr.md similarity index 100% rename from content/generalinformation/faq/exceptions-fip-coupon/_index.fr.md rename to content/general/faq/exceptions-fip-coupon/_index.fr.md diff --git a/content/generalinformation/faq/how-long-is-a-field-valid/_index.de.md b/content/general/faq/how-long-is-a-field-valid/_index.de.md similarity index 100% rename from content/generalinformation/faq/how-long-is-a-field-valid/_index.de.md rename to content/general/faq/how-long-is-a-field-valid/_index.de.md diff --git a/content/generalinformation/faq/how-long-is-a-field-valid/_index.en.md b/content/general/faq/how-long-is-a-field-valid/_index.en.md similarity index 100% rename from content/generalinformation/faq/how-long-is-a-field-valid/_index.en.md rename to content/general/faq/how-long-is-a-field-valid/_index.en.md diff --git a/content/generalinformation/faq/how-long-is-a-field-valid/_index.fr.md b/content/general/faq/how-long-is-a-field-valid/_index.fr.md similarity index 100% rename from content/generalinformation/faq/how-long-is-a-field-valid/_index.fr.md rename to content/general/faq/how-long-is-a-field-valid/_index.fr.md diff --git a/content/generalinformation/faq/how-long-is-an-fip-coupon-valid/_index.de.md b/content/general/faq/how-long-is-an-fip-coupon-valid/_index.de.md similarity index 100% rename from content/generalinformation/faq/how-long-is-an-fip-coupon-valid/_index.de.md rename to content/general/faq/how-long-is-an-fip-coupon-valid/_index.de.md diff --git a/content/generalinformation/faq/how-long-is-an-fip-coupon-valid/_index.en.md b/content/general/faq/how-long-is-an-fip-coupon-valid/_index.en.md similarity index 100% rename from content/generalinformation/faq/how-long-is-an-fip-coupon-valid/_index.en.md rename to content/general/faq/how-long-is-an-fip-coupon-valid/_index.en.md diff --git a/content/generalinformation/faq/how-long-is-an-fip-coupon-valid/_index.fr.md b/content/general/faq/how-long-is-an-fip-coupon-valid/_index.fr.md similarity index 100% rename from content/generalinformation/faq/how-long-is-an-fip-coupon-valid/_index.fr.md rename to content/general/faq/how-long-is-an-fip-coupon-valid/_index.fr.md diff --git a/content/generalinformation/faq/meaning-of-a-field/_index.de.md b/content/general/faq/meaning-of-a-field/_index.de.md similarity index 100% rename from content/generalinformation/faq/meaning-of-a-field/_index.de.md rename to content/general/faq/meaning-of-a-field/_index.de.md diff --git a/content/generalinformation/faq/meaning-of-a-field/_index.en.md b/content/general/faq/meaning-of-a-field/_index.en.md similarity index 100% rename from content/generalinformation/faq/meaning-of-a-field/_index.en.md rename to content/general/faq/meaning-of-a-field/_index.en.md diff --git a/content/generalinformation/faq/meaning-of-a-field/_index.fr.md b/content/general/faq/meaning-of-a-field/_index.fr.md similarity index 100% rename from content/generalinformation/faq/meaning-of-a-field/_index.fr.md rename to content/general/faq/meaning-of-a-field/_index.fr.md diff --git a/content/generalinformation/faq/number-of-fields/_index.de.md b/content/general/faq/number-of-fields/_index.de.md similarity index 73% rename from content/generalinformation/faq/number-of-fields/_index.de.md rename to content/general/faq/number-of-fields/_index.de.md index 26056fda6..51790e548 100644 --- a/content/generalinformation/faq/number-of-fields/_index.de.md +++ b/content/general/faq/number-of-fields/_index.de.md @@ -3,4 +3,4 @@ title: "Wie viele Felder kann ich bei FIP Freifahrtscheinen beantragen?" weight: 10 --- -Die Anzahl der Felder unterscheidet sich je nach Betreiber, Aussteller des FIP Ausweises und deinem Mitarbeitendenstatus. Mehr Informationen findest du auf der Seite [FIP Beantragung](/fip-validity). +Die Anzahl der Felder unterscheidet sich je nach Betreiber, Aussteller des FIP Ausweises und deinem Mitarbeitendenstatus. Mehr Informationen findest du auf der Seite [FIP Beantragung](/general/fip-validity/). diff --git a/content/generalinformation/faq/number-of-fields/_index.en.md b/content/general/faq/number-of-fields/_index.en.md similarity index 76% rename from content/generalinformation/faq/number-of-fields/_index.en.md rename to content/general/faq/number-of-fields/_index.en.md index 8463ab8a2..5fe828b0b 100644 --- a/content/generalinformation/faq/number-of-fields/_index.en.md +++ b/content/general/faq/number-of-fields/_index.en.md @@ -3,4 +3,4 @@ title: "How many fields can I request for FIP Coupons?" weight: 10 --- -The number of fields varies depending on the operator, the issuer of your FIP Card, and your employee status. More information can be found in the [FIP Application](/fip-validity). +The number of fields varies depending on the operator, the issuer of your FIP Card, and your employee status. More information can be found in the [FIP Application](/general/fip-validity/). diff --git a/content/generalinformation/faq/number-of-fields/_index.fr.md b/content/general/faq/number-of-fields/_index.fr.md similarity index 76% rename from content/generalinformation/faq/number-of-fields/_index.fr.md rename to content/general/faq/number-of-fields/_index.fr.md index 8146de20a..b856aad55 100644 --- a/content/generalinformation/faq/number-of-fields/_index.fr.md +++ b/content/general/faq/number-of-fields/_index.fr.md @@ -3,4 +3,4 @@ title: "Combien de cases puis-je demander pour les Coupons FIP ?" weight: 10 --- -Le nombre de cases varie selon l’opérateur, l’émetteur de votre Carte FIP et votre statut d’employé. Vous trouverez plus d’informations dans la [Demande FIP](/fip-validity). +Le nombre de cases varie selon l’opérateur, l’émetteur de votre Carte FIP et votre statut d’employé. Vous trouverez plus d’informations dans la [Demande FIP](/general/fip-validity/). diff --git a/content/generalinformation/faq/train-reservation/_index.de.md b/content/general/faq/train-reservation/_index.de.md similarity index 100% rename from content/generalinformation/faq/train-reservation/_index.de.md rename to content/general/faq/train-reservation/_index.de.md diff --git a/content/generalinformation/faq/train-reservation/_index.en.md b/content/general/faq/train-reservation/_index.en.md similarity index 100% rename from content/generalinformation/faq/train-reservation/_index.en.md rename to content/general/faq/train-reservation/_index.en.md diff --git a/content/generalinformation/faq/train-reservation/_index.fr.md b/content/general/faq/train-reservation/_index.fr.md similarity index 100% rename from content/generalinformation/faq/train-reservation/_index.fr.md rename to content/general/faq/train-reservation/_index.fr.md diff --git a/content/generalinformation/faq/what-discounts-do-i-get/_index.de.md b/content/general/faq/what-discounts-do-i-get/_index.de.md similarity index 100% rename from content/generalinformation/faq/what-discounts-do-i-get/_index.de.md rename to content/general/faq/what-discounts-do-i-get/_index.de.md diff --git a/content/generalinformation/faq/what-discounts-do-i-get/_index.en.md b/content/general/faq/what-discounts-do-i-get/_index.en.md similarity index 100% rename from content/generalinformation/faq/what-discounts-do-i-get/_index.en.md rename to content/general/faq/what-discounts-do-i-get/_index.en.md diff --git a/content/generalinformation/faq/what-discounts-do-i-get/_index.fr.md b/content/general/faq/what-discounts-do-i-get/_index.fr.md similarity index 100% rename from content/generalinformation/faq/what-discounts-do-i-get/_index.fr.md rename to content/general/faq/what-discounts-do-i-get/_index.fr.md diff --git a/content/generalinformation/faq/what-does-fip-stand-for/_index.de.md b/content/general/faq/what-does-fip-stand-for/_index.de.md similarity index 100% rename from content/generalinformation/faq/what-does-fip-stand-for/_index.de.md rename to content/general/faq/what-does-fip-stand-for/_index.de.md diff --git a/content/generalinformation/faq/what-does-fip-stand-for/_index.en.md b/content/general/faq/what-does-fip-stand-for/_index.en.md similarity index 100% rename from content/generalinformation/faq/what-does-fip-stand-for/_index.en.md rename to content/general/faq/what-does-fip-stand-for/_index.en.md diff --git a/content/generalinformation/faq/what-does-fip-stand-for/_index.fr.md b/content/general/faq/what-does-fip-stand-for/_index.fr.md similarity index 100% rename from content/generalinformation/faq/what-does-fip-stand-for/_index.fr.md rename to content/general/faq/what-does-fip-stand-for/_index.fr.md diff --git a/content/generalinformation/faq/what-is-the-fip-card/_index.de.md b/content/general/faq/what-is-the-fip-card/_index.de.md similarity index 100% rename from content/generalinformation/faq/what-is-the-fip-card/_index.de.md rename to content/general/faq/what-is-the-fip-card/_index.de.md diff --git a/content/generalinformation/faq/what-is-the-fip-card/_index.en.md b/content/general/faq/what-is-the-fip-card/_index.en.md similarity index 100% rename from content/generalinformation/faq/what-is-the-fip-card/_index.en.md rename to content/general/faq/what-is-the-fip-card/_index.en.md diff --git a/content/generalinformation/faq/what-is-the-fip-card/_index.fr.md b/content/general/faq/what-is-the-fip-card/_index.fr.md similarity index 100% rename from content/generalinformation/faq/what-is-the-fip-card/_index.fr.md rename to content/general/faq/what-is-the-fip-card/_index.fr.md diff --git a/content/generalinformation/faq/what-rules-apply-to-fip-coupons/_index.de.md b/content/general/faq/what-rules-apply-to-fip-coupons/_index.de.md similarity index 91% rename from content/generalinformation/faq/what-rules-apply-to-fip-coupons/_index.de.md rename to content/general/faq/what-rules-apply-to-fip-coupons/_index.de.md index 5e861b775..1afa4b8ee 100644 --- a/content/generalinformation/faq/what-rules-apply-to-fip-coupons/_index.de.md +++ b/content/general/faq/what-rules-apply-to-fip-coupons/_index.de.md @@ -3,6 +3,6 @@ title: "Welche Regelungen gibt es bei FIP Freifahrtscheinen?" weight: 8 --- -Die Ausgabe der FIP Freifahrtscheine ist abhängig von deinem Arbeitgeber. Üblicherweise kannst du in einem Kalenderjahr pro FIP-Mitglied einen FIP Freifahrtschein mit ein bis vier Feldern beantragen. Genauere Informationen findest du auf der Seite [FIP Beantragung](/fip-validity/). +Die Ausgabe der FIP Freifahrtscheine ist abhängig von deinem Arbeitgeber. Üblicherweise kannst du in einem Kalenderjahr pro FIP-Mitglied einen FIP Freifahrtschein mit ein bis vier Feldern beantragen. Genauere Informationen findest du auf der Seite [FIP Beantragung](/general/fip-validity/). In der Regel ist eine Bearbeitungsfrist bei der Beantragung zu beachten. diff --git a/content/generalinformation/faq/what-rules-apply-to-fip-coupons/_index.en.md b/content/general/faq/what-rules-apply-to-fip-coupons/_index.en.md similarity index 84% rename from content/generalinformation/faq/what-rules-apply-to-fip-coupons/_index.en.md rename to content/general/faq/what-rules-apply-to-fip-coupons/_index.en.md index 7f84dd18b..83745bf07 100644 --- a/content/generalinformation/faq/what-rules-apply-to-fip-coupons/_index.en.md +++ b/content/general/faq/what-rules-apply-to-fip-coupons/_index.en.md @@ -3,6 +3,6 @@ title: "What rules apply to FIP Coupons?" weight: 8 --- -The issuance of FIP Coupons depends on your employer. Typically, in one calendar year you can apply for one FIP Coupon with one to four fields per FIP member. More detailed information can be found on the [FIP Application](/fip-validity/). +The issuance of FIP Coupons depends on your employer. Typically, in one calendar year you can apply for one FIP Coupon with one to four fields per FIP member. More detailed information can be found on the [FIP Application](/general/fip-validity/). As a rule, a processing deadline applies when applying. diff --git a/content/generalinformation/faq/what-rules-apply-to-fip-coupons/_index.fr.md b/content/general/faq/what-rules-apply-to-fip-coupons/_index.fr.md similarity index 82% rename from content/generalinformation/faq/what-rules-apply-to-fip-coupons/_index.fr.md rename to content/general/faq/what-rules-apply-to-fip-coupons/_index.fr.md index 618069059..182da75a2 100644 --- a/content/generalinformation/faq/what-rules-apply-to-fip-coupons/_index.fr.md +++ b/content/general/faq/what-rules-apply-to-fip-coupons/_index.fr.md @@ -3,6 +3,6 @@ title: "Quelles règles s’appliquent aux Coupons FIP ?" weight: 8 --- -L'émission des Coupons FIP dépend de votre employeur. En règle générale, en un an civil, vous pouvez demander un Coupon FIP avec une à quatre cases par membre FIP. Des informations plus détaillées sont disponibles sur la [Demande FIP](/fip-validity/). +L'émission des Coupons FIP dépend de votre employeur. En règle générale, en un an civil, vous pouvez demander un Coupon FIP avec une à quatre cases par membre FIP. Des informations plus détaillées sont disponibles sur la [Demande FIP](/general/fip-validity/). En règle générale, un délai de traitement s’applique lors de la demande. diff --git a/content/generalinformation/faq/where-can-i-get-discounted-tickets/_index.de.md b/content/general/faq/where-can-i-get-discounted-tickets/_index.de.md similarity index 100% rename from content/generalinformation/faq/where-can-i-get-discounted-tickets/_index.de.md rename to content/general/faq/where-can-i-get-discounted-tickets/_index.de.md diff --git a/content/generalinformation/faq/where-can-i-get-discounted-tickets/_index.en.md b/content/general/faq/where-can-i-get-discounted-tickets/_index.en.md similarity index 100% rename from content/generalinformation/faq/where-can-i-get-discounted-tickets/_index.en.md rename to content/general/faq/where-can-i-get-discounted-tickets/_index.en.md diff --git a/content/generalinformation/faq/where-can-i-get-discounted-tickets/_index.fr.md b/content/general/faq/where-can-i-get-discounted-tickets/_index.fr.md similarity index 100% rename from content/generalinformation/faq/where-can-i-get-discounted-tickets/_index.fr.md rename to content/general/faq/where-can-i-get-discounted-tickets/_index.fr.md diff --git a/content/generalinformation/faq/where-can-i-order-fip-coupons/_index.de.md b/content/general/faq/where-can-i-order-fip-coupons/_index.de.md similarity index 100% rename from content/generalinformation/faq/where-can-i-order-fip-coupons/_index.de.md rename to content/general/faq/where-can-i-order-fip-coupons/_index.de.md diff --git a/content/generalinformation/faq/where-can-i-order-fip-coupons/_index.en.md b/content/general/faq/where-can-i-order-fip-coupons/_index.en.md similarity index 100% rename from content/generalinformation/faq/where-can-i-order-fip-coupons/_index.en.md rename to content/general/faq/where-can-i-order-fip-coupons/_index.en.md diff --git a/content/generalinformation/faq/where-can-i-order-fip-coupons/_index.fr.md b/content/general/faq/where-can-i-order-fip-coupons/_index.fr.md similarity index 100% rename from content/generalinformation/faq/where-can-i-order-fip-coupons/_index.fr.md rename to content/general/faq/where-can-i-order-fip-coupons/_index.fr.md diff --git a/content/generalinformation/faq/where-do-i-get-my-fip-card/_index.de.md b/content/general/faq/where-do-i-get-my-fip-card/_index.de.md similarity index 100% rename from content/generalinformation/faq/where-do-i-get-my-fip-card/_index.de.md rename to content/general/faq/where-do-i-get-my-fip-card/_index.de.md diff --git a/content/generalinformation/faq/where-do-i-get-my-fip-card/_index.en.md b/content/general/faq/where-do-i-get-my-fip-card/_index.en.md similarity index 100% rename from content/generalinformation/faq/where-do-i-get-my-fip-card/_index.en.md rename to content/general/faq/where-do-i-get-my-fip-card/_index.en.md diff --git a/content/generalinformation/faq/where-do-i-get-my-fip-card/_index.fr.md b/content/general/faq/where-do-i-get-my-fip-card/_index.fr.md similarity index 100% rename from content/generalinformation/faq/where-do-i-get-my-fip-card/_index.fr.md rename to content/general/faq/where-do-i-get-my-fip-card/_index.fr.md diff --git a/content/generalinformation/faq/which-companies-accept-fip/_index.de.md b/content/general/faq/which-companies-accept-fip/_index.de.md similarity index 100% rename from content/generalinformation/faq/which-companies-accept-fip/_index.de.md rename to content/general/faq/which-companies-accept-fip/_index.de.md diff --git a/content/generalinformation/faq/which-companies-accept-fip/_index.en.md b/content/general/faq/which-companies-accept-fip/_index.en.md similarity index 100% rename from content/generalinformation/faq/which-companies-accept-fip/_index.en.md rename to content/general/faq/which-companies-accept-fip/_index.en.md diff --git a/content/generalinformation/faq/which-companies-accept-fip/_index.fr.md b/content/general/faq/which-companies-accept-fip/_index.fr.md similarity index 100% rename from content/generalinformation/faq/which-companies-accept-fip/_index.fr.md rename to content/general/faq/which-companies-accept-fip/_index.fr.md diff --git a/content/generalinformation/faq/who-is-entitled-to-fip/_index.de.md b/content/general/faq/who-is-entitled-to-fip/_index.de.md similarity index 100% rename from content/generalinformation/faq/who-is-entitled-to-fip/_index.de.md rename to content/general/faq/who-is-entitled-to-fip/_index.de.md diff --git a/content/generalinformation/faq/who-is-entitled-to-fip/_index.en.md b/content/general/faq/who-is-entitled-to-fip/_index.en.md similarity index 100% rename from content/generalinformation/faq/who-is-entitled-to-fip/_index.en.md rename to content/general/faq/who-is-entitled-to-fip/_index.en.md diff --git a/content/generalinformation/faq/who-is-entitled-to-fip/_index.fr.md b/content/general/faq/who-is-entitled-to-fip/_index.fr.md similarity index 100% rename from content/generalinformation/faq/who-is-entitled-to-fip/_index.fr.md rename to content/general/faq/who-is-entitled-to-fip/_index.fr.md diff --git a/content/fip-validity/index.de.md b/content/general/fip-validity/index.de.md similarity index 94% rename from content/fip-validity/index.de.md rename to content/general/fip-validity/index.de.md index 7361581f2..7aa90c808 100644 --- a/content/fip-validity/index.de.md +++ b/content/general/fip-validity/index.de.md @@ -2,6 +2,8 @@ draft: false title: "FIP Beantragung" pagefind_ignore: true +aliases: + - "/fip-validity/" --- Auf dieser Seite findest du alle Informationen, die deinen FIP Ausweis betreffen. Dazu gehören Informationen über die Ausgabe von FIP-Coupons, die Höhe des Rabatts sowie Informationen zur Beantragung. Da die Informationen abhängig vom Aussteller des FIP-Ausweises ist, kannst du diesen hier auswählen. Bitte beachte, dass wir derzeit noch keine Informationen haben, wenn dein Aussteller nicht gelistet ist. diff --git a/content/fip-validity/index.en.md b/content/general/fip-validity/index.en.md similarity index 93% rename from content/fip-validity/index.en.md rename to content/general/fip-validity/index.en.md index 41cfba719..73534ea36 100644 --- a/content/fip-validity/index.en.md +++ b/content/general/fip-validity/index.en.md @@ -2,6 +2,8 @@ draft: false title: "FIP Application" pagefind_ignore: true +aliases: + - "/fip-validity/" --- On this page you will find all information relating to your FIP Card. This includes information on the issuance of FIP Coupons, the level of the discount, and information on the application. Since the information depends on the issuer of the FIP Card, you can select it here. Please note that we currently have no information if your issuer is not listed. diff --git a/content/fip-validity/index.fr.md b/content/general/fip-validity/index.fr.md similarity index 94% rename from content/fip-validity/index.fr.md rename to content/general/fip-validity/index.fr.md index 6a88e075d..32472e0b8 100644 --- a/content/fip-validity/index.fr.md +++ b/content/general/fip-validity/index.fr.md @@ -2,6 +2,8 @@ draft: false title: "Demande FIP" pagefind_ignore: true +aliases: + - "/fip-validity/" --- Sur cette page, vous trouverez toutes les informations relatives à votre Carte FIP. Cela comprend des informations sur la délivrance des Coupons FIP, le niveau de la remise ainsi que des informations sur la demande. Comme les informations dépendent de l’émetteur de la Carte FIP, vous pouvez le sélectionner ici. Veuillez noter que nous n’avons actuellement aucune information si votre émetteur n’est pas répertorié. diff --git a/content/generalinformation/borderpoint.de.svg b/content/general/generalinformation/borderpoint.de.svg similarity index 100% rename from content/generalinformation/borderpoint.de.svg rename to content/general/generalinformation/borderpoint.de.svg diff --git a/content/generalinformation/borderpoint.en.svg b/content/general/generalinformation/borderpoint.en.svg similarity index 100% rename from content/generalinformation/borderpoint.en.svg rename to content/general/generalinformation/borderpoint.en.svg diff --git a/content/generalinformation/borderpoint.fr.svg b/content/general/generalinformation/borderpoint.fr.svg similarity index 100% rename from content/generalinformation/borderpoint.fr.svg rename to content/general/generalinformation/borderpoint.fr.svg diff --git a/content/generalinformation/borderstation.de.svg b/content/general/generalinformation/borderstation.de.svg similarity index 100% rename from content/generalinformation/borderstation.de.svg rename to content/general/generalinformation/borderstation.de.svg diff --git a/content/generalinformation/borderstation.en.svg b/content/general/generalinformation/borderstation.en.svg similarity index 100% rename from content/generalinformation/borderstation.en.svg rename to content/general/generalinformation/borderstation.en.svg diff --git a/content/generalinformation/borderstation.fr.svg b/content/general/generalinformation/borderstation.fr.svg similarity index 100% rename from content/generalinformation/borderstation.fr.svg rename to content/general/generalinformation/borderstation.fr.svg diff --git a/content/generalinformation/fip-coupon.webp b/content/general/generalinformation/fip-coupon.webp similarity index 100% rename from content/generalinformation/fip-coupon.webp rename to content/general/generalinformation/fip-coupon.webp diff --git a/content/generalinformation/fip-pass.webp b/content/general/generalinformation/fip-pass.webp similarity index 100% rename from content/generalinformation/fip-pass.webp rename to content/general/generalinformation/fip-pass.webp diff --git a/content/generalinformation/_index.de.md b/content/general/generalinformation/index.de.md similarity index 98% rename from content/generalinformation/_index.de.md rename to content/general/generalinformation/index.de.md index 13214d598..7e8be01ad 100644 --- a/content/generalinformation/_index.de.md +++ b/content/general/generalinformation/index.de.md @@ -2,6 +2,8 @@ title: "Übergreifende Infos" description: "Übergreifende Informationen zu FIP, FIP Ausweis (Internationale Ermäßigungskarte für Eisenbahnpersonal) sowie der Nutzung Internationaler Fahrvergünstigungen wie FIP 50 und FIP Freifahrtscheinen (Auslandsfreifahrten)." toc: true +aliases: + - "/generalinformation/" --- ## Allgemein @@ -32,7 +34,7 @@ Für die Nutzung von FIP-Vergünstigungen ist eine aktuelle Internationale Ermä Der FIP Ausweis hat je nach eigener Bahngesellschaft eine unterschiedliche Gültigkeitsdauer. Der FIP Ausweis gilt bereits einen Monat vor dem aufgedruckten ersten Gültigkeitsjahr (01.12. des Vorjahres) sowie einen Monat nach dem letzten Gültigkeitsjahr (31.01 des Folgejahres). -Die Gültigkeitsdauer deines FIP Ausweises kannst du auf der Seite [FIP Beantragung](/fip-validity/) herausfinden. +Die Gültigkeitsdauer deines FIP Ausweises kannst du auf der Seite [FIP Beantragung](/general/fip-validity/) herausfinden. Bei einigen Bahngesellschaften können Mitarbeitende auch für ihre Angehörigen FIP Ausweise erhalten und so FIP 50 Tickets erwerben. @@ -70,7 +72,7 @@ Am 03.03.2026 fahre ich nicht mit dem Zug, dafür wieder am 04.03. Also trage ic Um länger als acht Tage in einem Land bzw. bei einem Betreiber Zug fahren zu können, kann auch zwischendrin ein Tag kein Freifahrtschein benutzt werden und z. B. ein FIP 50 Ticket für die Fahrt an diesem Tag gekauft werden. Diese können unabhängig von einem Freifahrtschein jederzeit erworben werden. {{% /highlight %}} -![FIP Freifahrtschein](./fip-coupon.webp) +![FIP Freifahrtschein](fip-coupon.webp) ### FIP 50 Tickets @@ -104,7 +106,7 @@ FIP Vergünstigungen gelten nicht in Zügen der eigenen Bahngesellschaft. Daher Nicht immer ist die Fahrt mit FIP Tickets die günstigste Option. Vergünstigte FIP Tickets gewähren im Regelfall einen Rabatt auf den flexiblen Ticketpreis. Zuggebundene Tickets wie Sparpreise können trotzdem günstiger sein. -Zusätzlich gewähren einige Bahngesellschaften ihren eigenen Mitarbeitenden vergünstige Tickets für grenzüberschreitende Fahrten ins Ausland oder bis zur Grenze. Die Nutzung dieser Tickets kann für die Fahrt ins Ausland teilweise günstiger sein, als die Nutzung von FIP. Weitere Informationen zu diesen Angeboten findest du auf der Seite [FIP Beantragung](/fip-validity). +Zusätzlich gewähren einige Bahngesellschaften ihren eigenen Mitarbeitenden vergünstige Tickets für grenzüberschreitende Fahrten ins Ausland oder bis zur Grenze. Die Nutzung dieser Tickets kann für die Fahrt ins Ausland teilweise günstiger sein, als die Nutzung von FIP. Weitere Informationen zu diesen Angeboten findest du auf der Seite [FIP Beantragung](/general/fip-validity). ## Grenzpunkte @@ -145,11 +147,11 @@ Ich brauche also ein zusätzliches Ticket für die Fahrt zwischen Frankfurt Hbf Für Mitarbeitende einiger Länder ist eine zusätzliche Versteuerung von FIP Vergünstigungen notwendig, die zusätzliche Kosten verursachen kann. -Weitere Informationen findest du auf der Seite [FIP Beantragung](/fip-validity). +Weitere Informationen findest du auf der Seite [FIP Beantragung](/general/fip-validity). ## FAQ -{{< faq >}} +Das FAQ findest du auf der Seite [FAQ](/general/faq/). ## Zusätzliche nützliche Ressourcen diff --git a/content/generalinformation/_index.en.md b/content/general/generalinformation/index.en.md similarity index 97% rename from content/generalinformation/_index.en.md rename to content/general/generalinformation/index.en.md index ab6004db8..92ef07763 100644 --- a/content/generalinformation/_index.en.md +++ b/content/general/generalinformation/index.en.md @@ -2,6 +2,8 @@ title: "General Information" description: "General information about FIP, the FIP Card (International Discount Card for Railway Staff), and the use of international travel concessions such as FIP 50 Tickets and FIP Coupons (free international travel)." toc: true +aliases: + - "/generalinformation/" --- ## General @@ -32,7 +34,7 @@ To use FIP discounts, you need a valid International Discount Card for Railway S The validity period of the FIP Card depends on your railway company. The FIP Card is valid starting one month before the printed first year of validity (from December 1st of the previous year) and up to one month after the last year of validity (until January 31th of the following year). -You can find out the validity period of your FIP Card on our [FIP Application](/fip-validity/). +You can find out the validity period of your FIP Card on our [FIP Application](/general/fip-validity/). Some railway companies also allow employees to obtain FIP Cards for their dependents, allowing them to purchase FIP 50 Tickets. @@ -70,7 +72,7 @@ On 03.03.2026 I don't travel by train, but I do on 04.03. So I fill in 04.03.202 To travel by train for longer than eight days in one country or with one operator, you can skip a day without using a coupon and instead purchase an FIP 50 Ticket for that day's journey. These can be purchased at any time independently of a coupon. {{% /highlight %}} -![FIP Coupon](./fip-coupon.webp) +![FIP Coupon](fip-coupon.webp) ### FIP 50 Tickets @@ -104,7 +106,7 @@ FIP discounts never apply on trains operated by your own railway company. Theref Traveling with FIP tickets is not always the cheapest option. Discounted FIP tickets typically offer a discount on the flexible ticket price. However, train-bound tickets such as savings fares can still be cheaper. -In addition, some railway companies offer their own employees discounted tickets for cross-border travel into other countries or up to the border. Using these tickets can sometimes be cheaper for travel abroad than using FIP. More information about these offers are available in the [FIP Application](/fip-validity). +In addition, some railway companies offer their own employees discounted tickets for cross-border travel into other countries or up to the border. Using these tickets can sometimes be cheaper for travel abroad than using FIP. More information about these offers are available in the [FIP Application](/general/fip-validity). ## Border Points @@ -145,11 +147,11 @@ I therefore need an additional ticket for the journey between Frankfurt Hbf and For employees of some countries, additional taxation of FIP benefits is necessary, which can result in additional costs. -More information is available in the [FIP Application](/fip-validity). +More information is available in the [FIP Application](/general/fip-validity). ## FAQ -{{< faq >}} +You can find the FAQ on the page [FAQ](/general/faq/). ## Additional useful resources diff --git a/content/generalinformation/_index.fr.md b/content/general/generalinformation/index.fr.md similarity index 98% rename from content/generalinformation/_index.fr.md rename to content/general/generalinformation/index.fr.md index 83079ab6e..32f9ebb11 100644 --- a/content/generalinformation/_index.fr.md +++ b/content/general/generalinformation/index.fr.md @@ -2,6 +2,8 @@ title: "Informations générales" description: "Informations générales sur le FIP, la Carte FIP (Carte Internationale de Réduction pour le Personnel Ferroviaire) ainsi que l’utilisation des avantages de voyage internationaux tels que les Billets FIP 50 et les Coupons FIP (permis FIP)." toc: true +aliases: + - "/generalinformation/" --- ## Généralités @@ -32,7 +34,7 @@ Pour bénéficier des réductions FIP, il est nécessaire de disposer d’une Ca La durée de validité de la Carte FIP dépend de la compagnie ferroviaire émettrice. En règle générale, la Carte FIP est valable à partir du 1ᵉʳ décembre de l’année précédant la première année de validité imprimée, et jusqu’au 31 janvier de l’année suivant la dernière année de validité. -Vous pouvez consulter la durée de validité de votre Carte FIP sur notre [Demande FIP](/fip-validity/). +Vous pouvez consulter la durée de validité de votre Carte FIP sur notre [Demande FIP](/general/fip-validity/). Certaines entreprises ferroviaires permettent également aux employés d’obtenir des Cartes FIP pour leurs ayants droit, leur permettant d’acheter des Billets FIP 50. @@ -70,7 +72,7 @@ Le 03.03.2026, je ne voyage pas en train, mais je le fais le 04.03. Je remplis d Pour voyager en train pendant plus de huit jours dans un pays ou avec un opérateur, vous pouvez ignorer un jour sans utiliser de coupon et acheter plutôt un Billet FIP 50 pour le voyage de ce jour. Ceux-ci peuvent être achetés à tout moment indépendamment d’un coupon. {{% /highlight %}} -![Coupon FIP](./fip-coupon.webp) +![Coupon FIP](fip-coupon.webp) ### Billets FIP 50 @@ -104,7 +106,7 @@ Les réductions FIP ne s’appliquent jamais sur les trains exploités par votre Ce n'est pas toujours le voyage avec des billets FIP qui est la solution la moins chère. Les billets FIP réduits accordent généralement une réduction sur le prix du billet flexible. Cependant, les billets liés aux trains, comme les tarifs réduits, peuvent néanmoins être moins chers. -De plus, certaines compagnies ferroviaires accordent à leurs propres employés des billets à tarif réduit pour les trajets transfrontaliers vers l’étranger ou jusqu’à la frontière. L’utilisation de ces billets peut parfois être moins chère que l’utilisation du FIP pour le voyage à l’étranger. Vous trouverez plus d’informations sur ces offres dans la [Demande FIP](/fip-validity). +De plus, certaines compagnies ferroviaires accordent à leurs propres employés des billets à tarif réduit pour les trajets transfrontaliers vers l’étranger ou jusqu’à la frontière. L’utilisation de ces billets peut parfois être moins chère que l’utilisation du FIP pour le voyage à l’étranger. Vous trouverez plus d’informations sur ces offres dans la [Demande FIP](/general/fip-validity). ## Points frontières @@ -145,11 +147,11 @@ J’ai donc besoin d’un billet supplémentaire pour le voyage entre Francfort Pour les employés de certains pays, une taxation supplémentaire des avantages FIP est nécessaire, ce qui peut entraîner des coûts supplémentaires. -Vous trouverez plus d’informations dans la [Demande FIP](/fip-validity). +Vous trouverez plus d’informations dans la [Demande FIP](/general/fip-validity). ## FAQ -{{< faq >}} +Vous pouvez trouver la FAQ sur la page [FAQ](/general/faq/). ## Ressources utiles supplémentaires diff --git a/content/generalinformation/faq/_index.de.md b/content/generalinformation/faq/_index.de.md deleted file mode 100644 index 26f30a86f..000000000 --- a/content/generalinformation/faq/_index.de.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -title: "FAQ" - -cascade: - - build: - list: local - publishResources: false - render: never ---- diff --git a/content/generalinformation/faq/_index.en.md b/content/generalinformation/faq/_index.en.md deleted file mode 100644 index 26f30a86f..000000000 --- a/content/generalinformation/faq/_index.en.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -title: "FAQ" - -cascade: - - build: - list: local - publishResources: false - render: never ---- diff --git a/content/generalinformation/faq/_index.fr.md b/content/generalinformation/faq/_index.fr.md deleted file mode 100644 index 26f30a86f..000000000 --- a/content/generalinformation/faq/_index.fr.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -title: "FAQ" - -cascade: - - build: - list: local - publishResources: false - render: never ---- diff --git a/content/operator/db/validity.yaml b/content/operator/db/validity.yaml index 776cc0056..364452341 100644 --- a/content/operator/db/validity.yaml +++ b/content/operator/db/validity.yaml @@ -110,15 +110,15 @@ general: de: | Die Beantragung von FIP Freifahrtscheinen für DB Mitarbeitende muss mind. vier Wochen vor Gültigkeitsbeginn über das DB Personalportal erfolgen. - Freifahrtscheine können mit 1 bis 4 Feldern beantragt werden. Wenn bereits ein Freifahrtschein mit weniger als vier Feldern im gleichen Jahr beantragt wurde, verfallen die weiteren Felder und können nicht erneut beantragt werden. Jedes Feld wird individuell versteuert. Mehr Informationen dazu unter [Versteuerung](/fip-validity#taxation). + Freifahrtscheine können mit 1 bis 4 Feldern beantragt werden. Wenn bereits ein Freifahrtschein mit weniger als vier Feldern im gleichen Jahr beantragt wurde, verfallen die weiteren Felder und können nicht erneut beantragt werden. Jedes Feld wird individuell versteuert. Mehr Informationen dazu unter [Versteuerung](/general/fip-validity#taxation). en: | FIP Coupon requests for DB employees must be submitted via the DB employee portal at least four weeks before the start of validity. - Coupons can be requested with 1 to 4 fields. If a coupon with fewer than four fields has already been requested in the same year, the remaining fields expire and cannot be requested again. Each field is taxed individually. More information is available under [Taxation](/fip-validity#taxation). + Coupons can be requested with 1 to 4 fields. If a coupon with fewer than four fields has already been requested in the same year, the remaining fields expire and cannot be requested again. Each field is taxed individually. More information is available under [Taxation](/general/fip-validity#taxation). fr: | Les demandes de Coupons FIP pour les employés DB doivent être soumises via le portail des employés DB au moins quatre semaines avant le début de validité. - Les Coupons peuvent être demandés avec 1 à 4 champs. Si un coupon avec moins de quatre champs a déjà été demandé la même année, les champs restants expirent et ne peuvent pas être redemandés. Chaque champ est imposé individuellement. Plus d’informations sous [Imposition](/fip-validity#taxation). + Les Coupons peuvent être demandés avec 1 à 4 champs. Si un coupon avec moins de quatre champs a déjà été demandé la même année, les champs restants expirent et ne peuvent pas être redemandés. Chaque champ est imposé individuellement. Plus d’informations sous [Imposition](/general/fip-validity#taxation). sncf: fip-coupon: active: *coupon-4fields diff --git a/i18n/de.yaml b/i18n/de.yaml index aedf53ef9..d05e0fddb 100644 --- a/i18n/de.yaml +++ b/i18n/de.yaml @@ -37,7 +37,8 @@ contact: unabhängiges Community-Projekt und können daher die Ausstellung von FIP Ausweisen und Freifahrtscheinen nicht beeinflussen. Alle Informationen, die uns zur Beantragung von FIP Ausweisen und FIP Freifahrtscheinen - vorliegen, findest du auf der Seite [FIP Beantragung](/fip-validity). + vorliegen, findest du auf der Seite [FIP + Beantragung](/general/fip-validity). Für weitere Informationen wende dich an deine zuständige Personalabteilung. @@ -46,7 +47,7 @@ contact: label: Allgemeine Frage zur FIP-Nutzung note: >- Allgemeine Fragen beantworten wir auf der Seite [Übergreifende - Informationen](/generalinformation). Nutze auch gern die Suche für + Informationen](/general/generalinformation). Nutze auch gern die Suche für konkrete Suchbegriffe. Detaillierte Informationen sind auf [Landesseiten](/country) und @@ -121,7 +122,7 @@ fipValidity: dann kannst du die Freifahrtscheine über deinen Arbeitgeber beantragen. Bitte beachte, dass wir bei der Ausgabe der Freifahrtscheine nicht weiterhelfen können. Einen Überblick aller Freifahrtscheine erhältst du auf - der Seite [FIP Beantragung](/fip-validity). + der Seite [FIP Beantragung](/general/fip-validity). fip-global-fare: FIP Globalpreis fip-reduced-ticket: FIP Ermäßigtes Ticket fip-reduced-ticket-description: >- @@ -129,7 +130,7 @@ fipValidity: 50 oder FIP 75 bekannt. Der Rabatt beläuft sich meistens auf 50%, teilweise auch 75%. Um herauszufinden, wie hoch dein Rabatt ist, wähle zunächst den Aussteller deines FIP Ausweises aus. Einen Überblick aller Rabatte erhälst - du auf der Seite [FIP Beantragung](/fip-validity). + du auf der Seite [FIP Beantragung](/general/fip-validity). general: Übergreifendes issuer: Aussteller des FIP Ausweises national-discountsHeading: Nationale Vergünstigungen (kein FIP) @@ -185,6 +186,15 @@ menu: dropdown-label: Verfügbare Länder label: Länder title: Länder-Dropdown öffnen + generalinformation-dropdown: + aria-label: Allgemeines-Dropdown öffnen + dropdown-label: Verfügbare Seiten im Bereich Allgemeines + items: + faq: FAQ + fip-validity: FIP Beantragung + general-information: Allgemeine Informationen + label: Allgemeines + title: Allgemeines-Dropdown öffnen open: label: Menü title: Menü öffnen diff --git a/i18n/en.yaml b/i18n/en.yaml index 064b57268..95a81c925 100644 --- a/i18n/en.yaml +++ b/i18n/en.yaml @@ -36,8 +36,8 @@ contact: Unfortunately, we are unable to help in this case. We are an independent community project and therefore cannot influence the issuance of FIP Cards and FIP Coupons. All information we have regarding the application for FIP - Cards and FIP Coupons can be found on the [FIP Application](/fip-validity) - page. + Cards and FIP Coupons can be found on the [FIP + Application](/general/fip-validity) page. For further information, please contact your responsible HR department. formAriaLabel: Contact Form @@ -45,8 +45,8 @@ contact: label: General question about using FIP note: >- We answer general questions on the [General - Information](/generalinformation) page. Feel free to use the search for - specific terms. + Information](/general/generalinformation) page. Feel free to use the + search for specific terms. Detailed information can be found on [country pages](/country) and [operator pages](/operator). @@ -118,14 +118,15 @@ fipValidity: First select the issuer of your FIP Card. If you are eligible, you can request the FIP Coupons through your employer. Please note that we are unable to assist with the issuance of FIP Coupons. You can find an overview - of all FIP Coupons in the [FIP Application](/fip-validity). + of all FIP Coupons in the [FIP Application](/general/fip-validity). fip-global-fare: FIP Global Fare fip-reduced-ticket: FIP Reduced Ticket fip-reduced-ticket-description: >- Railway companies typically offer a discount with FIP, also known as FIP50 or FIP75. The discount is usually 50 %, sometimes 75 %. To find out what discount applies to you, first select the issuer of your FIP Card. You can - find an overview of all discounts in the [FIP Application](/fip-validity). + find an overview of all discounts in the [FIP + Application](/general/fip-validity). general: General issuer: FIP Card Issuer national-discountsHeading: National Discounts (Non-FIP) @@ -181,6 +182,15 @@ menu: dropdown-label: Available countries label: Countries title: Open Country-Dropdown + generalinformation-dropdown: + aria-label: Open General dropdown + dropdown-label: Available pages in General + items: + faq: FAQ + fip-validity: FIP Application + general-information: General Information + label: General + title: Open General dropdown open: label: Menu title: Open Menu diff --git a/i18n/fr.yaml b/i18n/fr.yaml index 326656080..c252a9434 100644 --- a/i18n/fr.yaml +++ b/i18n/fr.yaml @@ -37,7 +37,7 @@ contact: un projet communautaire indépendant et ne pouvons donc pas influencer la délivrance des Cartes FIP et Coupons FIP. Toutes les informations dont nous disposons concernant la demande de Cartes FIP et de Coupons FIP se - trouvent sur la page [Demande FIP](/fip-validity). + trouvent sur la page [Demande FIP](/general/fip-validity). Pour plus d'informations, veuillez contacter votre service des ressources humaines compétent. @@ -46,8 +46,8 @@ contact: label: Question générale sur l'utilisation du FIP note: >- Nous répondons aux questions générales sur la page [Informations - générales](/generalinformation). N'hésitez pas à utiliser la recherche - pour des termes spécifiques. + générales](/general/generalinformation). N'hésitez pas à utiliser la + recherche pour des termes spécifiques. Des informations détaillées se trouvent sur les [pages des pays](/country) et les [pages des opérateurs](/operator). @@ -123,7 +123,7 @@ fipValidity: vous pouvez demander les Coupons FIP auprès de votre employeur. Veuillez noter que nous ne sommes pas en mesure d'aider à l'obtention des Coupons FIP. Vous trouverez un aperçu de tous les Coupons FIP dans la [Demande - FIP](/fip-validity). + FIP](/general/fip-validity). fip-global-fare: Tarif Global FIP fip-reduced-ticket: Billet FIP à tarif réduit fip-reduced-ticket-description: >- @@ -132,7 +132,7 @@ fipValidity: habituellement de 50 %, parfois de 75 %. Pour savoir quelle réduction s'applique à votre cas, sélectionnez d'abord l'émetteur de votre Carte FIP. Vous trouverez un aperçu de toutes les réductions dans la [Demande - FIP](/fip-validity). + FIP](/general/fip-validity). general: Général issuer: Émetteur de la carte FIP national-discountsHeading: Réductions nationales (non-FIP) @@ -191,6 +191,15 @@ menu: dropdown-label: Pays disponibles label: Pays title: Menu déroulant du pays ouvert + generalinformation-dropdown: + aria-label: Ouvrir le menu déroulant Général + dropdown-label: Pages disponibles dans Général + items: + faq: FAQ + fip-validity: Demande FIP + general-information: Informations générales + label: Général + title: Ouvrir le menu déroulant Général open: label: Menu title: Ouvrir le menu diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index f7e2e86fc..91f93cc74 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -32,7 +32,7 @@ {{ partial "search" . }} - {{ if or (eq .Page.Type "country") (eq .Page.Type "operator") (eq .Page.Type "generalinformation") }} + {{ if or (eq .Page.Type "country") (eq .Page.Type "operator") (eq .Page.Type "general") }} {{ partial "snackbar" . }} {{ end }} diff --git a/layouts/_default/home.html b/layouts/_default/home.html index c96ff1d8b..c55831426 100644 --- a/layouts/_default/home.html +++ b/layouts/_default/home.html @@ -18,7 +18,7 @@
- {{ partial "shortcut-tile" (.Site.GetPage "generalinformation") }} + {{ partial "shortcut-tile" (.Site.GetPage "general/generalinformation") }} {{ partial "shortcut-tile" (.Site.GetPage "country") }} {{ partial "shortcut-tile" (.Site.GetPage "operator") }} {{ partial "shortcut-tile" (.Site.GetPage "fip-validity") }} diff --git a/layouts/booking/single.html b/layouts/booking/single.html index c1fe1ed90..2d5045151 100644 --- a/layouts/booking/single.html +++ b/layouts/booking/single.html @@ -6,7 +6,7 @@ {{ partial "link" (dict - "Destination" (print .Site.Params.githubDevUrl "blob/main/content" .Path "/index." .Language ".md") + "Destination" (print .Site.Params.githubDevUrl "blob/main/content/" .File.Path) "Text" ((print (partial "icon" "edit_square") (T "editPage")) | safeHTML) ) }} diff --git a/layouts/generalinformation/list.html b/layouts/general/single.html similarity index 100% rename from layouts/generalinformation/list.html rename to layouts/general/single.html diff --git a/layouts/news/single.html b/layouts/news/single.html index c0fe6899f..b4ea98bd6 100644 --- a/layouts/news/single.html +++ b/layouts/news/single.html @@ -27,7 +27,7 @@

{{ T "news.further" }}

{{ partial "link" (dict - "Destination" (print .Site.Params.githubDevUrl "blob/main/content" .Path "/index." .Language ".md") + "Destination" (print .Site.Params.githubDevUrl "blob/main/content/" .File.Path) "Text" ((print (partial "icon" "edit_square") (T "editPage")) | safeHTML) ) }} diff --git a/layouts/partials/contentNavigation.html b/layouts/partials/contentNavigation.html index 99ee93963..d19212d92 100644 --- a/layouts/partials/contentNavigation.html +++ b/layouts/partials/contentNavigation.html @@ -62,7 +62,7 @@

{{ .Title }}

  • {{ partial "link" (dict - "Destination" (print .Site.Params.githubDevUrl "blob/main/content" .Path "/index." .Language ".md") + "Destination" (print .Site.Params.githubDevUrl "blob/main/content/" .File.Path) "Text" ((print (partial "icon" "edit_square" ) (T "editPage")) | safeHTML) ) }} diff --git a/layouts/partials/navigation.html b/layouts/partials/navigation.html index 798690b4f..88d6dac0e 100644 --- a/layouts/partials/navigation.html +++ b/layouts/partials/navigation.html @@ -109,14 +109,42 @@ -}}
    • -
  • - {{ $informationPage := site.GetPage "generalInformation" }} - {{- partial "link" - (dict - "Destination" $informationPage.RelPermalink - "Text" $informationPage.Title - ) - -}} +
  • + +
    • diff --git a/layouts/partials/structuredData.html b/layouts/partials/structuredData.html index 24ea0431b..b874b563c 100644 --- a/layouts/partials/structuredData.html +++ b/layouts/partials/structuredData.html @@ -1,15 +1,17 @@ {{ $dateMachine := partial "helper/dateMachine" . }} {{ $mainEntity := "" }} +{{ $faqPages := slice }} +{{ if and .File (eq .File.Dir "general/faq/") }} + {{ $faqPages = sort .Pages "Weight" }} +{{ end }} {{ if (or (eq .Page.Type "country") (eq .Page.Type "operator")) }} {{ $mainEntity = "Article" }} {{ else if eq .Page.Type "news" }} {{ $mainEntity = "NewsArticle" }} -{{ else if eq .Page.Type "generalinformation" }} +{{ else if gt (len $faqPages) 0 }} {{ $mainEntity = "FAQPage" }} {{ end }} -{{ $faq := site.GetPage "section" "generalinformation/faq" }} - {{ $image := (partial "helper/contentImage" .).Permalink }}