From 0e4e1c8bda4070743e7b7889bb39ea85b3894fb4 Mon Sep 17 00:00:00 2001 From: Alexis BENOIT Date: Thu, 11 Jun 2026 18:00:43 +0200 Subject: [PATCH 01/22] add meta in hero --- layouts/_partials/organizations/single.html | 11 +++++------ layouts/_partials/organizations/single/hero.html | 1 + layouts/_partials/organizations/single/meta.html | 6 ++++++ 3 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 layouts/_partials/organizations/single/meta.html diff --git a/layouts/_partials/organizations/single.html b/layouts/_partials/organizations/single.html index af0180aef..fde239dd2 100644 --- a/layouts/_partials/organizations/single.html +++ b/layouts/_partials/organizations/single.html @@ -2,17 +2,16 @@ {{ partial "organizations/single/pagefind.html" . }}
- {{ partial "toc/container.html" (dict - "context" . - ) }}
{{ partial "organizations/single/summary.html" (dict - "context" . + "context" . ) }} + {{ $meta_position := partial "commons/single/meta/helpers/GetPosition" . }} + {{ if eq $meta_position "content" }} + {{ partial "organizations/single/meta.html" . }} + {{ end }} {{ partial "organizations/single/presentation.html" . }} - {{ partial "taxonomies/single/container.html" . }} - {{ partial "commons/contact-details.html" (dict "subject" .) }}
{{ partial "organizations/partials/logo.html" . }}
diff --git a/layouts/_partials/organizations/single/hero.html b/layouts/_partials/organizations/single/hero.html index eab2e2322..35cee632d 100644 --- a/layouts/_partials/organizations/single/hero.html +++ b/layouts/_partials/organizations/single/hero.html @@ -3,5 +3,6 @@ "title" $title "image" .Params.image "sizes" site.Params.image_sizes.sections.organizations.hero + "meta" ( partial "organizations/single/meta.html" . ) "context" . ) -}} diff --git a/layouts/_partials/organizations/single/meta.html b/layouts/_partials/organizations/single/meta.html new file mode 100644 index 000000000..5f1f0a8ff --- /dev/null +++ b/layouts/_partials/organizations/single/meta.html @@ -0,0 +1,6 @@ +{{ $meta_class := partial "commons/single/meta/helpers/GetMetaClass" . }} + +
+ {{ partial "taxonomies/single/container.html" . }} + {{ partial "commons/contact-details.html" (dict "subject" .) }} +
\ No newline at end of file From ea97ee7e85d019f620d5c9001042eeb1e91ed215 Mon Sep 17 00:00:00 2001 From: Alexis BENOIT Date: Thu, 11 Jun 2026 18:11:49 +0200 Subject: [PATCH 02/22] wip contact in hero --- layouts/_partials/organizations/single.html | 14 +++++++------- layouts/_partials/organizations/single/meta.html | 8 ++++---- .../_partials/organizations/single/summary.html | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/layouts/_partials/organizations/single.html b/layouts/_partials/organizations/single.html index fde239dd2..411a28f30 100644 --- a/layouts/_partials/organizations/single.html +++ b/layouts/_partials/organizations/single.html @@ -1,17 +1,17 @@ +{{ $meta_position := partial "commons/single/meta/helpers/GetPosition" . }} + {{ partial "organizations/single/hero.html" . }} {{ partial "organizations/single/pagefind.html" . }}
- {{ partial "organizations/single/summary.html" (dict - "context" . - ) }} - {{ $meta_position := partial "commons/single/meta/helpers/GetPosition" . }} - {{ if eq $meta_position "content" }} - {{ partial "organizations/single/meta.html" . }} - {{ end }} + {{ partial "organizations/single/summary.html" . }} {{ partial "organizations/single/presentation.html" . }} + {{ if and .Params.taxonomies (eq $meta_position "content") }} + {{ partial "taxonomies/single/container.html" . }} + {{ partial "commons/contact-details.html" (dict "subject" .) }} + {{ end }}
{{ partial "organizations/partials/logo.html" . }}
diff --git a/layouts/_partials/organizations/single/meta.html b/layouts/_partials/organizations/single/meta.html index 5f1f0a8ff..e6b062dfe 100644 --- a/layouts/_partials/organizations/single/meta.html +++ b/layouts/_partials/organizations/single/meta.html @@ -1,6 +1,6 @@ {{ $meta_class := partial "commons/single/meta/helpers/GetMetaClass" . }} -
- {{ partial "taxonomies/single/container.html" . }} - {{ partial "commons/contact-details.html" (dict "subject" .) }} -
\ No newline at end of file +
    + {{ partial "commons/single/meta/taxonomies.html" . }} +
