diff --git a/content/operator/sncf/index.de.md b/content/operator/sncf/index.de.md index b698be9d5..95d0a391a 100644 --- a/content/operator/sncf/index.de.md +++ b/content/operator/sncf/index.de.md @@ -203,9 +203,9 @@ Nationale Verbindungen können online leider nicht erworben werden. {{% booking id="transilien-ticket-office" subtitle="Für Tramlinien und Züge im Großraum Paris" /%}} -{{% booking id="db-ticket-office" subtitle="Für grenzüberschreitende TGV/ICE-Züge zwischen Deutschland und Frankreich" %}} +{{< booking id="db-ticket-office" subtitle="Für grenzüberschreitende TGV/ICE-Züge zwischen Deutschland und Frankreich" >}} Im DB Reisezentrum können grenzüberschreitende FIP 50 Tickets für grenzüberschreitende `TGV`/`ICE` Züge zwischen Deutschland und Frankreich gekauft werden. Ob auch eine Buchung von französischen Inslandszügen möglich ist, ist uns derzeit nicht bekannt. -{{% /booking %}} +{{< /booking >}} ### Im Zug diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 568f1f8c2..074600443 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -8,7 +8,7 @@ - +
- + {{ if or (eq .Page.Type "country") (eq .Page.Type "operator") (eq .Page.Type "generalinformation") }} {{ partial "snackbar" . }} {{ end }} diff --git a/layouts/_default/home.html b/layouts/_default/home.html index 3db687708..5f1825488 100644 --- a/layouts/_default/home.html +++ b/layouts/_default/home.html @@ -53,7 +53,7 @@

{{ T "news.headline" }}

{{ range first 3 (where site.RegularPages "Section" "news") }} - {{ partial "teaser.html" (dict "listview" false "type" "news" "page" .) }} + {{ partial "teaser" (dict "listview" false "type" "news" "page" .) }} {{ end }}
diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 0174bead4..8bfe05492 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -4,7 +4,7 @@

{{ .Title }}

{{ .Content }} {{ range .Pages }} - {{ partial "teaser.html" (dict "listview" "true" "page" .) }} + {{ partial "teaser" (dict "listview" "true" "page" .) }} {{ end }} diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml index 0e17f9487..15a38ff19 100644 --- a/layouts/_default/rss.xml +++ b/layouts/_default/rss.xml @@ -11,7 +11,7 @@ {{ .Title }} {{ .Permalink }} - {{ $cleanedHTML := partial "strip-material-icons" .Summary | transform.XMLEscape | safeHTML}} + {{ $cleanedHTML := partial "modifiers/strip-material-icons" .Summary | transform.XMLEscape | safeHTML}} {{ $cleanedHTML }} {{ .PublishDate.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }} diff --git a/layouts/country/single.html b/layouts/country/single.html index 6003ca531..c1b49c1b3 100644 --- a/layouts/country/single.html +++ b/layouts/country/single.html @@ -11,7 +11,7 @@ {{ partial "flag" (dict "country" .File.ContentBaseName "pagefind" true) }}

{{ .Title }}

- {{ partial "updateDate.html" . }} + {{ partial "updateDate" . }}
diff --git a/layouts/generalinformation/list.html b/layouts/generalinformation/list.html index d17bb0752..f23e35dbd 100644 --- a/layouts/generalinformation/list.html +++ b/layouts/generalinformation/list.html @@ -7,7 +7,7 @@

{{ .Title }}

- {{ partial "updateDate.html" . }} + {{ partial "updateDate" . }}
diff --git a/layouts/news/single.html b/layouts/news/single.html index fc7017bdf..866f101c3 100644 --- a/layouts/news/single.html +++ b/layouts/news/single.html @@ -36,7 +36,7 @@

{{ T "news.further" }}

{{ .Title }}

- {{ partial "updateDate.html" . }} + {{ partial "updateDate" . }}
{{ partial "image" (partial "helper/contentImage" .) }} diff --git a/layouts/operator/single.html b/layouts/operator/single.html index 41e8248bf..8dab9e3ff 100644 --- a/layouts/operator/single.html +++ b/layouts/operator/single.html @@ -8,7 +8,7 @@ {{ partial "operator-logo" (dict "operator" .File.ContentBaseName "pagefind" true) }}

