From fc248e808b1de1d4a5fc3219bfee4ef303721f6f Mon Sep 17 00:00:00 2001 From: Giuseppe Pignataro Date: Sun, 5 May 2019 10:25:43 +0200 Subject: Various Fix and added support for Hugo 0.55 --- layouts/_default/terms.html | 48 ++++++++++++++++++++++++++++++++++++++++- layouts/index.atom.xml | 2 +- layouts/partials/comments.html | 3 ++- layouts/partials/head.html | 7 +++--- layouts/partials/header.html | 2 +- layouts/partials/home_post.html | 2 +- layouts/partials/paginator.html | 2 +- layouts/rss.xml | 10 ++++----- 8 files changed, 62 insertions(+), 14 deletions(-) diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html index 3a192a0..391e3c2 100644 --- a/layouts/_default/terms.html +++ b/layouts/_default/terms.html @@ -21,6 +21,34 @@
{{ .Title }}
+ {{ end }} + {{ if gt (len $pages) 5 }} + + {{ i18n "More" }} >> + + {{ end }}{{ define "content" }} + +{{ $termName := .Data.Plural }} +{{ $terms := .Data.Terms.ByCount }} +{{ $length := len $terms }} +{{ $type := .Type }} + +
+

- {{ .Data.Plural | humanize }} -

+{{ if and $.Site.Taxonomies.categories (eq $termName "categories") }} + +
+{{ range $terms }} + {{ $term := .Term }} + {{ $pages := .Pages }} + {{ with $.Site.GetPage "taxonomy" (printf "%s/%s" $type $term) }} +
+
+

{{ $term | humanize}}

+ {{ range first 5 $pages }} + {{ end }} {{ if gt (len $pages) 5 }} @@ -44,4 +72,22 @@ {{ end }}
-{{end }} \ No newline at end of file +{{end }} +
+
+ {{ end }} +{{ end }} +
+ +{{ else if and $.Site.Taxonomies.tags (eq $termName "tags") }} +
+ {{ range $.Site.Taxonomies.tags.ByCount }} + {{ if .Name }} + {{ .Name }} ({{ .Count }}) + {{ end }} + {{end}} +
+ +{{ end }} + +{{end }} diff --git a/layouts/index.atom.xml b/layouts/index.atom.xml index 9192e0c..725add4 100644 --- a/layouts/index.atom.xml +++ b/layouts/index.atom.xml @@ -24,4 +24,4 @@ {{ .Lastmod.Format "2006-01-02T15:04:05-07:00" | safeHTML }} {{ ` {{ end }} - \ No newline at end of file + diff --git a/layouts/partials/comments.html b/layouts/partials/comments.html index 6a0d0ab..d554938 100644 --- a/layouts/partials/comments.html +++ b/layouts/partials/comments.html @@ -40,7 +40,7 @@ {{- if .Site.Params.valine.enable -}} @@ -65,3 +65,4 @@ {{- end -}} {{- end }} + diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 12de83e..bfaaa2f 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -31,9 +31,9 @@ {{ partial "css" . }} - {{ if .RSSLink }} - - + {{ with .OutputFormats.Get "RSS" }} + + {{ end }} {{- template "_internal/twitter_cards.html" . }} {{ partial "seo_schema" . }} @@ -45,3 +45,4 @@ {{ end }} {{ end }} {{ .Scratch.Set "cdn_url" $cdn_url }} + diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 76b93fb..875bcde 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -28,4 +28,4 @@ {{ end }} - \ No newline at end of file + diff --git a/layouts/partials/home_post.html b/layouts/partials/home_post.html index 061f6bc..9103a78 100644 --- a/layouts/partials/home_post.html +++ b/layouts/partials/home_post.html @@ -58,7 +58,7 @@ {{ with .Params.tags }} diff --git a/layouts/partials/paginator.html b/layouts/partials/paginator.html index dd341aa..4451b99 100644 --- a/layouts/partials/paginator.html +++ b/layouts/partials/paginator.html @@ -26,4 +26,4 @@ {{ end }} {{ end }} -{{ end }} \ No newline at end of file +{{ end }} diff --git a/layouts/rss.xml b/layouts/rss.xml index 935d316..ebfb43b 100644 --- a/layouts/rss.xml +++ b/layouts/rss.xml @@ -5,20 +5,20 @@ Recent content {{ with .Title }}in {{.}} {{ end }}on {{ .Site.Title }} Hugo -- gohugo.io{{ with .Site.LanguageCode }} {{.}}{{end}}{{ with .Site.Author.email }} - {{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}{{end}}{{ with .Site.Author.email }} - {{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}{{end}}{{ with .Site.Copyright }} + {{.}}{{ with site.Author.name }} ({{.}}){{end}}{{end}}{{ with .Site.Author.email }} + {{.}}{{ with site.Author.name }} ({{.}}){{end}}{{end}}{{ with .Site.Copyright }} {{.}}{{end}}{{ if not .Date.IsZero }} {{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}{{ end }} - + {{ range first 15 (where .Data.Pages "Type" "!=" "home") }} {{ .Title }} {{ .Permalink }} {{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }} - {{ with .Site.Author.email }}{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}{{end}} + {{ with .Site.Author.email }}{{.}}{{ with site.Author.name }} ({{.}}){{end}}{{end}} {{ .Permalink }} {{ .Content | html }} {{ end }} - \ No newline at end of file + -- cgit v1.2.3