+{{ partial "commons/contact-details.html" (dict "subject" .) }} diff --git a/layouts/_partials/organizations/single/summary.html b/layouts/_partials/organizations/single/summary.html index 4f8311694..b5bb68fef 100644 --- a/layouts/_partials/organizations/single/summary.html +++ b/layouts/_partials/organizations/single/summary.html @@ -1 +1 @@ -{{- partial "commons/summary/container.html" . -}} +{{- partial "commons/summary/container.html" (dict "context" .) -}} From 91b7cf5bf9c60d65f2ffcefd6980868fb39f7b4f Mon Sep 17 00:00:00 2001 From: Alexis BENOIT Date: Fri, 12 Jun 2026 11:13:15 +0200 Subject: [PATCH 03/22] cleanup --- assets/sass/_theme/design-system/layout.sass | 2 ++ .../_theme/design-system/single/sidebar.sass | 7 +++++++ assets/sass/_theme/hugo-osuny.sass | 1 + assets/sass/_theme/sections/jobs.sass | 14 -------------- assets/sass/_theme/sections/organizations.sass | 17 ++++------------- assets/sass/_theme/sections/posts.sass | 11 ----------- assets/sass/_theme/sections/projects.sass | 13 ------------- .../_partials/commons/single/meta/contacts.html | 17 +++++++++++++++++ layouts/_partials/organizations/single.html | 9 +++++---- .../_partials/organizations/single/meta.html | 4 ++-- 10 files changed, 38 insertions(+), 57 deletions(-) create mode 100644 assets/sass/_theme/design-system/single/sidebar.sass create mode 100644 layouts/_partials/commons/single/meta/contacts.html diff --git a/assets/sass/_theme/design-system/layout.sass b/assets/sass/_theme/design-system/layout.sass index d84511b05..58da8aeac 100644 --- a/assets/sass/_theme/design-system/layout.sass +++ b/assets/sass/_theme/design-system/layout.sass @@ -79,6 +79,8 @@ ol @include in-page-with-sidebar .heading h2, .block .block-content padding-left: offset(4) + .section-sidebar + margin-top: 0 details &:not([open]):hover diff --git a/assets/sass/_theme/design-system/single/sidebar.sass b/assets/sass/_theme/design-system/single/sidebar.sass new file mode 100644 index 000000000..94c6f47d0 --- /dev/null +++ b/assets/sass/_theme/design-system/single/sidebar.sass @@ -0,0 +1,7 @@ +.section-sidebar + @include in-page-with-sidebar + @include sidebar + @include in-page-without-sidebar + @include aside-full-width + @include media-breakpoint-down(desktop) + @include container diff --git a/assets/sass/_theme/hugo-osuny.sass b/assets/sass/_theme/hugo-osuny.sass index 52708ded1..20c84fbc0 100644 --- a/assets/sass/_theme/hugo-osuny.sass +++ b/assets/sass/_theme/hugo-osuny.sass @@ -43,6 +43,7 @@ @import design-system/offcanvas @import design-system/pagination @import design-system/print +@import design-system/single/sidebar @import design-system/table @import design-system/table_of_contents @import design-system/taxonomies diff --git a/assets/sass/_theme/sections/jobs.sass b/assets/sass/_theme/sections/jobs.sass index fa30ff35c..d2d4a7099 100644 --- a/assets/sass/_theme/sections/jobs.sass +++ b/assets/sass/_theme/sections/jobs.sass @@ -8,17 +8,3 @@ + time &::before content: ' • ' - -// sidebar -.jobs__page - &:not(.full-width) - .section-sidebar - @include sidebar - - &.full-width - .job-sidebar - @include media-breakpoint-down(desktop) - @include container - - @include media-breakpoint-up(desktop) - @include aside-full-width \ No newline at end of file diff --git a/assets/sass/_theme/sections/organizations.sass b/assets/sass/_theme/sections/organizations.sass index b392b5a2e..07a21483a 100644 --- a/assets/sass/_theme/sections/organizations.sass +++ b/assets/sass/_theme/sections/organizations.sass @@ -117,13 +117,6 @@ margin-top: $spacing-4 .organizations__page - .lead - font-family: $lead-sidebar-font-family - font-weight: $lead-sidebar-weight - line-height: $lead-sidebar-line-height - margin-bottom: $spacing-3 - @include media-breakpoint-up(desktop) - font-size: $lead-sidebar-size-desktop .document-content [itemprop="articleBody"] + .organization-logo figcaption @@ -148,6 +141,9 @@ margin-top: 0 &:not(:first-child) margin-top: $spacing-5 + &:not(.full-width) + [itemprop="articleBody"] + padding-left: offset(4) @include media-breakpoint-down(md) .document-content .organization-logo @@ -163,9 +159,4 @@ [itemprop="articleBody"] width: columns(8) + .organization-logo - width: columns(3) - .contacts-details - ul - @include grid(2) - li - margin-top: 0 + width: columns(3) \ No newline at end of file diff --git a/assets/sass/_theme/sections/posts.sass b/assets/sass/_theme/sections/posts.sass index 57c6d75b9..b392358d3 100644 --- a/assets/sass/_theme/sections/posts.sass +++ b/assets/sass/_theme/sections/posts.sass @@ -231,9 +231,6 @@ // Safe spacing if post is empty .document-content @include document-min-height(600px) - &:not(.full-width) - .post-sidebar - @include sidebar .block-signatures .signatures @include list-reset @@ -266,14 +263,6 @@ + li margin-top: $spacing-3 - &.full-width - .post-sidebar - @include media-breakpoint-down(desktop) - @include container - - @include media-breakpoint-up(desktop) - @include aside-full-width - .related margin-top: $spacing-3 .posts diff --git a/assets/sass/_theme/sections/projects.sass b/assets/sass/_theme/sections/projects.sass index 08a197051..7651250a2 100644 --- a/assets/sass/_theme/sections/projects.sass +++ b/assets/sass/_theme/sections/projects.sass @@ -174,19 +174,6 @@ flex-wrap: wrap li white-space: nowrap - - &:not(.full-width) - .project-sidebar - @include sidebar - - &.full-width - .project-sidebar - @include media-breakpoint-down(desktop) - @include container - - @include media-breakpoint-up(desktop) - @include aside-full-width - @include media-breakpoint-up(sm) .hero .project-infos diff --git a/layouts/_partials/commons/single/meta/contacts.html b/layouts/_partials/commons/single/meta/contacts.html new file mode 100644 index 000000000..6e0ec1e6c --- /dev/null +++ b/layouts/_partials/commons/single/meta/contacts.html @@ -0,0 +1,17 @@ +{{ $name := .Title }} +{{ $with_labels := partial "commons/single/meta/helpers/WithLabels" . }} +{{ with .Params.contact_details }} + {{ if or .websites .social_networks .emails .phone_numbers .phone_professional }} + {{ partial "commons/contact-details/links.html" (dict + "context" . + "name" $name + "with_labels" $with_labels + ) }} + {{ end }} + {{ if .postal_address }} + {{ partial "commons/contact-details/address.html" (dict + "postal_address" .postal_address + "with_labels" $with_labels + ) }} + {{ end }} +{{ end }} \ No newline at end of file diff --git a/layouts/_partials/organizations/single.html b/layouts/_partials/organizations/single.html index 411a28f30..d888e08d2 100644 --- a/layouts/_partials/organizations/single.html +++ b/layouts/_partials/organizations/single.html @@ -4,14 +4,15 @@ {{ partial "organizations/single/pagefind.html" . }}
+ {{ partial "posts/single/sidebar.html" . }} +
{{ partial "organizations/single/summary.html" . }} {{ partial "organizations/single/presentation.html" . }} - {{ if and .Params.taxonomies (eq $meta_position "content") }} - {{ partial "taxonomies/single/container.html" . }} - {{ partial "commons/contact-details.html" (dict "subject" .) }} - {{ end }} + {{/* {{ if eq $meta_position "content" }} + {{ partial "organizations/single/meta.html" . }} + {{ end }} */}}
{{ partial "organizations/partials/logo.html" . }}
diff --git a/layouts/_partials/organizations/single/meta.html b/layouts/_partials/organizations/single/meta.html index e6b062dfe..0883f9353 100644 --- a/layouts/_partials/organizations/single/meta.html +++ b/layouts/_partials/organizations/single/meta.html @@ -2,5 +2,5 @@
    {{ partial "commons/single/meta/taxonomies.html" . }} -
