From 165f3f16bd9f10692ecdb7f4549488a321a584dc Mon Sep 17 00:00:00 2001 From: Helmut Merz Date: Tue, 29 Jul 2025 11:14:12 +0200 Subject: [PATCH] more fixes in directory 'layouts' --- layouts/{terms.html => domains/taxonomy.html} | 0 layouts/domains/terms.html | 32 ++++++++++++ layouts/taxonomy.html | 52 +++++++------------ layouts/{topics/list.html => term.html} | 0 layouts/topics/taxonomy.html | 52 +++++++------------ 5 files changed, 68 insertions(+), 68 deletions(-) rename layouts/{terms.html => domains/taxonomy.html} (100%) create mode 100644 layouts/domains/terms.html rename layouts/{topics/list.html => term.html} (100%) diff --git a/layouts/terms.html b/layouts/domains/taxonomy.html similarity index 100% rename from layouts/terms.html rename to layouts/domains/taxonomy.html diff --git a/layouts/domains/terms.html b/layouts/domains/terms.html new file mode 100644 index 0000000..23b3933 --- /dev/null +++ b/layouts/domains/terms.html @@ -0,0 +1,32 @@ +{{ define "main" }} + +
+ +
+
+
+
+

{{or (i18n .Title) .Title }}

+
+
+
+
+ +
+ {{- $site := .Site }} + {{ range .Data.Terms.ByCount -}} +
+
+ + {{ .Page.Title }} + {{ .Count }} + +
+
+ {{- end }} +
+ +
+ +{{ end }} diff --git a/layouts/taxonomy.html b/layouts/taxonomy.html index 894572d..23b3933 100644 --- a/layouts/taxonomy.html +++ b/layouts/taxonomy.html @@ -1,48 +1,32 @@ {{ define "main" }} -
+
- {{- $parents := .Params.Topics -}} - {{- $mainWidth := or (and $parents "8") "12" -}} - {{- $children := (where - (where .Site.Pages "Section" "topics") - "Params.topics" "intersect" (slice .Name)) -}}
-
-
-
-

{{i18n .Data.Singular}}: {{ .Title }}

-
-
- {{ with .Content -}} -
{{ . }}
- {{- end }} - {{ with $children -}} -

- {{- i18n "child-topics" -}}: - {{ range . -}} - - {{ .Title }} - - {{- end }} -

- {{- end }} +
+
+
+

{{or (i18n .Title) .Title }}

- {{ partial "parent-topics.html" . }}
- {{ $paginator := .Paginate (.Data.Pages) }} - {{ range $paginator.Pages }} - {{ partial "card.html" . }} - {{ end }} -
- -
- {{ partial "pagination.html" . }} + {{- $site := .Site }} + {{ range .Data.Terms.ByCount -}} +
+
+ + {{ .Page.Title }} + {{ .Count }} + +
+
+ {{- end }}
+ {{ end }} diff --git a/layouts/topics/list.html b/layouts/term.html similarity index 100% rename from layouts/topics/list.html rename to layouts/term.html diff --git a/layouts/topics/taxonomy.html b/layouts/topics/taxonomy.html index 894572d..23b3933 100644 --- a/layouts/topics/taxonomy.html +++ b/layouts/topics/taxonomy.html @@ -1,48 +1,32 @@ {{ define "main" }} -
+
- {{- $parents := .Params.Topics -}} - {{- $mainWidth := or (and $parents "8") "12" -}} - {{- $children := (where - (where .Site.Pages "Section" "topics") - "Params.topics" "intersect" (slice .Name)) -}}
-
-
-
-

{{i18n .Data.Singular}}: {{ .Title }}

-
-
- {{ with .Content -}} -
{{ . }}
- {{- end }} - {{ with $children -}} -

- {{- i18n "child-topics" -}}: - {{ range . -}} - - {{ .Title }} - - {{- end }} -

- {{- end }} +
+
+
+

{{or (i18n .Title) .Title }}

- {{ partial "parent-topics.html" . }}
- {{ $paginator := .Paginate (.Data.Pages) }} - {{ range $paginator.Pages }} - {{ partial "card.html" . }} - {{ end }} -
- -
- {{ partial "pagination.html" . }} + {{- $site := .Site }} + {{ range .Data.Terms.ByCount -}} +
+
+ + {{ .Page.Title }} + {{ .Count }} + +
+
+ {{- end }}
+ {{ end }}