diff options
| author | Max Arnold <[email protected]> | 2019-11-27 02:11:53 +0700 |
|---|---|---|
| committer | Bjørn Erik Pedersen <[email protected]> | 2019-11-26 20:11:53 +0100 |
| commit | 25a6b33693992e8c6d9c35bc1e781ce3e2bca4be (patch) | |
| tree | 106da0001c10753daa5ddb566ecf31eea778eb24 | |
| parent | 01766439246add22a6e6d0c12f932610be55cd8a (diff) | |
| download | hugo-25a6b33693992e8c6d9c35bc1e781ce3e2bca4be.tar.gz hugo-25a6b33693992e8c6d9c35bc1e781ce3e2bca4be.zip | |
tpl/tplimpl: Add support for featured and global image to OpenGraph template
| -rw-r--r-- | tpl/tplimpl/embedded/templates.autogen.go | 18 | ||||
| -rw-r--r-- | tpl/tplimpl/embedded/templates/opengraph.html | 16 | ||||
| -rw-r--r-- | tpl/tplimpl/embedded/templates/twitter_cards.html | 2 |
3 files changed, 26 insertions, 10 deletions
diff --git a/tpl/tplimpl/embedded/templates.autogen.go b/tpl/tplimpl/embedded/templates.autogen.go index 2bdb56b5b..fd8ecc381 100644 --- a/tpl/tplimpl/embedded/templates.autogen.go +++ b/tpl/tplimpl/embedded/templates.autogen.go @@ -185,9 +185,18 @@ if (!doNotTrack) { <meta property="og:description" content="{{ with .Description }}{{ . }}{{ else }}{{if .IsPage}}{{ .Summary }}{{ else }}{{ with .Site.Params.description }}{{ . }}{{ end }}{{ end }}{{ end }}" /> <meta property="og:type" content="{{ if .IsPage }}article{{ else }}website{{ end }}" /> <meta property="og:url" content="{{ .Permalink }}" /> -{{ with $.Param "images" }}{{ range first 6 . }} +{{ with $.Params.images }}{{ range first 6 . -}} <meta property="og:image" content="{{ . | absURL }}" /> -{{ end }}{{ end }} +{{ end }}{{ else -}} +{{- $images := $.Resources.ByType "image" -}} +{{- $featured := $images.GetMatch "*feature*" -}} +{{- if not $featured }}{{ $featured = $images.GetMatch "{*cover*,*thumbnail*}" }}{{ end -}} +{{- with $featured -}} +<meta property="og:image" content="{{ $featured.Permalink }}"/> +{{ else -}} +{{- with $.Site.Params.images -}} +<meta property="og:image" content="{{ index . 0 | absURL }}"/> +{{ end }}{{ end }}{{ end }} {{- $iso8601 := "2006-01-02T15:04:05-07:00" -}} {{- if .IsPage }} @@ -196,8 +205,7 @@ if (!doNotTrack) { {{ end }} {{- if not .Lastmod.IsZero }}<meta property="article:modified_time" {{ .Lastmod.Format $iso8601 | printf "content=%q" | safeHTMLAttr }} />{{ end }} {{- else }} -{{- if not .Date.IsZero }} -<meta property="og:updated_time" {{ .Date.Format $iso8601 | printf "content=%q" | safeHTMLAttr }} /> +{{- if not .Date.IsZero }}<meta property="og:updated_time" {{ .Date.Format $iso8601 | printf "content=%q" | safeHTMLAttr }} /> {{- end }} {{- end }}{{/* .IsPage */}} @@ -509,7 +517,7 @@ if (!doNotTrack) { {{ else -}} {{- $images := $.Resources.ByType "image" -}} {{- $featured := $images.GetMatch "*feature*" -}} -{{- $featured := cond (ne $featured nil) $featured ($images.GetMatch "{*cover*,*thumbnail*}") -}} +{{- if not $featured }}{{ $featured = $images.GetMatch "{*cover*,*thumbnail*}" }}{{ end -}} {{- with $featured -}} <meta name="twitter:card" content="summary_large_image"/> <meta name="twitter:image" content="{{ $featured.Permalink }}"/> diff --git a/tpl/tplimpl/embedded/templates/opengraph.html b/tpl/tplimpl/embedded/templates/opengraph.html index de2d2fddf..68b4de5a3 100644 --- a/tpl/tplimpl/embedded/templates/opengraph.html +++ b/tpl/tplimpl/embedded/templates/opengraph.html @@ -2,9 +2,18 @@ <meta property="og:description" content="{{ with .Description }}{{ . }}{{ else }}{{if .IsPage}}{{ .Summary }}{{ else }}{{ with .Site.Params.description }}{{ . }}{{ end }}{{ end }}{{ end }}" /> <meta property="og:type" content="{{ if .IsPage }}article{{ else }}website{{ end }}" /> <meta property="og:url" content="{{ .Permalink }}" /> -{{ with $.Param "images" }}{{ range first 6 . }} +{{ with $.Params.images }}{{ range first 6 . -}} <meta property="og:image" content="{{ . | absURL }}" /> -{{ end }}{{ end }} +{{ end }}{{ else -}} +{{- $images := $.Resources.ByType "image" -}} +{{- $featured := $images.GetMatch "*feature*" -}} +{{- if not $featured }}{{ $featured = $images.GetMatch "{*cover*,*thumbnail*}" }}{{ end -}} +{{- with $featured -}} +<meta property="og:image" content="{{ $featured.Permalink }}"/> +{{ else -}} +{{- with $.Site.Params.images -}} +<meta property="og:image" content="{{ index . 0 | absURL }}"/> +{{ end }}{{ end }}{{ end }} {{- $iso8601 := "2006-01-02T15:04:05-07:00" -}} {{- if .IsPage }} @@ -13,8 +22,7 @@ {{ end }} {{- if not .Lastmod.IsZero }}<meta property="article:modified_time" {{ .Lastmod.Format $iso8601 | printf "content=%q" | safeHTMLAttr }} />{{ end }} {{- else }} -{{- if not .Date.IsZero }} -<meta property="og:updated_time" {{ .Date.Format $iso8601 | printf "content=%q" | safeHTMLAttr }} /> +{{- if not .Date.IsZero }}<meta property="og:updated_time" {{ .Date.Format $iso8601 | printf "content=%q" | safeHTMLAttr }} /> {{- end }} {{- end }}{{/* .IsPage */}} diff --git a/tpl/tplimpl/embedded/templates/twitter_cards.html b/tpl/tplimpl/embedded/templates/twitter_cards.html index fc4895b56..cbe2430bc 100644 --- a/tpl/tplimpl/embedded/templates/twitter_cards.html +++ b/tpl/tplimpl/embedded/templates/twitter_cards.html @@ -4,7 +4,7 @@ {{ else -}} {{- $images := $.Resources.ByType "image" -}} {{- $featured := $images.GetMatch "*feature*" -}} -{{- $featured := cond (ne $featured nil) $featured ($images.GetMatch "{*cover*,*thumbnail*}") -}} +{{- if not $featured }}{{ $featured = $images.GetMatch "{*cover*,*thumbnail*}" }}{{ end -}} {{- with $featured -}} <meta name="twitter:card" content="summary_large_image"/> <meta name="twitter:image" content="{{ $featured.Permalink }}"/> |