Skip to content

refactor: Group partials in folders #567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
MoritzWeber0 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

refactor: Group partials in folders #567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions content/operator/sncf/index.de.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions layouts/_default/baseof.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</head>
<body>
<div id="overlay" aria-hidden="true"></div>
<header id="header" class="o-header">{{ partial "header.html" . }}</header>
<header id="header" class="o-header">{{ partial "header" . }}</header>
<main
id="content"
{{- if .IsHome -}}
Expand All @@ -31,7 +31,7 @@
{{ block "main" . }}{{ end }}
</div>
</main>
<footer class="o-footer o-container">{{ partial "footer.html" . }}</footer>
<footer class="o-footer o-container">{{ partial "footer" . }}</footer>
{{ if or (eq .Page.Type "country") (eq .Page.Type "operator") (eq .Page.Type "generalinformation") }}
{{ partial "snackbar" . }}
{{ end }}
Expand Down
2 changes: 1 addition & 1 deletion layouts/_default/home.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ <h2>{{ T "news.headline" }}</h2>
</div>
<div class="o-startpage__news-wrapper">
{{ 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 }}
</div>
</section>
Expand Down
2 changes: 1 addition & 1 deletion layouts/_default/list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<h1 data-pagefind-meta="title">{{ .Title }}</h1>
{{ .Content }}
{{ range .Pages }}
{{ partial "teaser.html" (dict "listview" "true" "page" .) }}
{{ partial "teaser" (dict "listview" "true" "page" .) }}
{{ end }}
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion layouts/_default/rss.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<title>{{ .Title }}</title>
<link>{{ .Permalink }}</link>
<!-- Remove the icons and XML escape the summary -->
{{ $cleanedHTML := partial "strip-material-icons" .Summary | transform.XMLEscape | safeHTML}}
{{ $cleanedHTML := partial "modifiers/strip-material-icons" .Summary | transform.XMLEscape | safeHTML}}
<description>{{ $cleanedHTML }}</description>
<pubDate>{{ .PublishDate.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</pubDate>
<enclosure url="{{ (partial "helper/contentImage" . ).Permalink }}" />
Expand Down
2 changes: 1 addition & 1 deletion layouts/country/single.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{{ partial "flag" (dict "country" .File.ContentBaseName "pagefind" true) }}
<h1 data-pagefind-meta="title">{{ .Title }}</h1>
</div>
{{ partial "updateDate.html" . }}
{{ partial "updateDate" . }}
</div>

<div class="o-single__content" data-pagefind-weight="2">
Expand Down
2 changes: 1 addition & 1 deletion layouts/generalinformation/list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<div class="o-single__content-header-title">
<h1 data-pagefind-meta="title">{{ .Title }}</h1>
</div>
{{ partial "updateDate.html" . }}
{{ partial "updateDate" . }}
</div>

<div class="o-single__content" data-pagefind-weight="2">
Expand Down
2 changes: 1 addition & 1 deletion layouts/news/single.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ <h3 id="o-related__title">{{ T "news.further" }}</h3>
<div class="o-single__container" data-pagefind-body>
<div class="o-single__content-header">
<h1 data-pagefind-meta="title">{{ .Title }}</h1>
{{ partial "updateDate.html" . }}
{{ partial "updateDate" . }}
</div>
<div class="o-single__news-image">
{{ partial "image" (partial "helper/contentImage" .) }}
Expand Down
2 changes: 1 addition & 1 deletion layouts/operator/single.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
{{ partial "operator-logo" (dict "operator" .File.ContentBaseName "pagefind" true) }}
<h1 data-pagefind-meta="title">{{ .Title }}</h1>
</div>
{{ partial "updateDate.html" . }}
{{ partial "updateDate" . }}
</div>
<div class="o-single__content" data-pagefind-weight="2.5">
{{ partial "content" . }}
Expand Down
7 changes: 3 additions & 4 deletions layouts/partials/booking.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,9 @@
{{- $contentClasses = $contentClasses | append "o-booking__section-reservations--hidden" -}}
{{- end -}}
<div class="{{ delimit $contentClasses " " }}">
{{- $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 -}}
</div>

Expand Down
0 layouts/partials/increase-headings.html → ...partials/modifiers/increase-headings.html
View file
Open in desktop
File renamed without changes.
0 layouts/partials/prefix-footnotes.html → .../partials/modifiers/prefix-footnotes.html
View file
Open in desktop
File renamed without changes.
0 layouts/partials/prefix-heading-ids.html → ...artials/modifiers/prefix-heading-ids.html
View file
Open in desktop
File renamed without changes.
0 layouts/partials/strip-material-icons.html → ...tials/modifiers/strip-material-icons.html
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion layouts/partials/remove-newlines.html
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion layouts/partials/teaser.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ <h3 class="m-teaser__headline">{{ $page.Title }}</h3>


<div class="m-teaser__text">
{{ partial "strip-material-icons" $page.Summary | plainify | truncate 500 }}
{{ partial "modifiers/strip-material-icons" $page.Summary | plainify | truncate 500 }}
</div>
{{- partial "icon" "arrow_forward" -}}
</div>
Expand Down
6 changes: 3 additions & 3 deletions layouts/partials/toc.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"endLevel" $endLevel
"headings" .
}}
{{- partial "inline/toc/walk.html" $ctx }}
{{- partial "inline/toc/walk" $ctx }}
</ul>
</nav>
{{- end }}
Expand All @@ -78,13 +78,13 @@
{{- with and (lt .Level $ctx.endLevel) .Headings }}
<ul>
{{- $ctx = merge $ctx (dict "headings" .) }}
{{- partial "inline/toc/walk.html" $ctx }}
{{- partial "inline/toc/walk" $ctx }}
</ul>
{{- end }}
</li>
{{- else }}
{{- $ctx = merge $ctx (dict "headings" .Headings) }}
{{- partial "inline/toc/walk.html" $ctx }}
{{- partial "inline/toc/walk" $ctx }}
{{- end }}
{{- end }}
{{- end }}
Loading