-{{ partial "commons/contact-details.html" (dict "subject" .) }} + {{ partial "commons/single/meta/contacts.html" . }} + \ No newline at end of file From 8467dfa7b94242080d0e92c5200ef97382d3ebb3 Mon Sep 17 00:00:00 2001 From: Alexis BENOIT Date: Fri, 12 Jun 2026 11:23:19 +0200 Subject: [PATCH 04/22] refactor and cleanup sidebars --- layouts/_partials/commons/single/sidebar.html | 20 +++++++++++++++++ .../_partials/exhibitions/single/sidebar.html | 17 ++++---------- layouts/_partials/jobs/single/sidebar.html | 21 ++++-------------- layouts/_partials/organizations/single.html | 10 +++------ .../organizations/single/sidebar.html | 4 ++++ layouts/_partials/posts/single/sidebar.html | 22 ++++--------------- .../_partials/projects/single/sidebar.html | 22 ++++--------------- 7 files changed, 43 insertions(+), 73 deletions(-) create mode 100644 layouts/_partials/commons/single/sidebar.html create mode 100644 layouts/_partials/organizations/single/sidebar.html diff --git a/layouts/_partials/commons/single/sidebar.html b/layouts/_partials/commons/single/sidebar.html new file mode 100644 index 000000000..6baa87ada --- /dev/null +++ b/layouts/_partials/commons/single/sidebar.html @@ -0,0 +1,20 @@ +{{ $context := .context }} +{{ $meta_position := partial "commons/single/meta/helpers/GetPosition" $context }} +{{ $meta_in_content := eq $meta_position "content" }} +{{ $type := ( $context.Type | singularize ) }} +{{ $meta := .meta | default (partial "commons/single/meta.html" $context) }} + +{{ if or $context.Params.design.toc.present $meta_in_content }} +
+
+ {{ if eq $meta_position "content" }} + + {{ end }} + {{ partial "toc/container.html" (dict + "context" $context + ) }} +
+
+{{ end }} diff --git a/layouts/_partials/exhibitions/single/sidebar.html b/layouts/_partials/exhibitions/single/sidebar.html index ca518107d..67afdaf42 100644 --- a/layouts/_partials/exhibitions/single/sidebar.html +++ b/layouts/_partials/exhibitions/single/sidebar.html @@ -1,14 +1,5 @@ -{{ $meta_position := partial "commons/single/meta/helpers/GetPosition" . }} +{{ partial "commons/single/sidebar.html" (dict + "context" . + "meta" ( partial "events/single/meta.html" . ) +) }} -
-
- {{ if eq $meta_position "content" }} - - {{ end }} - {{ partial "toc/container.html" (dict - "context" . - ) }} -
-
diff --git a/layouts/_partials/jobs/single/sidebar.html b/layouts/_partials/jobs/single/sidebar.html index 42fbe16e1..de01237d0 100644 --- a/layouts/_partials/jobs/single/sidebar.html +++ b/layouts/_partials/jobs/single/sidebar.html @@ -1,17 +1,4 @@ -{{ $meta_position := partial "commons/single/meta/helpers/GetPosition" . }} -{{ $meta_in_content := eq $meta_position "content" }} - -{{ if or .Params.design.toc.present $meta_in_content }} -
-
- {{ if eq $meta_position "content" }} - - {{ end }} - {{ partial "toc/container.html" (dict - "context" . - ) }} -
-
-{{ end }} +{{ partial "commons/single/sidebar.html" (dict + "context" . + "meta" ( partial "jobs/single/meta.html" . ) +) }} diff --git a/layouts/_partials/organizations/single.html b/layouts/_partials/organizations/single.html index d888e08d2..1cae12fff 100644 --- a/layouts/_partials/organizations/single.html +++ b/layouts/_partials/organizations/single.html @@ -1,22 +1,18 @@ -{{ $meta_position := partial "commons/single/meta/helpers/GetPosition" . }} - {{ partial "organizations/single/hero.html" . }} {{ partial "organizations/single/pagefind.html" . }}
- {{ partial "posts/single/sidebar.html" . }} - +
{{ partial "organizations/single/summary.html" . }} {{ partial "organizations/single/presentation.html" . }} - {{/* {{ if eq $meta_position "content" }} - {{ partial "organizations/single/meta.html" . }} - {{ end }} */}}
{{ partial "organizations/partials/logo.html" . }}
+ {{ partial "organizations/single/sidebar.html" . }} + {{ partial "contents/list.html" (dict "context" . "contents" .Params.contents diff --git a/layouts/_partials/organizations/single/sidebar.html b/layouts/_partials/organizations/single/sidebar.html new file mode 100644 index 000000000..0221b4f60 --- /dev/null +++ b/layouts/_partials/organizations/single/sidebar.html @@ -0,0 +1,4 @@ +{{ partial "commons/single/sidebar.html" (dict + "context" . + "meta" ( partial "organizations/single/meta.html" . ) +) }} diff --git a/layouts/_partials/posts/single/sidebar.html b/layouts/_partials/posts/single/sidebar.html index 8faed9756..6bf9742ad 100644 --- a/layouts/_partials/posts/single/sidebar.html +++ b/layouts/_partials/posts/single/sidebar.html @@ -1,18 +1,4 @@ -{{ $meta_position := partial "commons/single/meta/helpers/GetPosition" . }} -{{ $meta_in_content := eq $meta_position "content" }} - -{{ if or .Params.design.toc.present $meta_in_content }} -
-
- {{ if $meta_in_content }} - - {{ end }} - - {{ partial "toc/container.html" (dict - "context" . - ) }} -
-
-{{ end }} \ No newline at end of file +{{ partial "commons/single/sidebar.html" (dict + "context" . + "meta" ( partial "posts/single/meta.html" . ) +) }} diff --git a/layouts/_partials/projects/single/sidebar.html b/layouts/_partials/projects/single/sidebar.html index babd93ab3..2dd4f2b44 100644 --- a/layouts/_partials/projects/single/sidebar.html +++ b/layouts/_partials/projects/single/sidebar.html @@ -1,18 +1,4 @@ -{{ $meta_position := partial "commons/single/meta/helpers/GetPosition" . }} -{{ $meta_in_content := eq $meta_position "content" }} - -{{ if or .Params.design.toc.present $meta_in_content }} -
-
- {{ if $meta_in_content }} - - {{ end }} - - {{ partial "toc/container.html" (dict - "context" . - ) }} -
-
-{{ end }} \ No newline at end of file +{{ partial "commons/single/sidebar.html" (dict + "context" . + "meta" ( partial "projects/single/meta.html" . ) +) }} From 82f933ef9cbfa14146404337eea29f39658b77b3 Mon Sep 17 00:00:00 2001 From: Alexis BENOIT Date: Fri, 12 Jun 2026 11:30:42 +0200 Subject: [PATCH 05/22] person wip --- layouts/_partials/commons/single/sidebar.html | 1 + layouts/_partials/persons/single.html | 9 ++------- layouts/_partials/persons/single/sidebar.html | 5 +++++ 3 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 layouts/_partials/persons/single/sidebar.html diff --git a/layouts/_partials/commons/single/sidebar.html b/layouts/_partials/commons/single/sidebar.html index 6baa87ada..40d3600cc 100644 --- a/layouts/_partials/commons/single/sidebar.html +++ b/layouts/_partials/commons/single/sidebar.html @@ -3,6 +3,7 @@ {{ $meta_in_content := eq $meta_position "content" }} {{ $type := ( $context.Type | singularize ) }} {{ $meta := .meta | default (partial "commons/single/meta.html" $context) }} +{{ $toc := .toc }} {{ if or $context.Params.design.toc.present $meta_in_content }}
diff --git a/layouts/_partials/persons/single.html b/layouts/_partials/persons/single.html index 971db9042..c03e2c604 100644 --- a/layouts/_partials/persons/single.html +++ b/layouts/_partials/persons/single.html @@ -2,18 +2,13 @@ {{ partial "persons/single/pagefind.html" . }}
- {{ partial "toc/container.html" (dict - "context" . - "toc" ( partial "persons/single/toc.html" . ) - ) }} -
{{ partial "persons/single/meta.html" . }} {{ partial "persons/single/informations.html" . }} - {{ partial "taxonomies/single/container.html" . }} - {{ partial "commons/contact-details.html" (dict "subject" .) }}
+ {{ partial "persons/single/sidebar.html" . }} + {{ partial "contents/list.html" (dict "context" . "contents" .Params.contents diff --git a/layouts/_partials/persons/single/sidebar.html b/layouts/_partials/persons/single/sidebar.html new file mode 100644 index 000000000..31bc3d67d --- /dev/null +++ b/layouts/_partials/persons/single/sidebar.html @@ -0,0 +1,5 @@ +{{ partial "commons/single/sidebar.html" (dict + "context" . + "meta" ( partial "organizations/single/meta.html" . ) + "toc" ( partial "persons/single/toc.html" . ) +) }} From c20191a79b6b93ae0025124162d56ede81057458 Mon Sep 17 00:00:00 2001 From: Alexis BENOIT Date: Fri, 12 Jun 2026 11:52:51 +0200 Subject: [PATCH 06/22] fix persons programs --- .../sass/_theme/sections/persons/single.sass | 10 +++------- bin/osuny.js | 8 ++++---- layouts/_partials/commons/single/sidebar.html | 2 +- layouts/_partials/persons/single.html | 2 +- .../persons/single/helpers/GetPrograms.html | 1 + .../persons/single/informations.html | 2 +- .../_partials/persons/single/meta-data.html | 14 +++++++++++++ layouts/_partials/persons/single/meta.html | 20 ++++++------------- layouts/_partials/persons/single/related.html | 12 ++++++----- .../persons/single/related/papers.html | 2 +- layouts/_partials/persons/single/sidebar.html | 2 +- 11 files changed, 40 insertions(+), 35 deletions(-) create mode 100644 layouts/_partials/persons/single/meta-data.html diff --git a/assets/sass/_theme/sections/persons/single.sass b/assets/sass/_theme/sections/persons/single.sass index 7d45f15b4..f967d456f 100644 --- a/assets/sass/_theme/sections/persons/single.sass +++ b/assets/sass/_theme/sections/persons/single.sass @@ -43,7 +43,6 @@ .blocks margin-top: $spacing-5 .person-objects - margin-top: $spacing-5 > * + * margin-top: $spacing-5 .top h2 a @@ -62,6 +61,9 @@ transition: $arrow-duration $arrow-ease-transition &:hover:after transform: translateX($spacing-1) + @include media-breakpoint-up(desktop) + &:not(.full-width) + padding-left: offset(4) .person-publications .top margin-bottom: $spacing-2 @@ -115,9 +117,3 @@ text-align: right .lead + div margin-top: $spacing-4 - @include media-breakpoint-up(md) - .contacts-details - ul - @include grid(3) - li - margin-top: 0 diff --git a/bin/osuny.js b/bin/osuny.js index f2fe6cad6..a9f13f90c 100644 --- a/bin/osuny.js +++ b/bin/osuny.js @@ -39,10 +39,10 @@ let pagefindExclude = ` .block-projects, .block-publications, .block-volumes, - .persons-papers, - .persons-posts, - .persons-programs, - .persons-publications, + .person-papers, + .person-posts, + .person-programs, + .person-publications, .post-sidebar, .events, .exhibitions, diff --git a/layouts/_partials/commons/single/sidebar.html b/layouts/_partials/commons/single/sidebar.html index 40d3600cc..4f9e30c30 100644 --- a/layouts/_partials/commons/single/sidebar.html +++ b/layouts/_partials/commons/single/sidebar.html @@ -3,7 +3,6 @@ {{ $meta_in_content := eq $meta_position "content" }} {{ $type := ( $context.Type | singularize ) }} {{ $meta := .meta | default (partial "commons/single/meta.html" $context) }} -{{ $toc := .toc }} {{ if or $context.Params.design.toc.present $meta_in_content }}
@@ -15,6 +14,7 @@ {{ end }} {{ partial "toc/container.html" (dict "context" $context + "toc" .toc ) }}
diff --git a/layouts/_partials/persons/single.html b/layouts/_partials/persons/single.html index c03e2c604..3dd99daaa 100644 --- a/layouts/_partials/persons/single.html +++ b/layouts/_partials/persons/single.html @@ -3,7 +3,7 @@
- {{ partial "persons/single/meta.html" . }} + {{ partial "persons/single/meta-data.html" . }} {{ partial "persons/single/informations.html" . }}
diff --git a/layouts/_partials/persons/single/helpers/GetPrograms.html b/layouts/_partials/persons/single/helpers/GetPrograms.html index f082ed1f2..45984780a 100644 --- a/layouts/_partials/persons/single/helpers/GetPrograms.html +++ b/layouts/_partials/persons/single/helpers/GetPrograms.html @@ -1,5 +1,6 @@ {{- $programs := slice -}} {{ if isset site.Taxonomies .type -}} {{ $programs = index site.Taxonomies .type .slug }} + {{ $programs = where $programs "Section" "programs" }} {{- end }} {{ return $programs }} \ No newline at end of file diff --git a/layouts/_partials/persons/single/informations.html b/layouts/_partials/persons/single/informations.html index 2ec8fe572..4ce8b8cad 100644 --- a/layouts/_partials/persons/single/informations.html +++ b/layouts/_partials/persons/single/informations.html @@ -12,7 +12,7 @@ {{ partial "persons/single/informations/program-roles.html" (dict "programs" $administrator_programs "slug" .Slug - ) }} + ) }} {{ end }}
{{ end }} \ No newline at end of file diff --git a/layouts/_partials/persons/single/meta-data.html b/layouts/_partials/persons/single/meta-data.html new file mode 100644 index 000000000..5d70886a5 --- /dev/null +++ b/layouts/_partials/persons/single/meta-data.html @@ -0,0 +1,14 @@ + + +{{ with .Params.image }} + {{ $image_id := "" }} + {{/* LEGACY : à retirer une fois que le format de donnée des images des personnes sera homogène aux autres images */}} + {{ if eq (printf "%T" .) "string" }} + {{ $image_id = . }} + {{ else }} + {{ $image_id = index . "id" }} + {{ end }} + {{- with partial "GetMedia" $image_id -}} + + {{- end -}} +{{ end }} \ No newline at end of file diff --git a/layouts/_partials/persons/single/meta.html b/layouts/_partials/persons/single/meta.html index 5d70886a5..0883f9353 100644 --- a/layouts/_partials/persons/single/meta.html +++ b/layouts/_partials/persons/single/meta.html @@ -1,14 +1,6 @@ - - -{{ with .Params.image }} - {{ $image_id := "" }} - {{/* LEGACY : à retirer une fois que le format de donnée des images des personnes sera homogène aux autres images */}} - {{ if eq (printf "%T" .) "string" }} - {{ $image_id = . }} - {{ else }} - {{ $image_id = index . "id" }} - {{ end }} - {{- with partial "GetMedia" $image_id -}} - - {{- end -}} -{{ end }} \ No newline at end of file +{{ $meta_class := partial "commons/single/meta/helpers/GetMetaClass" . }} + +
    + {{ partial "commons/single/meta/taxonomies.html" . }} + {{ partial "commons/single/meta/contacts.html" . }} +
\ No newline at end of file diff --git a/layouts/_partials/persons/single/related.html b/layouts/_partials/persons/single/related.html index cee650e72..3f5021d76 100644 --- a/layouts/_partials/persons/single/related.html +++ b/layouts/_partials/persons/single/related.html @@ -1,6 +1,8 @@ -
- {{ partial "persons/single/related/programs.html" . }} - {{ partial "persons/single/related/publications.html" . }} - {{ partial "persons/single/related/posts.html" . }} - {{ partial "persons/single/related/papers.html" . }} +
+
+ {{ partial "persons/single/related/programs.html" . }} + {{ partial "persons/single/related/publications.html" . }} + {{ partial "persons/single/related/posts.html" . }} + {{ partial "persons/single/related/papers.html" . }} +
\ No newline at end of file diff --git a/layouts/_partials/persons/single/related/papers.html b/layouts/_partials/persons/single/related/papers.html index e23c6f516..6e81f4bd6 100644 --- a/layouts/_partials/persons/single/related/papers.html +++ b/layouts/_partials/persons/single/related/papers.html @@ -2,7 +2,7 @@ {{ $papers := partial "persons/single/helpers/GetPapers" . }} {{ if $papers }} -
+

{{ i18n "persons.papers.recent" }}

diff --git a/layouts/_partials/persons/single/sidebar.html b/layouts/_partials/persons/single/sidebar.html index 31bc3d67d..4693ed8d9 100644 --- a/layouts/_partials/persons/single/sidebar.html +++ b/layouts/_partials/persons/single/sidebar.html @@ -1,5 +1,5 @@ {{ partial "commons/single/sidebar.html" (dict "context" . - "meta" ( partial "organizations/single/meta.html" . ) + "meta" ( partial "persons/single/meta.html" . ) "toc" ( partial "persons/single/toc.html" . ) ) }} From 6ccbd3f1c8d4c1497ee13ff23cecad93ee5c14b7 Mon Sep 17 00:00:00 2001 From: Alexis BENOIT Date: Fri, 12 Jun 2026 15:27:21 +0200 Subject: [PATCH 07/22] cleanup --- layouts/_partials/taxonomies/single/container.html | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 layouts/_partials/taxonomies/single/container.html diff --git a/layouts/_partials/taxonomies/single/container.html b/layouts/_partials/taxonomies/single/container.html deleted file mode 100644 index e00ebf8d5..000000000 --- a/layouts/_partials/taxonomies/single/container.html +++ /dev/null @@ -1,6 +0,0 @@ -{{ $taxonomies_position := partial "taxonomies/helpers/GetPosition" . }} -{{ if and .Params.taxonomies (eq $taxonomies_position "content") }} -
- {{ partial "taxonomies/single/list.html" . }} -
-{{ end }} \ No newline at end of file From 5375514c41953cd5399d5c7f2acea4a6ce729de5 Mon Sep 17 00:00:00 2001 From: Alexis BENOIT Date: Fri, 12 Jun 2026 17:31:41 +0200 Subject: [PATCH 08/22] cleanup --- .../_partials/taxonomies/helpers/GetPosition.html | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 layouts/_partials/taxonomies/helpers/GetPosition.html diff --git a/layouts/_partials/taxonomies/helpers/GetPosition.html b/layouts/_partials/taxonomies/helpers/GetPosition.html deleted file mode 100644 index 644cf3580..000000000 --- a/layouts/_partials/taxonomies/helpers/GetPosition.html +++ /dev/null @@ -1,12 +0,0 @@ -{{ $kind := cond (or (eq .Kind "section") (eq .Kind "taxonomy")) "section" "single" }} -{{ if eq .Type "pages" }} - {{ $kind = "single" }} -{{ end }} -{{ $param := (printf "%s.%s.taxonomies.position" .Type $kind )}} - -{{ $position := partial "helpers/param/GetSiteParamWithDefault" (dict - "param" $param - "default" (printf "default.%s.taxonomies.position" $kind) -) }} - -{{ return $position }} \ No newline at end of file From 2574b8f17e710595b9f7e43a4460d34928327841 Mon Sep 17 00:00:00 2001 From: Alexis BENOIT Date: Fri, 12 Jun 2026 18:10:30 +0200 Subject: [PATCH 09/22] single sidebar --- assets/sass/_theme/sections/persons/single.sass | 7 ++++++- layouts/_partials/persons/single.html | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/assets/sass/_theme/sections/persons/single.sass b/assets/sass/_theme/sections/persons/single.sass index f967d456f..8bfbc7b13 100644 --- a/assets/sass/_theme/sections/persons/single.sass +++ b/assets/sass/_theme/sections/persons/single.sass @@ -104,7 +104,9 @@ @include media-breakpoint-down(lg) .roles margin-top: $spacing-4 - @include media-breakpoint-up(lg) + + &.full-width + @include media-breakpoint-up(lg) .informations @include grid margin-bottom: $spacing-4 @@ -117,3 +119,6 @@ text-align: right .lead + div margin-top: $spacing-4 + &:not(.full-width) + .informations + padding-left: offset(4) diff --git a/layouts/_partials/persons/single.html b/layouts/_partials/persons/single.html index 3dd99daaa..2de2326f8 100644 --- a/layouts/_partials/persons/single.html +++ b/layouts/_partials/persons/single.html @@ -2,13 +2,13 @@ {{ partial "persons/single/pagefind.html" . }}
+ {{ partial "persons/single/sidebar.html" . }} +
{{ partial "persons/single/meta-data.html" . }} {{ partial "persons/single/informations.html" . }}
- {{ partial "persons/single/sidebar.html" . }} - {{ partial "contents/list.html" (dict "context" . "contents" .Params.contents From 907da466efd12e5cf62ac84b3298ba7f7f638728 Mon Sep 17 00:00:00 2001 From: Alexis BENOIT Date: Fri, 12 Jun 2026 18:21:00 +0200 Subject: [PATCH 10/22] sidebar sticky --- assets/sass/_theme/sections/events/single.sass | 3 --- assets/sass/_theme/utils/sidebar.sass | 5 ++--- layouts/_partials/commons/single/sidebar.html | 3 +-- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/assets/sass/_theme/sections/events/single.sass b/assets/sass/_theme/sections/events/single.sass index ad0c27b3c..eb5075cbe 100644 --- a/assets/sass/_theme/sections/events/single.sass +++ b/assets/sass/_theme/sections/events/single.sass @@ -73,9 +73,6 @@ &.image-square width: columns(6) @include h3 - &:not(.full-width) - .section-sidebar - @include sidebar .programme-btn @extend .button--alt @extend .button--small diff --git a/assets/sass/_theme/utils/sidebar.sass b/assets/sass/_theme/utils/sidebar.sass index 5d0de5f9c..2d779b6ef 100644 --- a/assets/sass/_theme/utils/sidebar.sass +++ b/assets/sass/_theme/utils/sidebar.sass @@ -58,10 +58,9 @@ height: 100% position: absolute width: columns(4) - & > div - @include sticky($spacing-3) .toc-container - position: static + @include sticky(calc(var(--border-width) * -1)) + height: auto margin-left: 0 &:has(aside) .toc-container diff --git a/layouts/_partials/commons/single/sidebar.html b/layouts/_partials/commons/single/sidebar.html index 4f9e30c30..eb2bd8f64 100644 --- a/layouts/_partials/commons/single/sidebar.html +++ b/layouts/_partials/commons/single/sidebar.html @@ -6,7 +6,7 @@ {{ if or $context.Params.design.toc.present $meta_in_content }}
-
+ {{ if eq $meta_position "content" }}
{{ end }} From 0254177776908091580cfb5e0bc6139a1149a58c Mon Sep 17 00:00:00 2001 From: Alexis BENOIT Date: Fri, 12 Jun 2026 18:24:07 +0200 Subject: [PATCH 11/22] cleanup --- layouts/_partials/commons/single/sidebar.html | 1 - layouts/_partials/events/single/sidebar.html | 24 ++++++++--------- layouts/_partials/papers/single/sidebar.html | 26 +++++++++---------- 3 files changed, 23 insertions(+), 28 deletions(-) diff --git a/layouts/_partials/commons/single/sidebar.html b/layouts/_partials/commons/single/sidebar.html index eb2bd8f64..08889e84d 100644 --- a/layouts/_partials/commons/single/sidebar.html +++ b/layouts/_partials/commons/single/sidebar.html @@ -6,7 +6,6 @@ {{ if or $context.Params.design.toc.present $meta_in_content }}
- {{ if eq $meta_position "content" }} + {{ partial "toc/container.html" (dict + "toc" ( partial "papers/single/sidebar/toc.html" . ) + "context" . + ) }}
\ No newline at end of file From e4fd2336436fa7e539d80f7219791da28e0c60ab Mon Sep 17 00:00:00 2001 From: Alexis BENOIT Date: Mon, 15 Jun 2026 09:34:30 +0200 Subject: [PATCH 12/22] sidebar --- .../sass/_theme/sections/persons/single.sass | 35 +++++++++---------- assets/sass/_theme/utils/sidebar.sass | 8 ++--- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/assets/sass/_theme/sections/persons/single.sass b/assets/sass/_theme/sections/persons/single.sass index 8bfbc7b13..974aa2e41 100644 --- a/assets/sass/_theme/sections/persons/single.sass +++ b/assets/sass/_theme/sections/persons/single.sass @@ -61,9 +61,6 @@ transition: $arrow-duration $arrow-ease-transition &:hover:after transform: translateX($spacing-1) - @include media-breakpoint-up(desktop) - &:not(.full-width) - padding-left: offset(4) .person-publications .top margin-bottom: $spacing-2 @@ -107,18 +104,20 @@ &.full-width @include media-breakpoint-up(lg) - .informations - @include grid - margin-bottom: $spacing-4 - .roles - grid-column: 1 / -1 - .biography - grid-column: 1 / 9 - + .roles - grid-column: 9 / 13 - text-align: right - .lead + div - margin-top: $spacing-4 - &:not(.full-width) - .informations - padding-left: offset(4) + .informations + @include grid + margin-bottom: $spacing-4 + .roles + grid-column: 1 / -1 + .biography + grid-column: 1 / 9 + + .roles + grid-column: 9 / 13 + text-align: right + .lead + div + margin-top: $spacing-4 + @include media-breakpoint-up(desktop) + &:not(.full-width) + .informations, + .person-objects + padding-left: offset(4) diff --git a/assets/sass/_theme/utils/sidebar.sass b/assets/sass/_theme/utils/sidebar.sass index 2d779b6ef..4484f3123 100644 --- a/assets/sass/_theme/utils/sidebar.sass +++ b/assets/sass/_theme/utils/sidebar.sass @@ -69,13 +69,13 @@ @mixin aside-full-width @include container - > div - align-items: baseline - display: flex - margin-bottom: $spacing-5 + align-items: baseline + display: flex + margin-bottom: $spacing-5 .toc-cta margin-bottom: 0 padding-right: 0 + padding-left: 0 aside flex-shrink: 0 @include media-breakpoint-down(desktop) From 017d905780f53273198c9bd9ab2dec93eedffac8 Mon Sep 17 00:00:00 2001 From: Alexis BENOIT Date: Mon, 15 Jun 2026 10:32:14 +0200 Subject: [PATCH 13/22] adjust --- assets/sass/_theme/sections/persons/single.sass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/sass/_theme/sections/persons/single.sass b/assets/sass/_theme/sections/persons/single.sass index 974aa2e41..b5f249bed 100644 --- a/assets/sass/_theme/sections/persons/single.sass +++ b/assets/sass/_theme/sections/persons/single.sass @@ -98,12 +98,13 @@ @include small &:hover color: var(--color-accent) + @include media-breakpoint-down(lg) .roles margin-top: $spacing-4 - &.full-width - @include media-breakpoint-up(lg) + @include media-breakpoint-up(desktop) + &.full-width .informations @include grid margin-bottom: $spacing-4 @@ -116,7 +117,6 @@ text-align: right .lead + div margin-top: $spacing-4 - @include media-breakpoint-up(desktop) &:not(.full-width) .informations, .person-objects From edd574ca5ec31344433ccc7e5f7074a3361fbf7b Mon Sep 17 00:00:00 2001 From: Alexis BENOIT Date: Mon, 15 Jun 2026 10:34:13 +0200 Subject: [PATCH 14/22] meta in person hero --- layouts/_partials/persons/single/hero.html | 1 + 1 file changed, 1 insertion(+) diff --git a/layouts/_partials/persons/single/hero.html b/layouts/_partials/persons/single/hero.html index 5052047d9..bc745e35a 100644 --- a/layouts/_partials/persons/single/hero.html +++ b/layouts/_partials/persons/single/hero.html @@ -4,6 +4,7 @@ "title" $title "image" .Params.image "context" . + "meta" ( partial "persons/single/meta.html" . ) "sizes" site.Params.image_sizes.sections.persons.hero_single ) -}} From 26b19c5447a49fb28d666be020a5cd9c416aabff Mon Sep 17 00:00:00 2001 From: Alexis BENOIT Date: Mon, 15 Jun 2026 10:43:07 +0200 Subject: [PATCH 15/22] fix --- assets/sass/_theme/utils/sidebar.sass | 2 +- layouts/_partials/pages/single.html | 5 +---- layouts/_partials/pages/single/sidebar.html | 4 ++++ 3 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 layouts/_partials/pages/single/sidebar.html diff --git a/assets/sass/_theme/utils/sidebar.sass b/assets/sass/_theme/utils/sidebar.sass index 4484f3123..9b48376e0 100644 --- a/assets/sass/_theme/utils/sidebar.sass +++ b/assets/sass/_theme/utils/sidebar.sass @@ -62,10 +62,10 @@ @include sticky(calc(var(--border-width) * -1)) height: auto margin-left: 0 + padding-top: $spacing-3 &:has(aside) .toc-container border-top: var(--border-width) solid var(--color-border) - padding-top: $spacing-3 @mixin aside-full-width @include container diff --git a/layouts/_partials/pages/single.html b/layouts/_partials/pages/single.html index e8a68a9ee..42155c884 100644 --- a/layouts/_partials/pages/single.html +++ b/layouts/_partials/pages/single.html @@ -4,10 +4,7 @@ {{ partial "pages/single/pagefind.html" . }}
- {{ partial "toc/container.html" (dict - "toc" ( partial "pages/single/toc.html" . ) - "context" . - ) }} + {{ partial "persons/single/sidebar.html" . }} {{ partial "pages/single/summary.html" (dict "context" . diff --git a/layouts/_partials/pages/single/sidebar.html b/layouts/_partials/pages/single/sidebar.html new file mode 100644 index 000000000..2555d1489 --- /dev/null +++ b/layouts/_partials/pages/single/sidebar.html @@ -0,0 +1,4 @@ +{{ partial "commons/single/sidebar.html" (dict + "context" . + "meta" ( partial "pages/single/meta.html" . ) +) }} From c5e060744854ed9c0df1ef0dc5ea425aa24064a8 Mon Sep 17 00:00:00 2001 From: Alexis BENOIT Date: Mon, 15 Jun 2026 11:03:12 +0200 Subject: [PATCH 16/22] cleaner sidebar class --- assets/sass/_theme/utils/sidebar.sass | 10 +++---- layouts/_partials/commons/single/sidebar.html | 26 ++++++++++++------- .../single/sidebar/helpers/GetClass.html | 16 ++++++++++++ layouts/_partials/toc/container.html | 8 ++---- layouts/_partials/toc/helpers/IsPresent.html | 7 +++++ 5 files changed, 46 insertions(+), 21 deletions(-) create mode 100644 layouts/_partials/commons/single/sidebar/helpers/GetClass.html create mode 100644 layouts/_partials/toc/helpers/IsPresent.html diff --git a/assets/sass/_theme/utils/sidebar.sass b/assets/sass/_theme/utils/sidebar.sass index 9b48376e0..e7012cc35 100644 --- a/assets/sass/_theme/utils/sidebar.sass +++ b/assets/sass/_theme/utils/sidebar.sass @@ -59,13 +59,13 @@ position: absolute width: columns(4) .toc-container - @include sticky(calc(var(--border-width) * -1)) + @include sticky(#{$spacing-3}) height: auto margin-left: 0 - padding-top: $spacing-3 - &:has(aside) - .toc-container - border-top: var(--border-width) solid var(--color-border) + &.section-sidebar--with-toc + .meta-container + margin-bottom: $spacing-3 + border-bottom: var(--border-width) solid var(--color-border) @mixin aside-full-width @include container diff --git a/layouts/_partials/commons/single/sidebar.html b/layouts/_partials/commons/single/sidebar.html index 08889e84d..e500a9379 100644 --- a/layouts/_partials/commons/single/sidebar.html +++ b/layouts/_partials/commons/single/sidebar.html @@ -1,19 +1,25 @@ {{ $context := .context }} {{ $meta_position := partial "commons/single/meta/helpers/GetPosition" $context }} {{ $meta_in_content := eq $meta_position "content" }} -{{ $type := ( $context.Type | singularize ) }} {{ $meta := .meta | default (partial "commons/single/meta.html" $context) }} - -{{ if or $context.Params.design.toc.present $meta_in_content }} -
- {{ if eq $meta_position "content" }} -