From 704d8366f4b77c67339d53fe4056206a5f228b6c Mon Sep 17 00:00:00 2001 From: steven-y-e Date: Thu, 16 Sep 2021 12:49:16 -0400 Subject: [PATCH] refactor(theme): lists taxonomy and terms layouts have been consolidated back into default list template --- .../themes/mineral/layouts/_default/list.html | 9 ++++- .../mineral/layouts/_default/taxonomy.html | 37 ------------------- .../mineral/layouts/_default/terms.html | 36 ------------------ 3 files changed, 7 insertions(+), 75 deletions(-) delete mode 100644 blog/themes/mineral/layouts/_default/taxonomy.html delete mode 100644 blog/themes/mineral/layouts/_default/terms.html diff --git a/blog/themes/mineral/layouts/_default/list.html b/blog/themes/mineral/layouts/_default/list.html index 8605e0d..9ad66ba 100644 --- a/blog/themes/mineral/layouts/_default/list.html +++ b/blog/themes/mineral/layouts/_default/list.html @@ -1,6 +1,9 @@ {{ define "main" }}
- {{ $paginator := .Paginate ( where site.RegularPages "Type" "in" site.Params.mainSections ) }} + {{ $paginator := .Paginate ( where site.RegularPages "Type" "in" site.Params.mainSections ) }} + {{ if ne .Kind "home" }} + {{ $paginator = .Data }} + {{ end }}
{{ range $paginator.Pages }} @@ -9,7 +12,9 @@ {{ . }} {{ end }}

{{ .Title }}

-

{{.Date.Format "January 2, 2006"}}

+ {{ if ne .Kind "term" }} +

{{.Date.Format "January 2, 2006"}}

+ {{ end }}

{{ .Summary | plainify | htmlUnescape }}

{{ range .Params.tags }} diff --git a/blog/themes/mineral/layouts/_default/taxonomy.html b/blog/themes/mineral/layouts/_default/taxonomy.html deleted file mode 100644 index a7fb191..0000000 --- a/blog/themes/mineral/layouts/_default/taxonomy.html +++ /dev/null @@ -1,37 +0,0 @@ -{{ define "main" }} -

- {{ $paginator := .Paginate ( where site.RegularPages "Type" "in" site.Params.mainSections ) }} - {{ $paginator = .Data }} -
- - {{ range $paginator.Pages }} -
- {{ range .Params.categories }} - {{ . }} - {{ end }} -

{{ .Title }}

-

{{.Date.Format "January 2, 2006"}}

-

{{ .Summary | plainify | htmlUnescape }}

-

- {{ range .Params.tags }} - #{{ . }} - {{ end }} -

-
- {{ end }} -
- - {{ if gt $paginator.TotalPages 1 }} -
- -
- {{ end }} -{{ end }} \ No newline at end of file diff --git a/blog/themes/mineral/layouts/_default/terms.html b/blog/themes/mineral/layouts/_default/terms.html deleted file mode 100644 index e1b42c1..0000000 --- a/blog/themes/mineral/layouts/_default/terms.html +++ /dev/null @@ -1,36 +0,0 @@ -{{ define "main" }} -
- {{ $paginator := .Paginate ( where site.RegularPages "Type" "in" site.Params.mainSections ) }} - {{ $paginator = .Data }} -
- - {{ range $paginator.Pages }} -
- {{ range .Params.categories }} - {{ . }} - {{ end }} -

{{ .Title }}

-

{{ .Summary | plainify | htmlUnescape }}

-

- {{ range .Params.tags }} - #{{ . }} - {{ end }} -

-
- {{ end }} -
- - {{ if gt $paginator.TotalPages 1 }} -
- -
- {{ end }} -{{ end }} \ No newline at end of file