From b9020351c12b8b8b47c0aa0255f8472e187d1717 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Tue, 13 Jul 2021 11:27:37 +0200 Subject: [PATCH] Handling tags --- layouts/_default/section.html | 9 +++--- layouts/_default/single.html | 18 ++++++----- layouts/partials/category.html | 2 ++ layouts/partials/posts.html | 2 +- layouts/partials/sidebar.html | 4 +-- layouts/taxonomy/category.html | 3 ++ layouts/taxonomy/tag.html | 6 ++++ layouts/taxonomy/terms.html | 56 ++++++++++++++++++++++++++++++++++ 8 files changed, 84 insertions(+), 16 deletions(-) create mode 100644 layouts/partials/category.html create mode 100644 layouts/taxonomy/category.html create mode 100644 layouts/taxonomy/tag.html create mode 100644 layouts/taxonomy/terms.html diff --git a/layouts/_default/section.html b/layouts/_default/section.html index 1955337..75dc25c 100644 --- a/layouts/_default/section.html +++ b/layouts/_default/section.html @@ -10,26 +10,25 @@ post-container"> {{ .Content }} - {{ partial "comments.html" . }}
{{ if .Site.Params.featured_tags }}
- +
FEATURED TAGS
{{ $featured_condition_size := .Site.Params.featured_condition_size }} {{ range $name, $taxonomy := .Site.Taxonomies.tags }} {{ if gt (len $taxonomy.Pages) $featured_condition_size }} - - {{ $name }} + + #{{ $name }} {{ end }} {{ end }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 4f27744..ed435fe 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -10,15 +10,17 @@
-
- {{ range .Params.tags }} - - {{ . }} +

{{ .Title }}

+ {{ with .Params.subtitle }}

{{ . }}

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

{{ .Title }}

-

{{ .Params.subtitle }}

+ {{ end }} Par {{ if .Params.author }} @@ -94,8 +96,8 @@ {{ $featured_condition_size := .Site.Params.featured_condition_size }} {{ range $name, $taxonomy := .Site.Taxonomies.tags }} {{ if gt (len $taxonomy.Pages) $featured_condition_size }} - - {{ $name }} + + #{{ $name }} {{ end }} {{ end }} diff --git a/layouts/partials/category.html b/layouts/partials/category.html new file mode 100644 index 0000000..9308b10 --- /dev/null +++ b/layouts/partials/category.html @@ -0,0 +1,2 @@ +{{ $paginator := .Paginate (where .Data.Pages "Section" "post") }} +{{ partial "posts.html" . }} diff --git a/layouts/partials/posts.html b/layouts/partials/posts.html index 77bb7d4..447a92a 100644 --- a/layouts/partials/posts.html +++ b/layouts/partials/posts.html @@ -2,7 +2,7 @@
-
- {{ $name }} + + #{{ $name }} {{ end }} {{ end }} diff --git a/layouts/taxonomy/category.html b/layouts/taxonomy/category.html new file mode 100644 index 0000000..92e0961 --- /dev/null +++ b/layouts/taxonomy/category.html @@ -0,0 +1,3 @@ +{{ define "main" }} + {{ partial "category.html" . }} +{{ end }} diff --git a/layouts/taxonomy/tag.html b/layouts/taxonomy/tag.html new file mode 100644 index 0000000..ccbd3d8 --- /dev/null +++ b/layouts/taxonomy/tag.html @@ -0,0 +1,6 @@ +{{ define "main" }} +
+

Tag #{{ .Data.Term }}

+
+ {{ partial "category.html" . }} +{{ end }} diff --git a/layouts/taxonomy/terms.html b/layouts/taxonomy/terms.html new file mode 100644 index 0000000..ac8ed7d --- /dev/null +++ b/layouts/taxonomy/terms.html @@ -0,0 +1,56 @@ +{{ define "main" }} + +
+
+
+ +
+ + {{ .Content }} + +
+ +
+ + + {{ if .Site.Params.featured_tags }} +
+
+
Tags
+
+ {{ $featured_condition_size := .Site.Params.featured_condition_size }} + {{ range $name, $taxonomy := .Site.Taxonomies.tags }} + {{ if gt (len $taxonomy.Pages) $featured_condition_size }} + + #{{ $name }} + + {{ end }} + {{ end }} +
+
+ {{ end }} + + + {{ if .Site.Params.friends }} +
+
+
FRIENDS
+
    + {{ range .Site.Params.friend_link }} +
  • {{.title}}
    • + {{ end }} +
+
+ {{ end }} +
+
+
+
+ +{{ end }}