diff --git a/assets/images/logo_medium.png b/assets/images/logo_medium.png new file mode 100644 index 0000000..24c0c9a Binary files /dev/null and b/assets/images/logo_medium.png differ diff --git a/config.toml b/config.toml index 09f2405..5d46f0a 100644 --- a/config.toml +++ b/config.toml @@ -28,13 +28,13 @@ dateFmt = "02.01.2006 15:04" mastodon = "https://attreno.fr/@etoiledebethleem" peertube = "https://peertube.iriseden.eu/c/etoiledebethleem/videos" -[params.defaultLogoImage] +[params.defaultImage] local = true -src = "images/default_logo.png" +src = "images/logo_medium.png" -[params.defaultCoverImage] +[params.defaultCoverImage] local = true -src = "cover/cover.jpg" +src = "images/cover_1.jpg" [taxonomies] imtag = 'imtags' diff --git a/content/adhesion/_index.md b/content/adhesion/_index.md index 5505a9f..65cc42a 100644 --- a/content/adhesion/_index.md +++ b/content/adhesion/_index.md @@ -1,7 +1,5 @@ --- title: "Campagne d'adhésion 2023-2024" description: Campagne d'adhésion 2023-2024 de l'association des Amis de la Chapelle de Bethléem à Aubevoye. -featured_image: - src: ./images/default_logo.png --- diff --git a/content/countdown/_index.md b/content/countdown/_index.md deleted file mode 100644 index c508836..0000000 --- a/content/countdown/_index.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -title: "Campagne d'adhésion l'Étoile de Bethléem - 2023-2024" -with_header: false -with_footer: false -description: Ouverture de la campagne d'adhésion le 14 juillet 2023 -featured_image: - src: ./images/default_logo.png ---- diff --git a/layouts/actualites/list.html b/layouts/actualites/list.html index eb4e26b..05bb239 100644 --- a/layouts/actualites/list.html +++ b/layouts/actualites/list.html @@ -12,7 +12,7 @@ {{ range .Paginator.Pages }}
  • - {{ $featuredImage := (resources.Get (printf "%s" ("cover/cover.jpg" | safeURL))) }} + {{ $featuredImage := (resources.Get (.Site.Params.defaultCoverImage.src | safeURL)) }} {{ if .Params.featured_image }} {{ $featuredImage = .Resources.GetMatch (.Params.featured_image.src | safeURL) }} diff --git a/layouts/partials/data/title.html b/layouts/partials/data/title.html index 4cf740e..f2e75f3 100644 --- a/layouts/partials/data/title.html +++ b/layouts/partials/data/title.html @@ -29,6 +29,5 @@ {{- end -}} -{{ $title = printf "%s - %s" $title $siteTitle }} {{ return $title }} diff --git a/layouts/partials/head.html b/layouts/partials/head.html index d1e4a92..6ea5582 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -1,6 +1,9 @@ +{{- $title := partialCached "data/title" . .RelPermalink -}} +{{ $title }} — {{ .Site.Title }} + {{- $description := partialCached "data/description" . .RelPermalink -}} @@ -8,10 +11,6 @@ {{ end }} -{{- $title := partialCached "data/title" . .RelPermalink -}} - -{{ $title }} {{ if not .IsHome }}- L'Étoile de Bethléem{{ end }} - {{ partial "opengraph/include.html" . }} @@ -38,7 +37,6 @@ - {{ $style := resources.Get "sass/main.scss" | resources.ToCSS | resources.Fingerprint }} diff --git a/layouts/partials/helpers/image.html b/layouts/partials/helpers/image.html index 373a113..2fc3c92 100644 --- a/layouts/partials/helpers/image.html +++ b/layouts/partials/helpers/image.html @@ -32,7 +32,7 @@ {{ else }} - {{ $defaultImageSetting := .Context.Site.Params.defaultCoverImage }} + {{ $defaultImageSetting := .Context.Site.Params.defaultImage }} {{ $result = merge $result (dict "isDefault" true) }} {{ $result = merge $result (dict "exists" true) }} diff --git a/layouts/partials/opengraph/include.html b/layouts/partials/opengraph/include.html index ad5cd18..743fb76 100644 --- a/layouts/partials/opengraph/include.html +++ b/layouts/partials/opengraph/include.html @@ -17,25 +17,25 @@ -{{- if .IsPage -}} +{{ if .IsPage }} {{- range .Params.tags -}} {{- end -}} -{{- end -}} +{{ end }} -{{- if .IsPage -}} +{{ if .IsPage }} {{- if not .Date.IsZero -}} {{- end -}} {{- if not .Lastmod.IsZero -}} {{- end -}} -{{- else -}} +{{ else }} {{ if not .Site.LastChange.IsZero }} - + {{- end -}} -{{- end -}} +{{ end }} {{ $image := partial "helpers/image" (dict "Context" . "Type" "opengraph") .RelPermalink "opengraph" }} {{ if $image.exists }}