diff --git a/content/general/faq/_index.de.md b/content/general/faq/_index.de.md index 2f004a209..edc7569f0 100644 --- a/content/general/faq/_index.de.md +++ b/content/general/faq/_index.de.md @@ -1,6 +1,5 @@ --- title: "FAQ" -layout: "list" --- {{< faq >}} diff --git a/content/general/faq/_index.en.md b/content/general/faq/_index.en.md index 2f004a209..edc7569f0 100644 --- a/content/general/faq/_index.en.md +++ b/content/general/faq/_index.en.md @@ -1,6 +1,5 @@ --- title: "FAQ" -layout: "list" --- {{< faq >}} diff --git a/content/general/faq/_index.fr.md b/content/general/faq/_index.fr.md index 2f004a209..edc7569f0 100644 --- a/content/general/faq/_index.fr.md +++ b/content/general/faq/_index.fr.md @@ -1,6 +1,5 @@ --- title: "FAQ" -layout: "list" --- {{< faq >}} diff --git a/content/general/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/general/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/general/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/general/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/general/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/general/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/general/faq/exceptions-fip-coupon/_index.de.md b/content/general/faq/exceptions-fip-coupon/index.de.md similarity index 100% rename from content/general/faq/exceptions-fip-coupon/_index.de.md rename to content/general/faq/exceptions-fip-coupon/index.de.md diff --git a/content/general/faq/exceptions-fip-coupon/_index.en.md b/content/general/faq/exceptions-fip-coupon/index.en.md similarity index 100% rename from content/general/faq/exceptions-fip-coupon/_index.en.md rename to content/general/faq/exceptions-fip-coupon/index.en.md diff --git a/content/general/faq/exceptions-fip-coupon/_index.fr.md b/content/general/faq/exceptions-fip-coupon/index.fr.md similarity index 100% rename from content/general/faq/exceptions-fip-coupon/_index.fr.md rename to content/general/faq/exceptions-fip-coupon/index.fr.md diff --git a/content/general/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/general/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/general/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/general/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/general/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/general/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/general/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/general/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/general/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/general/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/general/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/general/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/general/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/general/faq/meaning-of-a-field/_index.de.md rename to content/general/faq/meaning-of-a-field/index.de.md diff --git a/content/general/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/general/faq/meaning-of-a-field/_index.en.md rename to content/general/faq/meaning-of-a-field/index.en.md diff --git a/content/general/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/general/faq/meaning-of-a-field/_index.fr.md rename to content/general/faq/meaning-of-a-field/index.fr.md diff --git a/content/general/faq/number-of-fields/_index.de.md b/content/general/faq/number-of-fields/index.de.md similarity index 100% rename from content/general/faq/number-of-fields/_index.de.md rename to content/general/faq/number-of-fields/index.de.md diff --git a/content/general/faq/number-of-fields/_index.en.md b/content/general/faq/number-of-fields/index.en.md similarity index 100% rename from content/general/faq/number-of-fields/_index.en.md rename to content/general/faq/number-of-fields/index.en.md diff --git a/content/general/faq/number-of-fields/_index.fr.md b/content/general/faq/number-of-fields/index.fr.md similarity index 100% rename from content/general/faq/number-of-fields/_index.fr.md rename to content/general/faq/number-of-fields/index.fr.md diff --git a/content/general/faq/train-reservation/_index.de.md b/content/general/faq/train-reservation/index.de.md similarity index 100% rename from content/general/faq/train-reservation/_index.de.md rename to content/general/faq/train-reservation/index.de.md diff --git a/content/general/faq/train-reservation/_index.en.md b/content/general/faq/train-reservation/index.en.md similarity index 100% rename from content/general/faq/train-reservation/_index.en.md rename to content/general/faq/train-reservation/index.en.md diff --git a/content/general/faq/train-reservation/_index.fr.md b/content/general/faq/train-reservation/index.fr.md similarity index 100% rename from content/general/faq/train-reservation/_index.fr.md rename to content/general/faq/train-reservation/index.fr.md diff --git a/content/general/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/general/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/general/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/general/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/general/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/general/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/general/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/general/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/general/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/general/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/general/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/general/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/general/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/general/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/general/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/general/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/general/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/general/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/general/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 100% rename from content/general/faq/what-rules-apply-to-fip-coupons/_index.de.md rename to content/general/faq/what-rules-apply-to-fip-coupons/index.de.md diff --git a/content/general/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 100% rename from content/general/faq/what-rules-apply-to-fip-coupons/_index.en.md rename to content/general/faq/what-rules-apply-to-fip-coupons/index.en.md diff --git a/content/general/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 100% rename from content/general/faq/what-rules-apply-to-fip-coupons/_index.fr.md rename to content/general/faq/what-rules-apply-to-fip-coupons/index.fr.md diff --git a/content/general/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/general/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/general/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/general/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/general/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/general/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/general/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/general/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/general/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/general/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/general/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/general/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/general/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/general/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/general/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/general/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/general/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/general/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/general/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/general/faq/which-companies-accept-fip/_index.de.md rename to content/general/faq/which-companies-accept-fip/index.de.md diff --git a/content/general/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/general/faq/which-companies-accept-fip/_index.en.md rename to content/general/faq/which-companies-accept-fip/index.en.md diff --git a/content/general/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/general/faq/which-companies-accept-fip/_index.fr.md rename to content/general/faq/which-companies-accept-fip/index.fr.md diff --git a/content/general/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/general/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/general/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/general/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/general/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/general/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/general/fip-validity/index.de.md b/content/general/fip-validity/index.de.md index 58037b093..7aa90c808 100644 --- a/content/general/fip-validity/index.de.md +++ b/content/general/fip-validity/index.de.md @@ -2,7 +2,6 @@ draft: false title: "FIP Beantragung" pagefind_ignore: true -layout: "list" aliases: - "/fip-validity/" --- diff --git a/content/general/fip-validity/index.en.md b/content/general/fip-validity/index.en.md index 81f6cca46..73534ea36 100644 --- a/content/general/fip-validity/index.en.md +++ b/content/general/fip-validity/index.en.md @@ -2,7 +2,6 @@ draft: false title: "FIP Application" pagefind_ignore: true -layout: "list" aliases: - "/fip-validity/" --- diff --git a/content/general/fip-validity/index.fr.md b/content/general/fip-validity/index.fr.md index c3b3f7e90..32472e0b8 100644 --- a/content/general/fip-validity/index.fr.md +++ b/content/general/fip-validity/index.fr.md @@ -2,7 +2,6 @@ draft: false title: "Demande FIP" pagefind_ignore: true -layout: "list" aliases: - "/fip-validity/" --- diff --git a/layouts/_partials/nav-dropdown.html b/layouts/_partials/nav-dropdown.html index ab689579d..309829344 100644 --- a/layouts/_partials/nav-dropdown.html +++ b/layouts/_partials/nav-dropdown.html @@ -1,44 +1,37 @@ -{{- $id := .id -}} -{{- $key := .key -}} -{{- $items := .items -}} -{{- $currentPage := .currentPage -}} -{{- $textType := (.textType | default "none") -}} -{{- $vertical := .vertical -}}
  • - {{- with .topDivider }}{{- end }} - {{- with .bottomDivider }}{{- end }}
    • diff --git a/layouts/_partials/navigation.html b/layouts/_partials/navigation.html index 43cbe6e46..620ab918e 100644 --- a/layouts/_partials/navigation.html +++ b/layouts/_partials/navigation.html @@ -22,25 +22,25 @@
  • {{ $currentPage := . }} + {{ partial "nav-dropdown" (dict "id" "navbar-country-selection" "key" "menu.country-dropdown" "items" (where site.RegularPages "Section" "country") "currentPage" $currentPage "textType" "flag" - "topDivider" true - "bottomDivider" true ) }} + {{ partial "nav-dropdown" (dict "id" "navbar-operator-selection" "key" "menu.operator-dropdown" "items" (where site.RegularPages "Section" "operator") "currentPage" $currentPage "textType" "operator-logo" - "bottomDivider" true ) }} +
  • {{ $news := site.GetPage "news" }} {{- partial "link" @@ -57,11 +57,10 @@ "key" "menu.generalinformation-dropdown" "items" $generalSection.Pages.ByTitle "currentPage" $currentPage - "textType" "none" "vertical" true - "bottomDivider" true ) }} +
  • diff --git a/layouts/booking/list.html b/layouts/booking/list.html index 7743b143e..2a0fbfd02 100644 --- a/layouts/booking/list.html +++ b/layouts/booking/list.html @@ -1,6 +1,6 @@ {{ define "main" }}
    -

    {{ .Title }}

    +

    {{ .Title }}

    {{ .Content }}