diff --git a/config.yaml b/config.yaml index 15c4c6412c7a7ebacec16b4fa3d0c16c87d05347..fa8733f4a06d13be3a29d58c30618d166d8531a1 100644 --- a/config.yaml +++ b/config.yaml @@ -43,11 +43,15 @@ params: single: backlinks: false pages: + default_image: false index: truncate_description: 200 # Set to 0 to disable truncate papers: + default_image: false sidebar: direction: start + volumes: + default_image: false persons: index: layout: grid # grid | list diff --git a/layouts/partials/blocks/templates/pages/list.html b/layouts/partials/blocks/templates/pages/list.html index 879d74d67904c9ebb5b2b26a0a39b6c8b2d5f0d5..0314906c6715a009eeeb5ec398ccc1e117bec5c7 100644 --- a/layouts/partials/blocks/templates/pages/list.html +++ b/layouts/partials/blocks/templates/pages/list.html @@ -36,7 +36,7 @@ "sizes" site.Params.image_sizes.blocks.pages.list ) -}} {{- else -}} - {{- partial "commons/image-default.html" -}} + {{- partial "commons/image-default.html" "pages" -}} {{- end -}} </div> {{ end }} diff --git a/layouts/partials/blocks/templates/posts/large.html b/layouts/partials/blocks/templates/posts/large.html index d0b66bde8f9865518eac54800e45d78e235dfd69..c76b4099268d0bcf105844a2e217d8e847e8ef25 100644 --- a/layouts/partials/blocks/templates/posts/large.html +++ b/layouts/partials/blocks/templates/posts/large.html @@ -48,12 +48,12 @@ <div class="media"> {{- if .Params.image -}} {{- partial "commons/image.html" - (dict - "image" .Params.image - "sizes" site.Params.image_sizes.sections.posts.item - ) -}} - {{- else if site.Params.posts.default_image -}} - {{- partial "commons/image-default.html" -}} + (dict + "image" .Params.image + "sizes" site.Params.image_sizes.sections.posts.item + ) -}} + {{- else -}} + {{- partial "commons/image-default.html" "posts" -}} {{- end -}} </div> </article> diff --git a/layouts/partials/commons/image-default.html b/layouts/partials/commons/image-default.html index 4b4847a8b7724b318efbbf0d19bf0cab0e477093..abd7e74a470b26a0083fb97255dd9b24deceb233 100644 --- a/layouts/partials/commons/image-default.html +++ b/layouts/partials/commons/image-default.html @@ -1,18 +1,15 @@ -{{- if os.FileExists "static/assets/images/default.png" -}} - {{ $file := "/assets/images/default.png" }} - {{ $fileDimensions := partial "GetImageDimensions" (dict "context" . "file" $file "static" true) }} - {{- $lazy := default true .lazy -}} - <img alt="" src="{{ $file }}" width="{{ index $fileDimensions 1 }}" height="{{ index $fileDimensions 0 }}" - {{- if .class }} class="{{ .class }}"{{- end -}} - {{- if $lazy }} loading="lazy"{{- end -}} - > -{{ else if os.FileExists "static/assets/images/default.jpg" }} - {{ $file := "/assets/images/default.jpg" }} - {{ $fileDimensions := partial "GetImageDimensions" (dict "context" . "file" $file "static" true) }} - {{- $lazy := default true .lazy -}} - <img alt="" src="{{ $file }}" width="{{ index $fileDimensions 1 }}" height="{{ index $fileDimensions 0 }}" - {{- if .class }} class="{{ .class }}"{{- end -}} - {{- if $lazy }} loading="lazy"{{- end -}} - > -{{- end -}} +{{ $section_type := .}} +{{ $use_default := (index site.Params $section_type).default_image}} +{{ $image := site.Data.website.default_image }} +{{ if and $use_default $image }} + {{ with index site.Params.image_sizes.sections $section_type }} + {{ $sizes := .items }} + + {{- partial "commons/image.html" + (dict + "image" $image + "sizes" $sizes + ) -}} + {{ end }} +{{ end }} \ No newline at end of file diff --git a/layouts/partials/events/event.html b/layouts/partials/events/event.html index 633b9adca87a19cbdab7b95ba0b46f477db26b7e..cc57c58597762a4ecb8d99815e4596e3117f08a2 100644 --- a/layouts/partials/events/event.html +++ b/layouts/partials/events/event.html @@ -48,7 +48,7 @@ {{ else if eq .Params.dates.status "future" }} {{- i18n "blocks.events.future" -}} {{ else if eq .Params.dates.status "archive" }} - {{- i18n "blocks.events.archive" -}} + {{- i18n "blocks.events.archive" -}} {{ end }} </p> {{ end }} @@ -81,12 +81,12 @@ <div class="media"> {{- if .Params.image -}} {{- partial "commons/image.html" - (dict - "image" .Params.image - "sizes" site.Params.image_sizes.sections.events.item - ) -}} - {{- else if site.Params.events.default_image -}} - {{- partial "commons/image-default.html" -}} + (dict + "image" .Params.image + "sizes" site.Params.image_sizes.sections.events.item + ) -}} + {{- else -}} + {{- partial "commons/image-default.html" "events" -}} {{- end -}} </div> </article> diff --git a/layouts/partials/head/seo.html b/layouts/partials/head/seo.html index 2afeea0df6b88ea9977d1b2d9a3fc0c47ac8b11a..ac7dc711dbc7c8b07457d7f8005d43f23c709618 100644 --- a/layouts/partials/head/seo.html +++ b/layouts/partials/head/seo.html @@ -90,5 +90,4 @@ Limiter le tracking par le CDN https://framagit.org/chatons/CHATONS/-/issues/200#note_1987024 */}} -<meta name="referrer" content="no-referrer"> - \ No newline at end of file +<meta name="referrer" content="no-referrer"> \ No newline at end of file diff --git a/layouts/partials/pages/page-media.html b/layouts/partials/pages/page-media.html index 1f6e6e063d9798a1990fd30e8ff43ace948b1847..06858736c6576750e7efa50fc87c181b3f35e366 100644 --- a/layouts/partials/pages/page-media.html +++ b/layouts/partials/pages/page-media.html @@ -6,6 +6,6 @@ "sizes" site.Params.image_sizes.sections.pages.item ) -}} {{- else -}} - {{- partial "commons/image-default.html" -}} + {{- partial "commons/image-default.html" "pages" -}} {{- end -}} </div> diff --git a/layouts/partials/papers/document-nav.html b/layouts/partials/papers/document-nav.html index 49b04d431ee141a35109827d2a0609dcd6fb99eb..a2f0211d51ca0d429d40b8fd4ce9989acf55f97b 100644 --- a/layouts/partials/papers/document-nav.html +++ b/layouts/partials/papers/document-nav.html @@ -15,8 +15,8 @@ "tablet" "208x247" "desktop" "408x485" ) -}} - {{- else if site.Params.default_image.url -}} - {{- partial "commons/image-default.html" (dict "class" "img-fluid") -}} + {{- else -}} + {{- partial "commons/image-default.html" "papers" -}} {{- end -}} </div> </a> diff --git a/layouts/partials/papers/sidebar.html b/layouts/partials/papers/sidebar.html index c00aa0a4b33d633968cddeabdb6f28f52ce8dc4d..b8d07c36e12d76de8b5207044e16d43f7a84e1c6 100644 --- a/layouts/partials/papers/sidebar.html +++ b/layouts/partials/papers/sidebar.html @@ -17,8 +17,8 @@ "tablet" "208x247" "desktop" "408x485" ) -}} - {{- else if site.Params.default_image.url -}} - {{- partial "commons/image-default.html" (dict "class" "img-fluid") -}} + {{- else -}} + {{- partial "commons/image-default.html" "papers" -}} {{- end -}} </div> </a> diff --git a/layouts/partials/posts/post.html b/layouts/partials/posts/post.html index 0ee9eb496725a1ca2a0aad331867d77b6662ec5c..0137312c24227bf98f93550bec9aec4ead3f75d3 100644 --- a/layouts/partials/posts/post.html +++ b/layouts/partials/posts/post.html @@ -47,12 +47,12 @@ <div class="media"> {{- if .Params.image -}} {{- partial "commons/image.html" - (dict - "image" .Params.image - "sizes" site.Params.image_sizes.sections.posts.item - ) -}} - {{- else if site.Params.posts.default_image -}} - {{- partial "commons/image-default.html" -}} + (dict + "image" .Params.image + "sizes" site.Params.image_sizes.sections.posts.item + ) -}} + {{- else -}} + {{- partial "commons/image-default.html" "posts" -}} {{- end -}} </div> </article> diff --git a/layouts/partials/volumes/volume.html b/layouts/partials/volumes/volume.html index d6a49058743ad40ca2f50c958cdeea92bd14ef4c..2ff521816ad11ff47f33a8e972279017f04d6368 100644 --- a/layouts/partials/volumes/volume.html +++ b/layouts/partials/volumes/volume.html @@ -11,8 +11,8 @@ "alt" .Title "sizes" site.Params.image_sizes.sections.volumes.item ) -}} - {{- else if site.Params.default_image.url -}} - {{- partial "commons/image-default.html" (dict "class" "img-fluid") -}} + {{- else -}} + {{- partial "commons/image-default.html" "volumes" -}} {{- end -}} </div> </article>