From 1e8c87436b4a4a3509015a85cf708e1005fcaeb9 Mon Sep 17 00:00:00 2001 From: Alan Date: Wed, 15 Jul 2020 22:12:30 +0200 Subject: [PATCH 1/3] MOD: loop over mainSections --- layouts/taxonomy/archive.terms.html | 2 +- layouts/taxonomy/category.html | 4 ++-- layouts/taxonomy/category.terms.html | 2 +- layouts/taxonomy/tag.html | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/layouts/taxonomy/archive.terms.html b/layouts/taxonomy/archive.terms.html index 114a3b43..032d4ff1 100644 --- a/layouts/taxonomy/archive.terms.html +++ b/layouts/taxonomy/archive.terms.html @@ -11,7 +11,7 @@
- {{ partial "archive-post.html" (where .Site.RegularPages "Type" "posts") }} + {{ partial "archive-post.html" (where .Site.RegularPages "Type" "in" site.Params.mainSections) }} diff --git a/layouts/taxonomy/category.html b/layouts/taxonomy/category.html index e3f9516a..2aeeacb7 100644 --- a/layouts/taxonomy/category.html +++ b/layouts/taxonomy/category.html @@ -12,7 +12,7 @@ {{ with .Params.coverCaption }}hasCoverCaption{{ end }}"> {{ if or (not (isset .Site.Params "categoryPagination")) (.Site.Params.categoryPagination) }}
- {{ $paginator := .Paginate (where .Data.Pages "Type" "posts") }} + {{ $paginator := .Paginate (where .Data.Pages "Type" "in" site.Params.mainSections) }} {{ range $paginator.Pages }} {{ .Render "summary" }} {{ end }} @@ -23,7 +23,7 @@
- {{ partial "archive-post.html" (where .Data.Pages "Type" "posts") }} + {{ partial "archive-post.html" (where .Data.Pages "Type" "in" site.Params.mainSections) }} {{ end }} {{ partial "footer.html" . }} diff --git a/layouts/taxonomy/category.terms.html b/layouts/taxonomy/category.terms.html index bef6039c..c39e7966 100644 --- a/layouts/taxonomy/category.terms.html +++ b/layouts/taxonomy/category.terms.html @@ -1,6 +1,6 @@ {{ if $.Site.Params.hierarchicalCategories }} {{ $.Scratch.Set "max-level" 0 }} - {{ range where $.Site.RegularPages "Type" "posts" }} + {{ range where $.Site.RegularPages "Type" "in" site.Params.mainSections }} {{ $page := . }} {{ if .Params.categories }} {{ $categories := (apply .Params.categories "urlize" ".") }} diff --git a/layouts/taxonomy/tag.html b/layouts/taxonomy/tag.html index 6438b925..0e6cd7d1 100644 --- a/layouts/taxonomy/tag.html +++ b/layouts/taxonomy/tag.html @@ -12,7 +12,7 @@ {{ with .Params.coverCaption }}hasCoverCaption{{ end }}"> {{ if or (not (isset .Site.Params "tagPagination")) (.Site.Params.tagPagination) }}
- {{ $paginator := .Paginate (where .Data.Pages "Type" "posts") }} + {{ $paginator := .Paginate (where .Data.Pages "Type" "in" site.Params.mainSections) }} {{ range $paginator.Pages }} {{ .Render "summary" }} {{ end }} @@ -23,7 +23,7 @@
- {{ partial "archive-post.html" (where .Data.Pages "Type" "posts") }} + {{ partial "archive-post.html" (where .Data.Pages "Type" "in" site.Params.mainSections) }} {{ end }} {{ partial "footer.html" . }} From 0e623f98786ad0d803f4573df9dd1f4bbe64179a Mon Sep 17 00:00:00 2001 From: Alan Date: Fri, 17 Jul 2020 14:01:16 +0200 Subject: [PATCH 2/3] MOD: use mainSections in main index too --- layouts/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/index.html b/layouts/index.html index db947143..6fa34dc4 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -9,7 +9,7 @@ {{ if eq .Params.covermeta "out" }}hasCoverMetaOut{{ else }}hasCoverMetaIn{{ end }} {{ with .Params.coverCaption }}hasCoverCaption{{ end }}">
- {{ $paginator := .Paginate (where .Site.RegularPages "Type" "posts") }} + {{ $paginator := .Paginate (where .Site.RegularPages "Type" "in" site.Params.mainSections ) }} {{ range $paginator.Pages }} {{ .Render "summary" }} {{ end }} From 45b52e3631a6d159cef4c14959da47db57e4682e Mon Sep 17 00:00:00 2001 From: Alan Date: Fri, 17 Jul 2020 14:24:01 +0200 Subject: [PATCH 3/3] MOD: tentative fix for search too --- layouts/partials/search.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/partials/search.html b/layouts/partials/search.html index 5e2b38c8..72a8740d 100644 --- a/layouts/partials/search.html +++ b/layouts/partials/search.html @@ -16,7 +16,7 @@