From 319e1bd624df42ffbcb525a87030bcfb334b7c32 Mon Sep 17 00:00:00 2001 From: Olivia206 <olivia.simonet206@gmail.com> Date: Fri, 22 Dec 2023 12:20:49 +0100 Subject: [PATCH] removed default image partial call from event and post --- layouts/partials/events/event.html | 11 ++++++++--- layouts/partials/head/seo.html | 7 +++---- layouts/partials/posts/post.html | 11 ++++++++--- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/layouts/partials/events/event.html b/layouts/partials/events/event.html index a3d4dbe2..6193aff2 100644 --- a/layouts/partials/events/event.html +++ b/layouts/partials/events/event.html @@ -83,14 +83,19 @@ {{ end }} </div> <div class="media"> + {{ $event_image := "" }} {{- if .Params.image -}} + {{ $event_image = .Params.image }} + {{- else if site.Params.events.default_image -}} + {{ $event_image = site.Data.website.default_image }} + {{ end }} + + {{- if or .Params.image site.Params.events.default_image -}} {{- partial "commons/image.html" (dict - "image" .Params.image + "image" $event_image "sizes" site.Params.image_sizes.sections.events.item ) -}} - {{- else if site.Params.events.default_image -}} - {{- partial "commons/image-default.html" -}} {{- end -}} </div> </article> diff --git a/layouts/partials/head/seo.html b/layouts/partials/head/seo.html index 2afeea0d..704b6228 100644 --- a/layouts/partials/head/seo.html +++ b/layouts/partials/head/seo.html @@ -24,12 +24,11 @@ {{- end -}} {{- end -}} {{- $seoImage := "" -}} -{{- if os.FileExists "static/assets/images/share.png" -}} +{{- $defaultImage := site.Data.website.default_image -}} +{{- if $defaultImage -}} + {{- $seoImage = printf "%s/assets/images/share.png" site.BaseURL -}} {{- end -}} -{{- if os.FileExists "static/assets/images/share.jpg" -}} - {{- $seoImage = printf "%s/assets/images/share.jpg" site.BaseURL -}} -{{- end -}} {{- $ogImage := $seoImage -}} {{- $twitterImage := $seoImage -}} {{- $pagefindImage := $seoImage -}} diff --git a/layouts/partials/posts/post.html b/layouts/partials/posts/post.html index d0b1d717..a2b4e38b 100644 --- a/layouts/partials/posts/post.html +++ b/layouts/partials/posts/post.html @@ -49,14 +49,19 @@ </div> <div class="media"> + {{ $post_image := "" }} {{- if .Params.image -}} + {{ $post_image = .Params.image }} + {{- else if site.Params.posts.default_image -}} + {{ $post_image = site.Data.website.default_image }} + {{ end }} + + {{- if or .Params.image site.Params.posts.default_image -}} {{- partial "commons/image.html" (dict - "image" .Params.image + "image" $post_image "sizes" site.Params.image_sizes.sections.posts.item ) -}} - {{- else if site.Params.posts.default_image -}} - {{- partial "commons/image-default.html" -}} {{- end -}} </div> </article> -- GitLab