diff options
| -rw-r--r-- | tpl/tplimpl/embedded/templates.autogen.go | 19 | ||||
| -rw-r--r-- | tpl/tplimpl/embedded/templates/schema.html | 19 |
2 files changed, 28 insertions, 10 deletions
diff --git a/tpl/tplimpl/embedded/templates.autogen.go b/tpl/tplimpl/embedded/templates.autogen.go index fd8ecc381..cb7fb9512 100644 --- a/tpl/tplimpl/embedded/templates.autogen.go +++ b/tpl/tplimpl/embedded/templates.autogen.go @@ -283,17 +283,26 @@ if (!doNotTrack) { {`schema.html`, `<meta itemprop="name" content="{{ .Title }}"> <meta itemprop="description" content="{{ with .Description }}{{ . }}{{ else }}{{if .IsPage}}{{ .Summary }}{{ else }}{{ with .Site.Params.description }}{{ . }}{{ end }}{{ end }}{{ end }}"> -{{if .IsPage}}{{ $ISO8601 := "2006-01-02T15:04:05-07:00" }}{{ if not .PublishDate.IsZero }} +{{- if .IsPage }}{{ $ISO8601 := "2006-01-02T15:04:05-07:00" }}{{ if not .PublishDate.IsZero }} <meta itemprop="datePublished" content="{{ .PublishDate.Format $ISO8601 | safeHTML }}" />{{ end }} {{ if not .Lastmod.IsZero }}<meta itemprop="dateModified" content="{{ .Lastmod.Format $ISO8601 | safeHTML }}" />{{ end }} <meta itemprop="wordCount" content="{{ .WordCount }}"> -{{ with .Params.images }}{{ range first 6 . }} - <meta itemprop="image" content="{{ . | absURL }}"> -{{ end }}{{ end }} +{{ with $.Params.images }}{{ range first 6 . -}} +<meta itemprop="image" content="{{ . | absURL }}"> +{{ end }}{{ else -}} +{{- $images := $.Resources.ByType "image" -}} +{{- $featured := $images.GetMatch "*feature*" -}} +{{- if not $featured }}{{ $featured = $images.GetMatch "{*cover*,*thumbnail*}" }}{{ end -}} +{{- with $featured -}} +<meta itemprop="image" content="{{ $featured.Permalink }}"> +{{ else -}} +{{- with $.Site.Params.images -}} +<meta itemprop="image" content="{{ index . 0 | absURL }}"/> +{{ end }}{{ end }}{{ end }} <!-- Output all taxonomies as schema.org keywords --> <meta itemprop="keywords" content="{{ if .IsPage}}{{ range $index, $tag := .Params.tags }}{{ $tag }},{{ end }}{{ else }}{{ range $plural, $terms := .Site.Taxonomies }}{{ range $term, $val := $terms }}{{ printf "%s," $term }}{{ end }}{{ end }}{{ end }}" /> -{{ end }}`}, +{{- end }}`}, {`shortcodes/__h_simple_assets.html`, `{{ define "__h_simple_css" }}{{/* These template definitions are global. */}} {{- if not (.Page.Scratch.Get "__h_simple_css") -}} {{/* Only include once */}} diff --git a/tpl/tplimpl/embedded/templates/schema.html b/tpl/tplimpl/embedded/templates/schema.html index a76dbdd42..19648abef 100644 --- a/tpl/tplimpl/embedded/templates/schema.html +++ b/tpl/tplimpl/embedded/templates/schema.html @@ -1,14 +1,23 @@ <meta itemprop="name" content="{{ .Title }}"> <meta itemprop="description" content="{{ with .Description }}{{ . }}{{ else }}{{if .IsPage}}{{ .Summary }}{{ else }}{{ with .Site.Params.description }}{{ . }}{{ end }}{{ end }}{{ end }}"> -{{if .IsPage}}{{ $ISO8601 := "2006-01-02T15:04:05-07:00" }}{{ if not .PublishDate.IsZero }} +{{- if .IsPage }}{{ $ISO8601 := "2006-01-02T15:04:05-07:00" }}{{ if not .PublishDate.IsZero }} <meta itemprop="datePublished" content="{{ .PublishDate.Format $ISO8601 | safeHTML }}" />{{ end }} {{ if not .Lastmod.IsZero }}<meta itemprop="dateModified" content="{{ .Lastmod.Format $ISO8601 | safeHTML }}" />{{ end }} <meta itemprop="wordCount" content="{{ .WordCount }}"> -{{ with .Params.images }}{{ range first 6 . }} - <meta itemprop="image" content="{{ . | absURL }}"> -{{ end }}{{ end }} +{{ with $.Params.images }}{{ range first 6 . -}} +<meta itemprop="image" content="{{ . | absURL }}"> +{{ end }}{{ else -}} +{{- $images := $.Resources.ByType "image" -}} +{{- $featured := $images.GetMatch "*feature*" -}} +{{- if not $featured }}{{ $featured = $images.GetMatch "{*cover*,*thumbnail*}" }}{{ end -}} +{{- with $featured -}} +<meta itemprop="image" content="{{ $featured.Permalink }}"> +{{ else -}} +{{- with $.Site.Params.images -}} +<meta itemprop="image" content="{{ index . 0 | absURL }}"/> +{{ end }}{{ end }}{{ end }} <!-- Output all taxonomies as schema.org keywords --> <meta itemprop="keywords" content="{{ if .IsPage}}{{ range $index, $tag := .Params.tags }}{{ $tag }},{{ end }}{{ else }}{{ range $plural, $terms := .Site.Taxonomies }}{{ range $term, $val := $terms }}{{ printf "%s," $term }}{{ end }}{{ end }}{{ end }}" /> -{{ end }}
\ No newline at end of file +{{- end }}
\ No newline at end of file |