{{ .Title }}

- {{ partial "updateDate.html" . }} + {{ partial "updateDate" . }}
{{ partial "content" . }} diff --git a/layouts/partials/booking.html b/layouts/partials/booking.html index c864c8f78..77ff8bace 100644 --- a/layouts/partials/booking.html +++ b/layouts/partials/booking.html @@ -80,10 +80,9 @@ {{- $contentClasses = $contentClasses | append "o-booking__section-reservations--hidden" -}} {{- end -}}
- {{- $content := partial "increase-headings" (dict "content" .page.Content "offset" 2) -}} - {{- $content := partial "prefix-footnotes" (dict "content" $content "prefix" .page.File.ContentBaseName) -}} - {{- $content := partial "prefix-heading-ids" (dict "content" $content "prefix" .page.File.ContentBaseName) -}} - {{- $content := partial "remove-newlines" $content -}} + {{- $content := partial "modifiers/increase-headings" (dict "content" .page.Content "offset" 2) -}} + {{- $content := partial "modifiers/prefix-footnotes" (dict "content" $content "prefix" .page.File.ContentBaseName) -}} + {{- $content := partial "modifiers/prefix-heading-ids" (dict "content" $content "prefix" .page.File.ContentBaseName) -}} {{- $content | safeHTML -}}
diff --git a/layouts/partials/increase-headings.html b/layouts/partials/modifiers/increase-headings.html similarity index 100% rename from layouts/partials/increase-headings.html rename to layouts/partials/modifiers/increase-headings.html diff --git a/layouts/partials/prefix-footnotes.html b/layouts/partials/modifiers/prefix-footnotes.html similarity index 100% rename from layouts/partials/prefix-footnotes.html rename to layouts/partials/modifiers/prefix-footnotes.html diff --git a/layouts/partials/prefix-heading-ids.html b/layouts/partials/modifiers/prefix-heading-ids.html similarity index 100% rename from layouts/partials/prefix-heading-ids.html rename to layouts/partials/modifiers/prefix-heading-ids.html diff --git a/layouts/partials/strip-material-icons.html b/layouts/partials/modifiers/strip-material-icons.html similarity index 100% rename from layouts/partials/strip-material-icons.html rename to layouts/partials/modifiers/strip-material-icons.html diff --git a/layouts/partials/remove-newlines.html b/layouts/partials/remove-newlines.html deleted file mode 100644 index 6097543d9..000000000 --- a/layouts/partials/remove-newlines.html +++ /dev/null @@ -1 +0,0 @@ -{{ return replaceRE `\n` "" . }} diff --git a/layouts/partials/teaser.html b/layouts/partials/teaser.html index c87dce0f2..a2fa37877 100644 --- a/layouts/partials/teaser.html +++ b/layouts/partials/teaser.html @@ -23,7 +23,7 @@

{{ $page.Title }}

- {{ partial "strip-material-icons" $page.Summary | plainify | truncate 500 }} + {{ partial "modifiers/strip-material-icons" $page.Summary | plainify | truncate 500 }}
{{- partial "icon" "arrow_forward" -}}
diff --git a/layouts/partials/toc.html b/layouts/partials/toc.html index 72a000167..15d210e49 100644 --- a/layouts/partials/toc.html +++ b/layouts/partials/toc.html @@ -55,7 +55,7 @@ "endLevel" $endLevel "headings" . }} - {{- partial "inline/toc/walk.html" $ctx }} + {{- partial "inline/toc/walk" $ctx }} {{- end }} @@ -78,13 +78,13 @@ {{- with and (lt .Level $ctx.endLevel) .Headings }} {{- end }} {{- else }} {{- $ctx = merge $ctx (dict "headings" .Headings) }} - {{- partial "inline/toc/walk.html" $ctx }} + {{- partial "inline/toc/walk" $ctx }} {{- end }} {{- end }} {{- end }}