From c782f5cfc2f06b86cd2900c9381262f41ebf67da Mon Sep 17 00:00:00 2001 From: Sangeeth Sudheer Date: Fri, 25 Apr 2025 22:09:40 +0530 Subject: Make opengraph.html a normal partial Moves `opengraph.html` under `layout/partials` and updates `head.html` to include from the updated path. This change is needed to make things work with Hugo >=v0.144.0 as they moved templates like `opengraph.html` from `_internals` breaking existing usage. The doc also recommends doing this: https://gohugo.io/templates/embedded/#open-graph This change shouldn't affect existing users of Typo unless they override `head.html`. --- layouts/_internal/opengraph.html | 94 ---------------------------------------- layouts/partials/head.html | 2 +- layouts/partials/opengraph.html | 94 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 95 insertions(+), 95 deletions(-) delete mode 100644 layouts/_internal/opengraph.html create mode 100644 layouts/partials/opengraph.html diff --git a/layouts/_internal/opengraph.html b/layouts/_internal/opengraph.html deleted file mode 100644 index dfe7b08..0000000 --- a/layouts/_internal/opengraph.html +++ /dev/null @@ -1,94 +0,0 @@ -{{- /* - Original source: https://github.com/gohugoio/hugo/blob/61c39ae63b62667d965c2ff96d085f4eda59bcb2/tpl/tplimpl/embedded/templates/opengraph.html -*/ -}} - - - -{{- with or site.Title site.Params.title | plainify }} - -{{- end }} - -{{- /* Source modified to remove pipe to `plainify` */ -}} -{{- with or .Title site.Title site.Params.title }} - -{{- end }} - -{{- with or .Description .Summary site.Params.description | plainify | htmlUnescape }} - -{{- end }} - -{{- with or .Params.locale site.Language.LanguageCode }} - -{{- end }} - -{{- if .IsPage }} - - {{- with .Section }} - - {{- end }} - {{- $ISO8601 := "2006-01-02T15:04:05-07:00" }} - {{- with .PublishDate }} - - {{- end }} - {{- with .Lastmod }} - - {{- end }} - {{- range .GetTerms "tags" | first 6 }} - - {{- end }} -{{- else }} - -{{- end }} - -{{- with partial "_funcs/get-page-images" . }} - {{- range . | first 6 }} - - {{- end }} -{{- else -}} - - {{- /* - Source modified to load `assets/images/og-image.{webp,png,jpg}` files if any of them exists. - og-image.html can be modified in Hugo project if custom image generation logic is desired such - as using an external service. - */ -}} - - {{- if (and (or .IsHome .IsPage) (templates.Exists "partials/head/og-image.html")) -}} - {{- $ogImage := partial "head/og-image.html" . -}} - {{- with $ogImage -}} - - {{- end -}} - {{- end }} - -{{- end }} - -{{- with .Params.audio }} - {{- range . | first 6 }} - - {{- end }} -{{- end }} - -{{- with .Params.videos }} - {{- range . | first 6 }} - - {{- end }} -{{- end }} - -{{- range .GetTerms "series" }} - {{- range .Pages | first 7 }} - {{- if ne $ . }} - - {{- end }} - {{- end }} -{{- end }} - -{{- with site.Params.social }} - {{- if reflect.IsMap . }} - {{- with .facebook_app_id }} - - {{- else }} - {{- with .facebook_admin }} - - {{- end }} - {{- end }} - {{- end }} -{{- end }} \ No newline at end of file diff --git a/layouts/partials/head.html b/layouts/partials/head.html index f62f983..272a9ed 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -36,7 +36,7 @@ -{{ template "_internal/opengraph.html" . }} +{{ template "partials/opengraph.html" . }} {{ partialCached "head/css.html" . }} {{ partialCached "head/js.html" . }} diff --git a/layouts/partials/opengraph.html b/layouts/partials/opengraph.html new file mode 100644 index 0000000..94176db --- /dev/null +++ b/layouts/partials/opengraph.html @@ -0,0 +1,94 @@ +{{- /* + Original source: https://github.com/gohugoio/hugo/blob/61c39ae63b62667d965c2ff96d085f4eda59bcb2/tpl/tplimpl/embedded/templates/opengraph.html +*/ -}} + + + +{{- with or site.Title site.Params.title | plainify }} + +{{- end }} + +{{- /* Source modified to remove pipe to `plainify` */ -}} +{{- with or .Title site.Title site.Params.title }} + +{{- end }} + +{{- with or .Description .Summary site.Params.description | plainify | htmlUnescape }} + +{{- end }} + +{{- with or .Params.locale site.Language.LanguageCode }} + +{{- end }} + +{{- if .IsPage }} + + {{- with .Section }} + + {{- end }} + {{- $ISO8601 := "2006-01-02T15:04:05-07:00" }} + {{- with .PublishDate }} + + {{- end }} + {{- with .Lastmod }} + + {{- end }} + {{- range .GetTerms "tags" | first 6 }} + + {{- end }} +{{- else }} + +{{- end }} + +{{- with partial "_funcs/get-page-images" . }} + {{- range . | first 6 }} + + {{- end }} +{{- else }} + + {{- /* + Source modified to load `assets/images/og-image.{webp,png,jpg}` files if any of them exists. + og-image.html can be modified in Hugo project if custom image generation logic is desired such + as using an external service. + */ -}} + + {{- if (and (or .IsHome .IsPage) (templates.Exists "partials/head/og-image.html")) }} + {{- $ogImage := partial "head/og-image.html" . }} + {{- with $ogImage }} + + {{- end }} + {{- end }} + +{{- end }} + +{{- with .Params.audio }} + {{- range . | first 6 }} + + {{- end }} +{{- end }} + +{{- with .Params.videos }} + {{- range . | first 6 }} + + {{- end }} +{{- end }} + +{{- range .GetTerms "series" }} + {{- range .Pages | first 7 }} + {{- if ne $ . }} + + {{- end }} + {{- end }} +{{- end }} + +{{- with site.Params.social }} + {{- if reflect.IsMap . }} + {{- with .facebook_app_id }} + + {{- else }} + {{- with .facebook_admin }} + + {{- end }} + {{- end }} + {{- end }} +{{- end }} \ No newline at end of file -- cgit v1.2.3 From 1790b5684ca8da26894dcb5d0cd7c12163f08a61 Mon Sep 17 00:00:00 2001 From: Sangeeth Sudheer Date: Sat, 26 Apr 2025 09:19:31 +0530 Subject: Include og-image.html in all pages Not sure why I added those checks earlier, but it's good to have og-image.html in all pages, like sections for tags/content categories. --- layouts/partials/opengraph.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/layouts/partials/opengraph.html b/layouts/partials/opengraph.html index 94176db..d770df1 100644 --- a/layouts/partials/opengraph.html +++ b/layouts/partials/opengraph.html @@ -52,8 +52,8 @@ as using an external service. */ -}} - {{- if (and (or .IsHome .IsPage) (templates.Exists "partials/head/og-image.html")) }} - {{- $ogImage := partial "head/og-image.html" . }} + {{- if templates.Exists "partials/head/og-image.html" }} + {{- $ogImage := partial "head/og-image.html" . | strings.TrimSpace }} {{- with $ogImage }} {{- end }} -- cgit v1.2.3