From d8db1dbddf2861b874c2e070726ef2d9a7fa6369 Mon Sep 17 00:00:00 2001 From: Helmut Merz Date: Thu, 26 Oct 2023 19:38:52 +0200 Subject: [PATCH] move rendering of main content to new partial 'content' --- layouts/_default/single.html | 22 ++-------------------- layouts/cards/single.html | 25 +++---------------------- layouts/partials/content.html | 20 ++++++++++++++++++++ 3 files changed, 25 insertions(+), 42 deletions(-) create mode 100644 layouts/partials/content.html diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 59871b4..5efb41d 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -10,26 +10,8 @@
- {{ if .Title -}} -
-

{{ .Title }}

- {{ if and (not .Params.nodate) .Date -}} - - {{- end }} -
- {{- end }} - {{ with .Content -}} -
{{ . }}
- {{- end }} - {{- if eq $showChildren "embed" -}} + {{- partial "content" . -}} + {{- if eq $showChildren "embed" -}} {{ range sort (sort $children "Date" "desc") "Weight" }} {{ partial "embed" . }} {{ end }} diff --git a/layouts/cards/single.html b/layouts/cards/single.html index 2b68329..c5c59e0 100644 --- a/layouts/cards/single.html +++ b/layouts/cards/single.html @@ -5,28 +5,9 @@
- {{ if .Title -}} -
-

{{ .Title }}

- {{ if and (not .Params.nodate) .Date -}} - - {{- end }} -
- {{- end }} - {{ with .Content -}} -
{{ . }}
- {{- end }} - - {{- $related := .Site.RegularPages.RelatedTo (keyVals "parents" .Params.pageid) -}} - {{ range sort (sort $related "Date" "desc") "Weight" }} + {{- partial "content" . -}} + {{- $children := .Site.RegularPages.RelatedTo (keyVals "parents" .Params.pageid) -}} + {{ range sort (sort $children "Date" "desc") "Weight" }} {{ partial "embed" . }} {{ end }} diff --git a/layouts/partials/content.html b/layouts/partials/content.html new file mode 100644 index 0000000..ffb89d9 --- /dev/null +++ b/layouts/partials/content.html @@ -0,0 +1,20 @@ + {{ if .Title -}} +
+

{{ .Title }}

+ {{ if and (not .Params.nodate) .Date -}} + + {{- end }} +
+ {{- end }} + {{ with .Content -}} +
{{ . }}
+ {{- end }} +