From fb66080ef17bf7db29a6be878e2ad417e1e0eb34 Mon Sep 17 00:00:00 2001 From: James Tombleson Date: Sat, 1 Oct 2022 22:15:39 -0700 Subject: [PATCH] Tags and categories are now working with custom layouts. More changes to make but its in the right direction --- .../layouts/_default/index.html | 5 +- .../layouts/_default/list.html | 28 ++++++++--- .../layouts/_default/single.html | 48 ++++++++++++------- .../layouts/_default/taxonomy.html | 11 ----- .../layouts/partials/navbar.html | 1 + .../layouts/taxonomy/tags.html | 0 .../layouts/taxonomy/terms.html | 16 +++++++ 7 files changed, 74 insertions(+), 35 deletions(-) delete mode 100644 themes/hugo-bulma-cookbook/layouts/_default/taxonomy.html create mode 100644 themes/hugo-bulma-cookbook/layouts/taxonomy/tags.html create mode 100644 themes/hugo-bulma-cookbook/layouts/taxonomy/terms.html diff --git a/themes/hugo-bulma-cookbook/layouts/_default/index.html b/themes/hugo-bulma-cookbook/layouts/_default/index.html index 7771080..fd3ba90 100644 --- a/themes/hugo-bulma-cookbook/layouts/_default/index.html +++ b/themes/hugo-bulma-cookbook/layouts/_default/index.html @@ -1,6 +1,9 @@ {{ partial "header.html" . }} {{ partial "hero.html" . }} +

hi from _default/index.html

+
{{ .Content }} -
\ No newline at end of file + + diff --git a/themes/hugo-bulma-cookbook/layouts/_default/list.html b/themes/hugo-bulma-cookbook/layouts/_default/list.html index dc37307..e451baa 100644 --- a/themes/hugo-bulma-cookbook/layouts/_default/list.html +++ b/themes/hugo-bulma-cookbook/layouts/_default/list.html @@ -2,11 +2,14 @@ {{ partial "hero.html" . }}
+
+ {{ range .RegularPages }}
+
{{ with .Params.listthumbnail }} @@ -20,20 +23,33 @@ {{ .Title }}

{{ .Params.subtitle }}

+ {{ with .Params.tags }} - +
+ {{ end }} + + + {{ with .Params.categories }} +
+ {{ range . }} + + {{ end }} +
{{ end }}
{{ end }} - + + {{ partial "footer.html" . }} \ No newline at end of file diff --git a/themes/hugo-bulma-cookbook/layouts/_default/single.html b/themes/hugo-bulma-cookbook/layouts/_default/single.html index 10cdc61..65556b1 100644 --- a/themes/hugo-bulma-cookbook/layouts/_default/single.html +++ b/themes/hugo-bulma-cookbook/layouts/_default/single.html @@ -2,24 +2,38 @@ {{ partial "hero.html" . }}
- - -
- {{ .Content }} -
- -

Posted: {{ .Date.Format "Mon Jan 2, 2006" }}

-
Word Count: {{ .WordCount }} Words
-
-

Tags

- {{ with .Params.tags }} - {{ range . }} - - {{ . }} - - {{ end }} - {{ end }} + +
+ +
+ +
+ +
+
+ {{ .Content }} +
+ +

Posted: {{ .Date.Format "Mon Jan 2, 2006" }}

+
Word Count: {{ .WordCount }} Words
+ +
+

Tags

+ +
+ {{ with .Params.tags }} + + {{ range . }} + + {{ end }} + + {{ end }} +
+
+
diff --git a/themes/hugo-bulma-cookbook/layouts/_default/taxonomy.html b/themes/hugo-bulma-cookbook/layouts/_default/taxonomy.html deleted file mode 100644 index 4c57d5d..0000000 --- a/themes/hugo-bulma-cookbook/layouts/_default/taxonomy.html +++ /dev/null @@ -1,11 +0,0 @@ -{{ partial "header.html" . }} -{{ partial "hero.html" . }} - -
-
- - {{ range .Pages }} - {{ .Render "tags"}} - {{ end }} -
-
diff --git a/themes/hugo-bulma-cookbook/layouts/partials/navbar.html b/themes/hugo-bulma-cookbook/layouts/partials/navbar.html index ee8b8a2..02301cd 100644 --- a/themes/hugo-bulma-cookbook/layouts/partials/navbar.html +++ b/themes/hugo-bulma-cookbook/layouts/partials/navbar.html @@ -14,6 +14,7 @@ diff --git a/themes/hugo-bulma-cookbook/layouts/taxonomy/tags.html b/themes/hugo-bulma-cookbook/layouts/taxonomy/tags.html new file mode 100644 index 0000000..e69de29 diff --git a/themes/hugo-bulma-cookbook/layouts/taxonomy/terms.html b/themes/hugo-bulma-cookbook/layouts/taxonomy/terms.html new file mode 100644 index 0000000..a7a16bf --- /dev/null +++ b/themes/hugo-bulma-cookbook/layouts/taxonomy/terms.html @@ -0,0 +1,16 @@ +{{ partial "header.html" . }} +{{ partial "hero.html" . }} + +
+
+ +
+ {{ range .Data.Pages }} + + {{ end }} +
+
+ +{{ partial "footer.html" . }} \ No newline at end of file