refactor: Minor improvements to the navigation structure

content/general/faq/_index.de.md

@@ -1,6 +1,5 @@
 ---
 title: "FAQ"
-layout: "list"
 ---
 
 {{< faq >}}

content/general/faq/_index.en.md

@@ -1,6 +1,5 @@
 ---
 title: "FAQ"
-layout: "list"
 ---
 
 {{< faq >}}

content/general/faq/_index.fr.md

@@ -1,6 +1,5 @@
 ---
 title: "FAQ"
-layout: "list"
 ---
 
 {{< faq >}}

content/general/fip-validity/index.de.md

@@ -2,7 +2,6 @@
 draft: false
 title: "FIP Beantragung"
 pagefind_ignore: true
-layout: "list"
 aliases:
   - "/fip-validity/"
 ---

content/general/fip-validity/index.en.md

@@ -2,7 +2,6 @@
 draft: false
 title: "FIP Application"
 pagefind_ignore: true
-layout: "list"
 aliases:
   - "/fip-validity/"
 ---

content/general/fip-validity/index.fr.md

@@ -2,7 +2,6 @@
 draft: false
 title: "Demande FIP"
 pagefind_ignore: true
-layout: "list"
 aliases:
   - "/fip-validity/"
 ---

layouts/_default/list.html

@@ -1,7 +1,7 @@
 {{ define "main" }}
   <div class="o-list">
     <div>
-      <h1 data-pagefind-meta="title">{{ .Title }}</h1>
+      <h1>{{ .Title }}</h1>
       {{ .Content }}
       {{ range .Pages }}
         {{ partial "teaser.html" (dict "listview" "true" "page" .) }}

layouts/booking/list.html

@@ -1,6 +1,6 @@
 {{ define "main" }}
   <div class="o-list o-list__container">
-    <h1 data-pagefind-meta="title">{{ .Title }}</h1>
+    <h1>{{ .Title }}</h1>
     {{ .Content }}
     <ul aria-labelledby="booking-title">
       {{ range .Pages }}

layouts/general/list.html

@@ -1,6 +1,6 @@
 {{ define "main" }}
   <article class="o-list o-list__container">
-    <h1 data-pagefind-meta="title">{{ .Title }}</h1>
+    <h1>{{ .Title }}</h1>
     {{ .Content }}
   </article>
 {{ end }}

layouts/news/list.html

@@ -1,7 +1,7 @@
 {{ define "main" }}
   <article class="o-list o-list--news">
     <div>
-      <h1 data-pagefind-meta="title">{{ .Title }}</h1>
+      <h1>{{ .Title }}</h1>
       {{ .Content }}
       <div>
         {{ range .Pages }}

layouts/operator/list.html

@@ -1,6 +1,6 @@
 {{ define "main" }}
   <article class="o-list o-list__container">
-    <h1 data-pagefind-meta="title">{{ .Title }}</h1>
+    <h1>{{ .Title }}</h1>
     {{ .Content }}
     <ul class="o-list__list">
       {{ range .Pages }}

layouts/partials/nav-dropdown.html

@@ -1,44 +1,37 @@
-{{- $id := .id -}}
-{{- $key := .key -}}
-{{- $items := .items -}}
-{{- $currentPage := .currentPage -}}
-{{- $textType := (.textType | default "none") -}}
-{{- $vertical := .vertical -}}
 <li class="o-header__item o-dropdown">
-  {{- with .topDivider }}<hr aria-hidden="true" />{{- end }}
   <button
-    id="{{ $id }}-button"
+    id="{{ .id }}-button"
     class="o-dropdown__button"
     aria-expanded="false"
     aria-haspopup="listbox"
-    aria-controls="{{ $id }}-dropdown"
-    title="{{ T (printf "%s.title" $key) }}"
-    aria-label="{{ T (printf "%s.aria-label" $key) }}"
+    aria-controls="{{ .id }}-dropdown"
+    title="{{ T (printf "%s.title" .key) }}"
+    aria-label="{{ T (printf "%s.aria-label" .key) }}"
   >
-    <span>{{ T (printf "%s.label" $key) }}</span>
+    <span>{{ T (printf "%s.label" .key) }}</span>
     <div class="o-dropdown__icon">
       {{ partial "icon" "keyboard_arrow_down" }}
     </div>
   </button>
   <menu
-    id="{{ $id }}-dropdown"
+    id="{{ .id }}-dropdown"
     class="o-dropdown__menu o-dropdown__menu--below {{ if .vertical }}
       o-dropdown__menu--vertical
     {{ end }}"
     role="listbox"
     aria-hidden="true"
-    aria-label="{{ T (printf "%s.dropdown-label" $key) }}"
+    aria-label="{{ T (printf "%s.dropdown-label" .key) }}"
   >
-    {{ range $items }}
+    {{ range .items }}
       {{- $prefix := "" -}}
-      {{- if eq $textType "flag" -}}
+      {{- if eq $.textType "flag" -}}
         {{- $prefix = partial "flag" (dict "country" .File.ContentBaseName) -}}
-      {{- else if eq $textType "operator-logo" -}}
+      {{- else if eq $.textType "operator-logo" -}}
         {{- $prefix = partial "operator-logo" (dict "operator" .File.ContentBaseName) -}}
       {{- end -}}
       <li
         class="o-dropdown__item"
-        {{ if (.Eq $currentPage) }}aria-selected="true"{{ end }}
+        {{ if (.Eq $.currentPage) }}aria-selected="true"{{ end }}
       >
         {{- partial "link"
           (dict
@@ -49,5 +42,4 @@
       </li>
     {{ end }}
   </menu>
-  {{- with .bottomDivider }}<hr aria-hidden="true" />{{- end }}
 </li>

layouts/partials/navigation.html

@@ -22,25 +22,25 @@
     <li class="o-header__item">
       <menu>
         {{ $currentPage := . }}
+        <hr aria-hidden="true" />
         {{ 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
           )
         }}
+        <hr aria-hidden="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
           )
         }}
+        <hr aria-hidden="true" />
         <li class="o-header__item" id="li-header-news">
           {{ $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
           )
         }}
+        <hr aria-hidden="true" />
       </menu>
     </li>
     <li class="o-header__item o-header__item--desktop">