diff options
author | tdro <tdro@noreply.example.com> | 2023-10-30 18:04:00 -0400 |
---|---|---|
committer | tdro <tdro@noreply.example.com> | 2023-10-30 18:04:00 -0400 |
commit | c7534c65cc49c6febbf2594d982a424535eda3e7 (patch) | |
tree | b2d0c46c9a443af1ca5d1729778c93d27f62985e /themes/default/layouts | |
parent | efbeea8b46a1d9226c460ed97c7ece6da5d17c52 (diff) | |
download | canory-c7534c65cc49c6febbf2594d982a424535eda3e7.tar.gz canory-c7534c65cc49c6febbf2594d982a424535eda3e7.tar.bz2 canory-c7534c65cc49c6febbf2594d982a424535eda3e7.zip |
themes/default/layouts/partials: Merge meta-tags + rss-tags -> tags
No tag is #untagged
Diffstat (limited to 'themes/default/layouts')
-rw-r--r-- | themes/default/layouts/_default/rss.xml | 2 | ||||
-rw-r--r-- | themes/default/layouts/_default/summary.html | 4 | ||||
-rw-r--r-- | themes/default/layouts/partials/meta-tags.html | 6 | ||||
-rw-r--r-- | themes/default/layouts/partials/rss-tags.html | 5 | ||||
-rw-r--r-- | themes/default/layouts/partials/tags.html | 19 |
5 files changed, 23 insertions, 13 deletions
diff --git a/themes/default/layouts/_default/rss.xml b/themes/default/layouts/_default/rss.xml index 5136702..bd7090e 100644 --- a/themes/default/layouts/_default/rss.xml +++ b/themes/default/layouts/_default/rss.xml @@ -99,7 +99,7 @@ <description> {{ partial "function-content.html" . | html -}} {{- print "<br /><br />" | html -}} - {{- partial "rss-tags.html" . | html }} + {{- partial "tags.html" (dict "Format" "rss" "Context" .) | html }} </description> <atom:author> <atom:name>{{ $atomAuthorName }}</atom:name> diff --git a/themes/default/layouts/_default/summary.html b/themes/default/layouts/_default/summary.html index 5bc738d..29ecee0 100644 --- a/themes/default/layouts/_default/summary.html +++ b/themes/default/layouts/_default/summary.html @@ -16,7 +16,9 @@ </micro-metadata> <article aria-label="article"> {{- $content -}} - <micro-tags>{{ partial "meta-tags.html" . }}</micro-tags> + <micro-tags> + {{- partial "tags.html" (dict "Format" "page" "Context" .) -}} + </micro-tags> </article> </micro-summary> </micro-card> diff --git a/themes/default/layouts/partials/meta-tags.html b/themes/default/layouts/partials/meta-tags.html deleted file mode 100644 index cd13781..0000000 --- a/themes/default/layouts/partials/meta-tags.html +++ /dev/null @@ -1,6 +0,0 @@ -{{- with .Params.tags -}} - {{- range $tags, $tag := sort $.Params.tags }} - {{ $link := print ("tags/" | relURL) ($tag | urlize) "/" }} - {{- print "[#" $tag "](" $link ")" | markdownify -}} - {{- end -}} -{{- end -}} diff --git a/themes/default/layouts/partials/rss-tags.html b/themes/default/layouts/partials/rss-tags.html deleted file mode 100644 index a54b628..0000000 --- a/themes/default/layouts/partials/rss-tags.html +++ /dev/null @@ -1,5 +0,0 @@ -{{- with .Params.tags -}} - {{- range $tags, $tag := sort . }} - <a href="{{ "tags/" | absURL }}{{ $tag | urlize }}/">#{{ $tag }}</a> - {{- end }} -{{- end }} diff --git a/themes/default/layouts/partials/tags.html b/themes/default/layouts/partials/tags.html new file mode 100644 index 0000000..1c798a4 --- /dev/null +++ b/themes/default/layouts/partials/tags.html @@ -0,0 +1,19 @@ +{{- $format := .Format -}} +{{- $pageContext := .Context -}} +{{- $path := "tags/" -}} +{{- $url := $path | relURL -}} + +{{- with $pageContext.Params.tags -}} + {{- range $tags, $tag := sort $pageContext.Params.tags -}} + {{- if (eq $format "rss") -}} + {{- $url = $path | absURL -}} + {{- end -}} + + {{- $link := print $url ($tag | urlize) "/" -}} + {{- print "[#" $tag "](" $link ")" | markdownify -}} + + {{- if (eq $format "rss") -}} {{- end -}} + {{- end -}} +{{- else -}} + <a href="{{ "tags/" | absURL }}">#untagged</a> +{{- end -}} |