From 8a43c48b6da106c1fe8dce7625a9cdca874ca7f5 Mon Sep 17 00:00:00 2001
From: alexisben <alex@noesya.coop>
Date: Fri, 20 Jan 2023 18:42:32 +0100
Subject: [PATCH 1/5] blocks heading

---
 assets/sass/_theme/_utils.sass                |  2 +-
 assets/sass/_theme/blocks/image.sass          | 56 +++++++++++--------
 assets/sass/_theme/blocks/posts.sass          | 19 ++-----
 assets/sass/_theme/design-system/layout.sass  |  3 +
 i18n/en.yml                                   | 19 +++++++
 i18n/fr.yml                                   | 19 +++++++
 layouts/partials/blocks/default_title.html    |  1 +
 .../blocks/templates/call_to_action.html      | 13 +++--
 .../partials/blocks/templates/chapter.html    | 12 ++--
 .../partials/blocks/templates/contact.html    | 11 ++--
 .../partials/blocks/templates/datatable.html  | 11 ++--
 .../blocks/templates/definitions.html         | 11 ++--
 layouts/partials/blocks/templates/embed.html  | 11 ++--
 layouts/partials/blocks/templates/files.html  | 11 ++--
 .../partials/blocks/templates/gallery.html    | 11 ++--
 layouts/partials/blocks/templates/image.html  | 36 +++++-------
 .../blocks/templates/key_figures.html         | 11 ++--
 .../blocks/templates/organization_chart.html  | 23 ++++----
 layouts/partials/blocks/templates/pages.html  | 11 ++--
 .../blocks/templates/pages/cards.html         |  4 +-
 .../partials/blocks/templates/pages/grid.html |  4 +-
 .../partials/blocks/templates/partners.html   | 11 ++--
 layouts/partials/blocks/templates/posts.html  | 15 +++--
 .../partials/blocks/templates/posts/grid.html |  5 +-
 .../blocks/templates/posts/highlight.html     |  7 ++-
 .../partials/blocks/templates/posts/list.html |  2 +-
 .../partials/blocks/templates/programs.html   | 11 ++--
 .../blocks/templates/testimonials.html        | 13 ++---
 .../partials/blocks/templates/timeline.html   |  4 +-
 .../blocks/templates/timeline/horizontal.html | 11 ++--
 .../blocks/templates/timeline/vertical.html   | 11 ++--
 layouts/partials/blocks/templates/video.html  | 12 ++--
 layouts/partials/blocks/title.html            | 23 --------
 layouts/partials/blocks/title_with_link.html  | 11 ++++
 layouts/partials/persons/posts.html           |  2 +-
 .../partials/posts/block-posts-layout.html    |  2 +-
 layouts/partials/posts/post.html              | 15 ++++-
 layouts/partials/posts/posts.html             |  2 +-
 38 files changed, 248 insertions(+), 208 deletions(-)
 create mode 100644 layouts/partials/blocks/default_title.html
 delete mode 100644 layouts/partials/blocks/title.html
 create mode 100644 layouts/partials/blocks/title_with_link.html

diff --git a/assets/sass/_theme/_utils.sass b/assets/sass/_theme/_utils.sass
index e9b62ec72..690dca386 100644
--- a/assets/sass/_theme/_utils.sass
+++ b/assets/sass/_theme/_utils.sass
@@ -182,7 +182,7 @@
         overflow: hidden
         img
             object-fit: cover
-    h1, h2, h3, h4
+    h2, h3
         @include h3
         a
             display: block
diff --git a/assets/sass/_theme/blocks/image.sass b/assets/sass/_theme/blocks/image.sass
index 306e85520..4e186ab58 100644
--- a/assets/sass/_theme/blocks/image.sass
+++ b/assets/sass/_theme/blocks/image.sass
@@ -27,29 +27,41 @@
             width: auto
     @include in-page-without-sidebar
         @include media-breakpoint-up(desktop)
-            .block-content
-                position: relative
-                .top
-                    position: absolute
-                    width: col(5)
             figure
-                display: flex
-                align-items: flex-end
-                > a 
-                    width: col(7)
-                    margin-left: half($grid-gutter)
-                    display: block
-                    order: 2
+                img
+                    max-height: $block-image-max-height-without-sidebar
+                    // max-height: calc(100vh - var(--header-height))
+                    width: auto
+                    max-width: 100%
+            &.image-portrait
+                .block-content
+                    position: relative
+                    .top
+                        position: absolute
+                        width: col(5)
+                figure
+                    display: flex
+                    align-items: flex-end
+                    > a 
+                        width: col(7)
+                        margin-left: half($grid-gutter)
+                        display: block
+                        order: 2
+                    picture
+                        margin-left: 0
+                        margin-right: -$grid-gutter
+                    figcaption
+                        width: calc(#{col(5)} + #{$grid-gutter} / 2)
+                        order: 1
+                        display: block
+                        text-align: right
+            &.image-landscape
                 picture
                     margin-left: 0
-                    margin-right: -$grid-gutter
-                    img
-                        max-height: $block-image-max-height-without-sidebar
+                    margin-right: 0
                 figcaption
-                    width: calc(#{col(5)} + #{$grid-gutter} / 2)
-                    order: 1
-                    display: block
-                    text-align: right
-                img
-                    max-height: calc(100vh - var(--header-height))
-                    width: auto
\ No newline at end of file
+                    display: flex
+                    justify-content: space-between
+                    align-items: baseline
+                    .credit
+                        margin-top: 0
\ No newline at end of file
diff --git a/assets/sass/_theme/blocks/posts.sass b/assets/sass/_theme/blocks/posts.sass
index 43fbd1076..0fe62a5ac 100644
--- a/assets/sass/_theme/blocks/posts.sass
+++ b/assets/sass/_theme/blocks/posts.sass
@@ -8,7 +8,7 @@
         @include grid(1)
         @include grid($block-posts-grid-columns, desktop)
     article
-        h1
+        h3
             a
                 @include stretched-link
                 text-decoration: none
@@ -48,7 +48,7 @@
                     display: flex
                     flex-direction: column
                     // width: 70%
-                    h1
+                    h3
                         margin-bottom: 0
                     time
                         margin-top: half($spacing0)
@@ -56,16 +56,9 @@
                     p
                         margin-top: half($spacing0)
                         order: 4
-                    // h1, time, p
-                    //     padding-right: calc(30% + #{$spacing1})
                 .media
                     display: none
                     order: 3
-                    // position: absolute
-                    // width: 30%
-
-                    // top: 0
-                    // right: 0
 
         @include in-page-with-sidebar
             article
@@ -102,7 +95,7 @@
                         margin-top: 0.3em
     &--highlight
         .highlight-post
-            h1
+            h3
                 margin-bottom: $spacing0
             .media
                 margin-bottom: $spacing0
@@ -134,7 +127,7 @@
             .list
                 article
                     @include grid(8, desktop, 0, 0)
-                    h1
+                    h3
                         grid-column: 1 / 7
                     .post-categories
                         grid-column: 1 / 7
@@ -154,11 +147,11 @@
 
         @include media-breakpoint-up(desktop)
             .highlight
-                h1
+                h3
                     @include h2
             .list
                 article
-                    h1
+                    h3
                         @include h4
             @include in-page-without-sidebar
                 .highlight
diff --git a/assets/sass/_theme/design-system/layout.sass b/assets/sass/_theme/design-system/layout.sass
index 2a8a63d37..e51b956ba 100644
--- a/assets/sass/_theme/design-system/layout.sass
+++ b/assets/sass/_theme/design-system/layout.sass
@@ -43,6 +43,9 @@ iframe
     .hero + &
         margin-top: $spacing3
 
+.hidden
+    display: none
+
 ul,
 ol
     // https://since1979.dev/aligning-your-lists-with-your-text/
diff --git a/i18n/en.yml b/i18n/en.yml
index e9eebe244..7dbcacee0 100644
--- a/i18n/en.yml
+++ b/i18n/en.yml
@@ -1,3 +1,22 @@
+blocks:
+  call_to_action: Call to action
+  chapter: Chapter
+  contact: Contact
+  datatable: Table
+  definitions: Definitions
+  embed: HTML embed
+  files: Files
+  gallery: Gallery
+  image: Image
+  key_figures: Key figures
+  organization_chart: People
+  pages: Pages
+  partners: Organizations
+  posts: Posts
+  programs: Programs
+  testimonials: Testimonials
+  timeline: Timeline
+  video: Video
 categories:
   no_post: No post in this category
   see_more:
diff --git a/i18n/fr.yml b/i18n/fr.yml
index b685c5ca1..751a8185b 100644
--- a/i18n/fr.yml
+++ b/i18n/fr.yml
@@ -1,3 +1,22 @@
+blocks:
+  call_to_action: Appel à actions
+  chapter: Chapitre
+  contact: Contact
+  datatable: Tableau
+  definitions: Définitions
+  embed: Intégration HTML
+  files: Fichiers
+  gallery: Galerie
+  image: Image
+  key_figures: Chiffres-clés
+  organization_chart: Personnes
+  pages: Pages
+  partners: Organisations
+  posts: Actualités
+  programs: Formations
+  testimonials: Témoignages
+  timeline: Frise chronologique
+  video: Vidéo
 categories:
   no_post: Aucun article dans cette catégorie
   see_more:
diff --git a/layouts/partials/blocks/default_title.html b/layouts/partials/blocks/default_title.html
new file mode 100644
index 000000000..f9770abf5
--- /dev/null
+++ b/layouts/partials/blocks/default_title.html
@@ -0,0 +1 @@
+<h2 class="hidden">{{- i18n (printf "blocks.%s" . ) -}}</h2>
\ No newline at end of file
diff --git a/layouts/partials/blocks/templates/call_to_action.html b/layouts/partials/blocks/templates/call_to_action.html
index a4bba7c41..e3ad825a8 100644
--- a/layouts/partials/blocks/templates/call_to_action.html
+++ b/layouts/partials/blocks/templates/call_to_action.html
@@ -1,5 +1,5 @@
-{{- $context := .context -}}
 {{- $position := .block.position -}}
+{{- $template := .block.template -}}
 {{- $title := .block.title -}}
 {{- with .block.data -}}
   {{- $buttons := and .button.text .button_secondary.text -}}
@@ -8,10 +8,12 @@
       <div class="block-content">
         <div class="call_to_action call_to_action--with{{ if not .image }}out{{ end }}-image">
           <div>
-            {{ partial "blocks/title" (dict 
-              "title" $title
-              "context" $context
-              ) }}
+            {{- if not $title -}}
+              {{ partial "blocks/default_title.html" $template }}
+            {{ else }}
+              <h2>{{ partial "PrepareHTML" $title }}</h2>
+            {{ end -}}
+
             {{- if (partial "GetTextFromHTML" .text) }}
             <div class="description">
               {{ partial "PrepareHTML" .text }}
@@ -36,7 +38,6 @@
               {{- end -}}
             </div>
             {{- end -}}
-
           </div>
 
           {{ partial "commons/image.html"
diff --git a/layouts/partials/blocks/templates/chapter.html b/layouts/partials/blocks/templates/chapter.html
index 3f7f11c71..9e4fdf120 100644
--- a/layouts/partials/blocks/templates/chapter.html
+++ b/layouts/partials/blocks/templates/chapter.html
@@ -1,9 +1,10 @@
-{{- $context := .context -}}
 {{- $position := .block.position -}}
+{{- $template := .block.template -}}
 {{- $title := .block.title -}}
 {{- $layout := .block.data.layout | default "no_background" -}}
 {{- $class := "block block-chapter" -}}
 {{- $image_class := "" -}}
+
 {{- with .block.data -}}
   {{ if .image }}
     {{- $class = printf "%s block-chapter--with-image" $class -}}
@@ -17,12 +18,11 @@
       <div class="block-content">
         <div class="chapter">
           <div class="text">
-            {{ if $title -}}
+            {{- if not $title -}}
+              {{ partial "blocks/default_title.html" $template }}
+            {{ else }}
               <div class="top">
-                {{ partial "blocks/title" (dict 
-                  "title" $title
-                  "context" $context
-                  ) }}
+                <h2>{{ partial "PrepareHTML" $title }}</h2>
               </div>
             {{ end -}}
             {{ if (partial "GetTextFromHTML" .text) -}}
diff --git a/layouts/partials/blocks/templates/contact.html b/layouts/partials/blocks/templates/contact.html
index d9b1c6f9c..41e3fd30c 100644
--- a/layouts/partials/blocks/templates/contact.html
+++ b/layouts/partials/blocks/templates/contact.html
@@ -1,4 +1,4 @@
-{{- $context := .context -}}
+{{- $template := .block.template -}}
 {{- $position := .block.position -}}
 {{- $title := .block.title -}}
 {{- $class := "block block-contact" -}}
@@ -6,12 +6,11 @@
   <section class="{{ $class }}{{ if $title }} block-with-title{{ end }}" id="block-{{ $position }}">
     <div class="container">
       <div class="block-content">
-        {{ if $title -}}
+        {{- if not $title -}}
+          {{ partial "blocks/default_title.html" $template }}
+        {{ else }}
           <div class="top">
-            {{ partial "blocks/title" (dict 
-              "title" $title
-              "context" $context
-              ) }}
+              <h2>{{ partial "PrepareHTML" $title }}</h2>
               {{- if .description }}
               <div class="description">
                 {{ partial "PrepareHTML" .description }}
diff --git a/layouts/partials/blocks/templates/datatable.html b/layouts/partials/blocks/templates/datatable.html
index be44f5f01..c8c19a371 100644
--- a/layouts/partials/blocks/templates/datatable.html
+++ b/layouts/partials/blocks/templates/datatable.html
@@ -1,4 +1,4 @@
-{{- $context := .context -}}
+{{- $template := .block.template -}}
 {{- $position := .block.position -}}
 {{- $title := .block.title -}}
 {{- $title := .block.title -}}
@@ -6,12 +6,11 @@
   <section class="block block-datatable{{ if $title }} block-with-title{{ end }}" id="block-{{ $position }}">
     <div class="container">
       <div class="block-content">
-        {{- if $title }}
+        {{- if not $title -}}
+          {{ partial "blocks/default_title.html" $template }}
+        {{ else }}
           <div class="top">
-            {{ partial "blocks/title" (dict 
-              "title" $title
-              "context" $context
-              ) }}
+            <h2>{{ partial "PrepareHTML" $title }}</h2>
           </div>
         {{ end -}}
         <div class="table-responsive">
diff --git a/layouts/partials/blocks/templates/definitions.html b/layouts/partials/blocks/templates/definitions.html
index b0e797610..f82a80b41 100644
--- a/layouts/partials/blocks/templates/definitions.html
+++ b/layouts/partials/blocks/templates/definitions.html
@@ -1,16 +1,15 @@
-{{- $context := .context -}}
+{{- $template := .block.template -}}
 {{- $position := .block.position -}}
 {{- $title := .block.title -}}
 {{- with .block.data -}}
   <section class="block block-definitions{{ if $title }} block-with-title{{ end }}" id="block-{{ $position }}">
     <div class="container">
       <div class="block-content">
-        {{- if $title }}
+        {{- if not $title -}}
+          {{ partial "blocks/default_title.html" $template }}
+        {{ else }}
           <div class="top">
-            {{ partial "blocks/title" (dict 
-              "title" $title
-              "context" $context
-              ) }}
+            <h2>{{ partial "PrepareHTML" $title }}</h2>
           </div>
         {{ end -}}
         <div class="definitions">
diff --git a/layouts/partials/blocks/templates/embed.html b/layouts/partials/blocks/templates/embed.html
index 263eb21ec..6b67aaf99 100644
--- a/layouts/partials/blocks/templates/embed.html
+++ b/layouts/partials/blocks/templates/embed.html
@@ -1,16 +1,15 @@
-{{- $context := .context -}}
+{{- $template := .block.template -}}
 {{- $position := .block.position -}}
 {{- $title := .block.title -}}
 {{- with .block.data -}}
   <section class="block block-embed{{ if $title }} block-with-title{{ end }}" id="block-{{ $position }}">
     <div class="container">
       <div class="block-content">
-        {{- if $title }}
+        {{- if not $title -}}
+          {{ partial "blocks/default_title.html" $template }}
+        {{ else }}
           <div class="top">
-            {{ partial "blocks/title" (dict 
-              "title" $title
-              "context" $context
-              ) }}
+            <h2>{{ partial "PrepareHTML" $title }}</h2>
           </div>
         {{ end -}}
 
diff --git a/layouts/partials/blocks/templates/files.html b/layouts/partials/blocks/templates/files.html
index fc301198a..c811af648 100644
--- a/layouts/partials/blocks/templates/files.html
+++ b/layouts/partials/blocks/templates/files.html
@@ -1,4 +1,4 @@
-{{- $context := .context -}}
+{{- $template := .block.template -}}
 {{- $position := .block.position -}}
 {{- $title := .block.title -}}
 {{- with .block.data -}}
@@ -7,10 +7,11 @@
       <div class="block-content">
         {{- if or $title .description }}
           <div class="top">
-            {{ partial "blocks/title" (dict 
-              "title" $title
-              "context" $context
-              ) }}
+            {{- if not $title -}}
+              {{ partial "blocks/default_title.html" $template }}
+            {{ else }}
+              <h2>{{ partial "PrepareHTML" $title }}</h2>
+            {{ end -}}
             {{- if .description }}
               <div class="description">
                 {{ partial "PrepareHTML"  .description }}
diff --git a/layouts/partials/blocks/templates/gallery.html b/layouts/partials/blocks/templates/gallery.html
index 6f2832675..61580b0c3 100644
--- a/layouts/partials/blocks/templates/gallery.html
+++ b/layouts/partials/blocks/templates/gallery.html
@@ -1,4 +1,4 @@
-{{- $context := .context -}}
+{{- $template := .block.template -}}
 {{- $position := .block.position -}}
 {{- $title := .block.title -}}
 {{- $layout_class := "block-gallery--grid" -}}
@@ -12,11 +12,10 @@
       <div class="block-content">
         {{- if (or $title .description) }}
           <div class="top">
-            {{- if $title }}
-            {{ partial "blocks/title" (dict 
-              "title" $title
-              "context" $context
-              ) }}
+            {{- if not $title -}}
+              {{ partial "blocks/default_title.html" $template }}
+            {{ else }}
+              <h2>{{ partial "PrepareHTML" $title }}</h2>
             {{ end -}}
             {{- if .description }}
               <div class="description">
diff --git a/layouts/partials/blocks/templates/image.html b/layouts/partials/blocks/templates/image.html
index 0ef25bc1a..a43230f2e 100644
--- a/layouts/partials/blocks/templates/image.html
+++ b/layouts/partials/blocks/templates/image.html
@@ -1,35 +1,27 @@
-{{- $context := .context -}}
+{{- $template := .block.template -}}
 {{- $position := .block.position -}}
 {{- $title := .block.title -}}
+{{- $image_class := "" -}}
 {{- with .block.data -}}
   {{- $text := .text -}}
   {{- $buttons := and .button.text .button_secondary.text -}}
-  <section class="block block-image{{ if $title }} block-with-title{{ end }}" id="block-{{ $position }}">
+  {{- if .image -}}
+    {{- $image_class = printf "image-%s" (partial "GetImageDirection" .image ) -}}
+  {{- end -}}
+  <section class="block block-image{{ if $title }} block-with-title{{ end }} {{ $image_class -}}" id="block-{{ $position }}">
     <div class="container">
       <div class="block-content">
-
-        {{ if $title -}}
-          <div class="top">
-            {{ partial "blocks/title" (dict 
-              "title" $title
-              "context" $context
-              ) }}
-          </div>
+        {{- if not $title -}}
+          {{ partial "blocks/default_title.html" $template }}
+        {{ else }}
+          <h2>{{ partial "PrepareHTML" $title }}</h2>
         {{ end -}}
 
         {{- with .image -}}
-          {{/*  TODO: refactor  */}}
-          {{- $image := partial "GetMedia" .file -}}
-          {{- $url := $image.url -}}
-          {{- if site.Params.keycdn -}}
-            {{- $url = $image.direct_url -}}
-          {{- end -}}
-
-          {{- $lightbox_sizes := "2048x3640" -}}
-          <figure>
+          <figure class="{{ $image_class }}">
             <a class="glightbox"
-              data-glightbox="type: image;"
-              href="{{ partial "GetImageUrl" (dict "url" $url "size" $lightbox_sizes ) }}"
+              data-glightbox="type: image;{{ if .credit }}description: {{ partial "PrepareHTML" .credit }}{{ end }}"
+              href="{{- partial "GetLightboxUrl" . -}}"
               title="{{- i18n "commons.lightbox.link.title" -}}"
               >
               {{ partial "commons/image.html"
@@ -41,7 +33,7 @@
             </a>
             <figcaption>
               {{- if $text }}
-                <p>{{ partial "PrepareHTML" $text }}</p>
+                {{ partial "PrepareHTML" $text }}
               {{ end -}}
               {{- if partial "PrepareHTML" .credit }}
                 <div class="credit">{{ partial "PrepareHTML" .credit }}</div>
diff --git a/layouts/partials/blocks/templates/key_figures.html b/layouts/partials/blocks/templates/key_figures.html
index 993d47bef..af8f12e60 100644
--- a/layouts/partials/blocks/templates/key_figures.html
+++ b/layouts/partials/blocks/templates/key_figures.html
@@ -1,4 +1,4 @@
-{{- $context := .context -}}
+{{- $template := .block.template -}}
 {{- $position := .block.position -}}
 {{- $title := .block.title -}}
 {{- $figures := .figures}}
@@ -8,10 +8,11 @@
       <div class="block-content">
         {{- if (or $title .description) }}
           <div class="top">
-            {{ partial "blocks/title" (dict 
-              "title" $title
-              "context" $context
-              ) }}
+            {{- if not $title -}}
+              {{ partial "blocks/default_title.html" $template }}
+            {{ else }}
+              <h2>{{ partial "PrepareHTML" $title }}</h2>
+            {{ end -}}
             {{- if .description }}
               <div class="description">
                 {{ partial "PrepareHTML"  .description }}
diff --git a/layouts/partials/blocks/templates/organization_chart.html b/layouts/partials/blocks/templates/organization_chart.html
index 8258d85a7..a515fd200 100644
--- a/layouts/partials/blocks/templates/organization_chart.html
+++ b/layouts/partials/blocks/templates/organization_chart.html
@@ -1,4 +1,4 @@
-{{- $context := .context -}}
+{{- $template := .block.template -}}
 {{- $position := .block.position -}}
 {{- $title := .block.title -}}
 {{- with .block.data -}}
@@ -9,10 +9,11 @@
     <div class="block-content">
         {{ if (or $title .description) -}}
           <div class="top">
-            {{ partial "blocks/title" (dict 
-              "title" $title
-              "context" $context
-              ) }}
+            {{- if not $title -}}
+              {{ partial "blocks/default_title.html" $template }}
+            {{ else }}
+              <h2>{{ partial "PrepareHTML" $title }}</h2>
+            {{ end -}}
             {{- if .description }}
               <div class="description">
                 {{ partial "PrepareHTML"  .description }}
@@ -25,7 +26,7 @@
             {{ $person := site.GetPage (printf "/persons/%s" .slug) }}
             <article class="person" itemscope itemtype="https://schema.org/Person">
               <div class="description">
-                <h1 class="name" itemprop="name">
+                <h3 class="name" itemprop="name">
                   {{ if $with_link }}
                   <a href="{{ $person.Permalink }}" aria-label="{{ i18n "commons.more_aria" (dict "Title" $person.Title) }}">
                     {{ end }}
@@ -33,7 +34,7 @@ <h1 class="name" itemprop="name">
                     {{ if $with_link }}
                   </a>
                   {{ end }}
-                </h1>
+                </h3>
                 <p itemprop="jobTitle">
                   {{- if (partial "GetTextFromHTML" .role) }}
                     {{ partial "PrepareHTML" .role }}
@@ -48,10 +49,10 @@ <h1 class="name" itemprop="name">
                 <div class="avatar" itemprop="image">
                   {{- if $person.Params.image }}
                     {{ partial "commons/image.html"
-                          (dict
-                            "image"    $person.Params.image
-                            "sizes"    site.Params.image_sizes.blocks.organization_chart
-                          )}}
+                      (dict
+                        "image"    $person.Params.image
+                        "sizes"    site.Params.image_sizes.blocks.organization_chart
+                      )}}
                   {{ end -}}
                 </div>
               {{ end -}}
diff --git a/layouts/partials/blocks/templates/pages.html b/layouts/partials/blocks/templates/pages.html
index 83bd699e6..33dbefd8e 100644
--- a/layouts/partials/blocks/templates/pages.html
+++ b/layouts/partials/blocks/templates/pages.html
@@ -1,4 +1,4 @@
-{{- $context := .context -}}
+{{- $template := .block.template -}}
 {{- $position := .block.position -}}
 {{- $title := .block.title -}}
 {{- $class := "block block-pages" -}}
@@ -53,15 +53,14 @@
   <section class="block block-pages{{ if $title }} block-with-title{{ end }} {{ $layout_class }} {{ $page_class }}" id="block-{{ $position }}">
     <div class="container">
       <div class="block-content">
-        {{- if $title }}
+        {{- if not $title -}}
+          {{ partial "blocks/default_title.html" $template }}
+        {{ else }}
           <div class="top">
-            {{/*  Quand le bloc a un titre, est-ce qu'on prend le titre de la page principale ou le titre du bloc ?  */}}
-            {{ partial "blocks/title" (dict 
+            {{ partial "blocks/title_with_link.html" (dict 
               "title" $title
-              "context" $context
               "link" $page_link
               ) }}
-            
             {{ if and $show_main_description (ne $layout "list")}}
               {{- with $page }}
                 <p class="description">{{- $main_description -}}</p>
diff --git a/layouts/partials/blocks/templates/pages/cards.html b/layouts/partials/blocks/templates/pages/cards.html
index 3dc759281..f6bf4e3bc 100644
--- a/layouts/partials/blocks/templates/pages/cards.html
+++ b/layouts/partials/blocks/templates/pages/cards.html
@@ -10,11 +10,11 @@
     {{- end -}}
     {{ with $page }}
       <article class="card">
-        <h1>
+        <h3>
           <a href="{{- .Permalink -}}">
             {{- partial "PrepareHTML" .Title -}}
           </a>
-        </h1>
+        </h3>
 
         {{ if and $show_descriptions .Params.summary }}
           {{ if site.Params.pages.index.truncate_description }}
diff --git a/layouts/partials/blocks/templates/pages/grid.html b/layouts/partials/blocks/templates/pages/grid.html
index 4aefaa758..fd28a25a4 100644
--- a/layouts/partials/blocks/templates/pages/grid.html
+++ b/layouts/partials/blocks/templates/pages/grid.html
@@ -19,11 +19,11 @@
 
     {{ with $page }}
       <article>
-        <h1>
+        <h3>
           <a href="{{- .Permalink -}}">
             {{- partial "PrepareHTML" .Title -}}
           </a>
-        </h1>
+        </h3>
         {{ if and $show_descriptions .Params.summary }}
           {{ if site.Params.pages.index.truncate_description }}
             <p>{{ partial "GetTruncateContent" ( dict 
diff --git a/layouts/partials/blocks/templates/partners.html b/layouts/partials/blocks/templates/partners.html
index 34034755b..21c3c9547 100644
--- a/layouts/partials/blocks/templates/partners.html
+++ b/layouts/partials/blocks/templates/partners.html
@@ -1,4 +1,4 @@
-{{- $context := .context -}}
+{{- $template := .block.template -}}
 {{- $position := .block.position -}}
 {{- $title := .block.title -}}
 {{- with .block.data -}}
@@ -7,11 +7,10 @@
       <div class="block-content">
         {{ if (or $title .description) -}}
           <div class="top">
-            {{- if $title }}
-              {{ partial "blocks/title" (dict 
-                "title" $title
-                "context" $context
-                ) }}
+            {{- if not $title -}}
+              {{ partial "blocks/default_title.html" $template }}
+            {{ else }}
+              <h2>{{ partial "PrepareHTML" $title }}</h2>
             {{ end -}}
             {{- if .description }}
               <div class="description">
diff --git a/layouts/partials/blocks/templates/posts.html b/layouts/partials/blocks/templates/posts.html
index 67de4bd4d..89509900b 100644
--- a/layouts/partials/blocks/templates/posts.html
+++ b/layouts/partials/blocks/templates/posts.html
@@ -1,4 +1,4 @@
-{{- $context := .context -}}
+{{- $template := .block.template -}}
 {{- $position := .block.position -}}
 {{- $title := .block.title -}}
 {{- $term := false -}}
@@ -20,11 +20,14 @@
               {{ $title_link = $term.Permalink }}
             {{ end -}}
 
-            {{ partial "blocks/title" (dict 
-              "title" $title
-              "context" $context
-              "link" $title_link
-              ) }}
+            {{- if not $title -}}
+              {{ partial "blocks/default_title.html" $template }}
+            {{ else }}
+              {{ partial "blocks/title_with_link.html" (dict 
+                "title" $title
+                "link" $title_link
+                ) }}
+            {{ end -}}
 
           </div>
         {{- end }}
diff --git a/layouts/partials/blocks/templates/posts/grid.html b/layouts/partials/blocks/templates/posts/grid.html
index 681e236b4..5bcf393c8 100644
--- a/layouts/partials/blocks/templates/posts/grid.html
+++ b/layouts/partials/blocks/templates/posts/grid.html
@@ -1,7 +1,10 @@
 <div class="grid">
   {{ range $post := .posts -}}
     {{ with site.GetPage (printf "/posts/%s" $post) }}
-      {{ partial "posts/post" . }}
+      {{ partial "posts/post.html" (dict 
+        "post" .
+        "heading" "h3"
+        ) }}
     {{ end }}
   {{ end }}
 </div>
\ No newline at end of file
diff --git a/layouts/partials/blocks/templates/posts/highlight.html b/layouts/partials/blocks/templates/posts/highlight.html
index 6c3369909..aea4626d2 100644
--- a/layouts/partials/blocks/templates/posts/highlight.html
+++ b/layouts/partials/blocks/templates/posts/highlight.html
@@ -6,7 +6,10 @@
 
     {{ with $highlight }}
       <div class="highlight-post">
-        {{ partial "posts/post" . }}
+        {{ partial "posts/post" (dict 
+          "post" .
+          "heading" "h3"
+          ) }}
       </div>
     {{ end }}
 
@@ -17,7 +20,7 @@
           {{ with site.GetPage (printf "/posts/%s" .) }}
             <article class="post">
               {{- $title := partial "PrepareHTML" .Title -}}
-              <h1 itemprop="headline"><a href="{{ .Permalink }}" title="{{ safeHTML (i18n "commons.more_aria" (dict "Title" $title)) }}">{{ $title }}</a></h1>
+              <h3 itemprop="headline"><a href="{{ .Permalink }}" title="{{ safeHTML (i18n "commons.more_aria" (dict "Title" $title)) }}">{{ $title }}</a></h3>
               {{ if site.Params.posts.index.show_categories }}
                 {{- partial "posts/categories" . -}}
               {{ end }}
diff --git a/layouts/partials/blocks/templates/posts/list.html b/layouts/partials/blocks/templates/posts/list.html
index ac8dbb0e4..9ee54456a 100644
--- a/layouts/partials/blocks/templates/posts/list.html
+++ b/layouts/partials/blocks/templates/posts/list.html
@@ -1,7 +1,7 @@
 <div class="list">
   {{ range $post := .posts -}}
     {{ with site.GetPage (printf "/posts/%s" $post) }}
-      {{ partial "posts/post" . }}
+      {{ partial "posts/post.html" (dict "post" . ) }}
     {{ end }}
   {{ end }}
 </div>
\ No newline at end of file
diff --git a/layouts/partials/blocks/templates/programs.html b/layouts/partials/blocks/templates/programs.html
index b11032074..377ffdae5 100644
--- a/layouts/partials/blocks/templates/programs.html
+++ b/layouts/partials/blocks/templates/programs.html
@@ -1,16 +1,15 @@
-{{- $context := .context -}}
+{{- $template := .block.template -}}
 {{- $position := .block.position -}}
 {{- $title := .block.title -}}
 {{- with .block.data -}}
   <section class="block block-programs{{ if $title }} block-with-title{{ end }}" id="block-{{ $position }}">
     <div class="container">
       <div class="block-content">
-        {{ if $title -}}
+        {{- if not $title -}}
+          {{ partial "blocks/default_title.html" $template }}
+        {{ else }}
           <div class="top">
-            {{ partial "blocks/title" (dict 
-              "title" $title
-              "context" $context
-              ) }}
+            <h2>{{ partial "PrepareHTML" $title }}</h2>
           </div>
         {{ end -}}
 
diff --git a/layouts/partials/blocks/templates/testimonials.html b/layouts/partials/blocks/templates/testimonials.html
index 969cc7284..31e9be932 100644
--- a/layouts/partials/blocks/templates/testimonials.html
+++ b/layouts/partials/blocks/templates/testimonials.html
@@ -1,4 +1,4 @@
-{{- $context := .context -}}
+{{- $template := .block.template -}}
 {{- $position := .block.position -}}
 {{- $title := .block.title -}}
 {{- $is_carousel := false -}}
@@ -10,13 +10,10 @@
   <section class="block block-testimonials{{ if $title }} block-with-title{{ end }}{{ if $is_carousel}} with-carousel{{ end }}" id="block-{{ $position }}">
     <div class="container">
       <div class="block-content">
-        {{ if $title -}}
-          <div class="top">
-            {{ partial "blocks/title" (dict 
-              "title" $title
-              "context" $context
-              ) }}
-          </div>
+        {{- if not $title -}}
+          {{ partial "blocks/default_title.html" $template }}
+        {{ else }}
+          <h2 class="hidden">{{ partial "PrepareHTML" $title }}</h2>
         {{ end -}}
 
         <div class="testimonials">
diff --git a/layouts/partials/blocks/templates/timeline.html b/layouts/partials/blocks/templates/timeline.html
index a66546ecb..aee968cdf 100644
--- a/layouts/partials/blocks/templates/timeline.html
+++ b/layouts/partials/blocks/templates/timeline.html
@@ -1,4 +1,4 @@
-{{- $context := .context -}}
+{{- $template := .block.template -}}
 {{- $position := .block.position -}}
 {{- $title := .block.title -}}
 {{- $layout := .block.data.layout | default "vertical" -}}
@@ -8,7 +8,7 @@
     {{ partial $template (dict 
         "title" $title
         "block" .block
-        "context" $context
+        "template" $template
       ) }}
   </div>
 </section>
diff --git a/layouts/partials/blocks/templates/timeline/horizontal.html b/layouts/partials/blocks/templates/timeline/horizontal.html
index b2eea88c8..b10651f7b 100644
--- a/layouts/partials/blocks/templates/timeline/horizontal.html
+++ b/layouts/partials/blocks/templates/timeline/horizontal.html
@@ -1,10 +1,9 @@
 <div class="timeline">
-  {{ if .title }}
-    {{ partial "blocks/title" (dict 
-    "title" .title
-    "context" .context
-    ) }}
-  {{ end }}
+  {{- if not .title -}}
+    {{ partial "blocks/default_title.html" .template }}
+  {{ else }}
+    <h2>{{ partial "PrepareHTML" .title }}</h2>
+  {{ end -}}
 
   {{ with .block.data }}
     <div class="events">
diff --git a/layouts/partials/blocks/templates/timeline/vertical.html b/layouts/partials/blocks/templates/timeline/vertical.html
index fd407d64d..f8205582b 100644
--- a/layouts/partials/blocks/templates/timeline/vertical.html
+++ b/layouts/partials/blocks/templates/timeline/vertical.html
@@ -1,12 +1,11 @@
 <div class="block-content">
-  {{ if .title -}}
+  {{- if not .title -}}
+    {{ partial "blocks/default_title.html" .template }}
+  {{ else }}
     <div class="top">
-      {{ partial "blocks/title" (dict 
-        "title" .title
-        "context" .context
-        ) }}
+      <h2>{{ partial "PrepareHTML" .title }}</h2>
     </div>
-  {{- end }}
+  {{ end -}}
 
   {{ with .block.data -}}
     <div class="events">
diff --git a/layouts/partials/blocks/templates/video.html b/layouts/partials/blocks/templates/video.html
index 9b619e2d6..30ecaf090 100644
--- a/layouts/partials/blocks/templates/video.html
+++ b/layouts/partials/blocks/templates/video.html
@@ -1,17 +1,17 @@
-{{- $context := .context -}}
+{{- $template := .block.template -}}
 {{- $position := .block.position -}}
 {{- $title := .block.title -}}
+{{/*  TODO A11Y: vérifier d'ajouter toujours un titre adjacent à la vidéo  */}}
 {{- with .block.data -}}
   <section class="block block-video{{ if $title }} block-with-title{{ end }}" id="block-{{ $position }}">
     <div class="container">
       <div class="block-content">
         <div>
-          {{ if $title -}}
+          {{- if not $title -}}
+            {{ partial "blocks/default_title.html" $template }}
+          {{ else }}
             <div class="top">
-              {{ partial "blocks/title" (dict 
-                "title" $title
-                "context" $context
-                ) }}
+              <h2>{{ partial "PrepareHTML" $title }}</h2>
             </div>
           {{ end -}}
 
diff --git a/layouts/partials/blocks/title.html b/layouts/partials/blocks/title.html
deleted file mode 100644
index 9169f387d..000000000
--- a/layouts/partials/blocks/title.html
+++ /dev/null
@@ -1,23 +0,0 @@
-{{- if .title }}
-  {{- if ne .context.Type "programs" }}
-    <h2>
-      {{- if .link -}}
-        <a href="{{ .link }}">
-      {{- end -}}
-      {{ partial "PrepareHTML" .title }}
-      {{- if .link -}}
-        </a>
-      {{- end -}}
-    </h2>
-  {{ else }}
-    <h3>
-      {{- if .link -}}
-        <a href="{{ .link }}">
-      {{- end -}}
-      {{ partial "PrepareHTML" .title }}
-      {{- if .link -}}
-        </a>
-      {{- end -}}
-    </h3>
-  {{ end -}}
-{{ end -}}
\ No newline at end of file
diff --git a/layouts/partials/blocks/title_with_link.html b/layouts/partials/blocks/title_with_link.html
new file mode 100644
index 000000000..6fd35b2f8
--- /dev/null
+++ b/layouts/partials/blocks/title_with_link.html
@@ -0,0 +1,11 @@
+{{- if .title }}
+  <h2>
+    {{- if .link -}}
+      <a href="{{ .link }}">
+    {{- end -}}
+    {{ partial "PrepareHTML" .title }}
+    {{- if .link -}}
+      </a>
+    {{- end -}}
+  </h2>
+{{ end -}}
\ No newline at end of file
diff --git a/layouts/partials/persons/posts.html b/layouts/partials/persons/posts.html
index fbc71b411..d31f1bf39 100644
--- a/layouts/partials/persons/posts.html
+++ b/layouts/partials/persons/posts.html
@@ -4,7 +4,7 @@ <h2 class="h5"><a href="{{ .Permalink }}">{{ i18n "persons.posts" }}</a></h2>
   </div>
   <div class="posts posts--{{- site.Params.posts.index.layout -}}">
     {{ range first 3 .Pages }}
-      {{ partial "posts/post.html" . }}
+      {{ partial "posts/post.html" (dict "post" . ) }}
     {{ end }}
   </div>
 </section>
diff --git a/layouts/partials/posts/block-posts-layout.html b/layouts/partials/posts/block-posts-layout.html
index 24a46ee46..118aa04ad 100644
--- a/layouts/partials/posts/block-posts-layout.html
+++ b/layouts/partials/posts/block-posts-layout.html
@@ -4,7 +4,7 @@
     <div class="block-content">
       <div class="{{ $layout }}">
         {{ range .posts }}
-          {{ partial "posts/post" . }}
+          {{ partial "posts/post.html" (dict "post" . ) }}
         {{ end }}
       </div>
     </div>
diff --git a/layouts/partials/posts/post.html b/layouts/partials/posts/post.html
index ea01cfd3f..10cdc4cb5 100644
--- a/layouts/partials/posts/post.html
+++ b/layouts/partials/posts/post.html
@@ -1,7 +1,19 @@
+{{ $post := .post }}
+{{ $heading := .heading | default "h2" }}
+{{ $heading_tag := (dict 
+    "open" ((printf "<%s itemprop='headline'>" $heading) | safeHTML)
+    "close" ((printf "</%s>" $heading) | safeHTML)
+    ) }}
+
+{{ with $post }}
 <article class="post" itemprop="blogPosts" itemscope itemtype="http://schema.org/BlogPosting">
   <div class="post-content">
     {{- $title := partial "PrepareHTML" .Title -}}
-    <h1 itemprop="headline"><a href="{{ .Permalink }}" title="{{ safeHTML (i18n "commons.more_aria" (dict "Title" $title)) }}">{{ $title }}</a></h1>
+
+    {{ $heading_tag.open }}
+      <a href="{{ .Permalink }}" title="{{ safeHTML (i18n "commons.more_aria" (dict "Title" $title)) }}">{{ $title }}</a>
+    {{ $heading_tag.close }}
+
     {{ if $.Site.Params.posts.index.show_categories }}
       {{- partial "posts/categories" . -}}
     {{ end }}
@@ -30,3 +42,4 @@ <h1 itemprop="headline"><a href="{{ .Permalink }}" title="{{ safeHTML (i18n "com
     {{- end -}}
   </div>
 </article>
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/posts/posts.html b/layouts/partials/posts/posts.html
index 0dd9340c6..f3304c7f7 100644
--- a/layouts/partials/posts/posts.html
+++ b/layouts/partials/posts/posts.html
@@ -3,6 +3,6 @@
     <p>{{ i18n "categories.no_post" }}</p>
   {{ end }}
   {{ range .Paginator.Pages }}
-    {{ partial "posts/post.html" . }}
+    {{ partial "posts/post.html" (dict "post" . )}}
   {{ end }}
 </div>

From 5badf5266de4ae645e05d2a5b666b6490d79d8c8 Mon Sep 17 00:00:00 2001
From: alexisben <alex@noesya.coop>
Date: Mon, 23 Jan 2023 12:14:48 +0100
Subject: [PATCH 2/5] heading check

---
 assets/sass/_theme/blocks/base.sass                      | 4 +++-
 assets/sass/_theme/blocks/pages.sass                     | 6 +++---
 assets/sass/_theme/blocks/timeline.sass                  | 3 ++-
 assets/sass/_theme/sections/organizations.sass           | 2 +-
 assets/sass/_theme/sections/posts.sass                   | 4 ++--
 assets/sass/_theme/sections/programs.sass                | 6 ++++--
 layouts/partials/blocks/templates/image.html             | 4 +++-
 layouts/partials/blocks/templates/partners.html          | 4 ++--
 layouts/partials/blocks/templates/timeline/vertical.html | 2 +-
 layouts/partials/organizations/organization.html         | 2 +-
 layouts/partials/programs/program.html                   | 4 ++--
 11 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/assets/sass/_theme/blocks/base.sass b/assets/sass/_theme/blocks/base.sass
index 266947949..67aa545c1 100644
--- a/assets/sass/_theme/blocks/base.sass
+++ b/assets/sass/_theme/blocks/base.sass
@@ -12,7 +12,9 @@
     .top
         h2, h3
             + .description
-                margin-top: $spacing2
+                margin-top: $spacing1
+                @include media-breakpoint-up(desktop)
+                    margin-top: $spacing2
 
 // Specific
 $backgrounded_blocks: ".block-call_to_action, .block-chapter--accent_background, .block-chapter--alt_background, .block-timeline--horizontal, .block-pages--cards"
diff --git a/assets/sass/_theme/blocks/pages.sass b/assets/sass/_theme/blocks/pages.sass
index 9ef5f3a5f..53298a0a0 100644
--- a/assets/sass/_theme/blocks/pages.sass
+++ b/assets/sass/_theme/blocks/pages.sass
@@ -19,7 +19,7 @@
                     aspect-ratio: 16/9
                     object-fit: cover
                     width: 100%
-        h1
+        h3
             @include h3
             a
                 text-decoration: none
@@ -33,7 +33,7 @@
 
     @include media-breakpoint-down(desktop)
         .top
-            h2, h3
+            h2
                 @include h5
         .description
             @include h2
@@ -44,7 +44,7 @@
         @include media-breakpoint-up(desktop)
             .top
                 @include grid
-                h2, h3
+                h2
                     grid-column: 1 / 5
                     a
                         text-decoration: none
diff --git a/assets/sass/_theme/blocks/timeline.sass b/assets/sass/_theme/blocks/timeline.sass
index 472ef37d3..1197ee052 100644
--- a/assets/sass/_theme/blocks/timeline.sass
+++ b/assets/sass/_theme/blocks/timeline.sass
@@ -111,8 +111,9 @@
             width: 50%
             
             .title
+                display: block
                 min-height: var(--min-title-height)
-                margin-bottom: $spacing1
+                padding-bottom: $spacing1
                 @include signature
             .description
                 @include small
diff --git a/assets/sass/_theme/sections/organizations.sass b/assets/sass/_theme/sections/organizations.sass
index 0c080965a..19b8db695 100644
--- a/assets/sass/_theme/sections/organizations.sass
+++ b/assets/sass/_theme/sections/organizations.sass
@@ -1,7 +1,7 @@
 .organization
     @include article
     position: relative
-    h1
+    h2
         @include meta
         a
             @include stretched-link
diff --git a/assets/sass/_theme/sections/posts.sass b/assets/sass/_theme/sections/posts.sass
index 352fdb7e4..cbf241a8a 100644
--- a/assets/sass/_theme/sections/posts.sass
+++ b/assets/sass/_theme/sections/posts.sass
@@ -28,7 +28,7 @@
             margin-bottom: $spacing1
             padding-bottom: $spacing1
             flex-direction: row
-            h1 + p
+            h2 + p, h3 + p
                 margin-top: $spacing0
             @include media-breakpoint-up(desktop)
                 @include grid
@@ -58,7 +58,7 @@
                     right: 0
                     top: 0
                 div:not(.media)
-                    h1, h2, h3,
+                    h2, h3,
                     p
                         max-width: col(6, 9)
     .posts--grid
diff --git a/assets/sass/_theme/sections/programs.sass b/assets/sass/_theme/sections/programs.sass
index f3fc29448..cee274383 100644
--- a/assets/sass/_theme/sections/programs.sass
+++ b/assets/sass/_theme/sections/programs.sass
@@ -103,11 +103,13 @@ ol.programs
             .blocks
                 section > * + *
                     margin-top: 0
-                h3
+                h2
                     @include h3
                 @include media-breakpoint-down(desktop)
+                    padding-top: $spacing3
                     margin-left: half(-$grid-gutter-sm)
                     margin-right: half(-$grid-gutter-sm)
+
                 @include media-breakpoint-up(desktop)
                     .container
                         padding-left: 0
@@ -117,7 +119,7 @@ ol.programs
     @include media-breakpoint-down(desktop)
         .document-content
             .content
-                h2
+                > h2
                     margin-bottom: $spacing2
             section:not(:first-child):not(.block)
                 margin-top: $spacing3
diff --git a/layouts/partials/blocks/templates/image.html b/layouts/partials/blocks/templates/image.html
index a43230f2e..2bc4ef561 100644
--- a/layouts/partials/blocks/templates/image.html
+++ b/layouts/partials/blocks/templates/image.html
@@ -14,7 +14,9 @@
         {{- if not $title -}}
           {{ partial "blocks/default_title.html" $template }}
         {{ else }}
-          <h2>{{ partial "PrepareHTML" $title }}</h2>
+          <div class="top">
+            <h2>{{ partial "PrepareHTML" $title }}</h2>
+          </div>
         {{ end -}}
 
         {{- with .image -}}
diff --git a/layouts/partials/blocks/templates/partners.html b/layouts/partials/blocks/templates/partners.html
index 21c3c9547..20ce1f6c0 100644
--- a/layouts/partials/blocks/templates/partners.html
+++ b/layouts/partials/blocks/templates/partners.html
@@ -33,7 +33,7 @@ <h2>{{ partial "PrepareHTML" $title }}</h2>
                   {{ if .name }}
                     <div>
                       {{ $title = partial "PrepareHTML" .name -}}
-                      <h1>
+                      <h3>
                         {{- if .url }}
                         <a href="{{ .url }}" title="{{ safeHTML (i18n "commons.link.blank_aria" (dict "Title" $title)) }}">
                         {{ end }}
@@ -41,7 +41,7 @@ <h1>
                         {{ if .url }}
                         </a>
                         {{ end -}}
-                      </h1>
+                      </h3>
                     </div>
                   {{ end -}}
                   <div class="media">
diff --git a/layouts/partials/blocks/templates/timeline/vertical.html b/layouts/partials/blocks/templates/timeline/vertical.html
index f8205582b..0d465e692 100644
--- a/layouts/partials/blocks/templates/timeline/vertical.html
+++ b/layouts/partials/blocks/templates/timeline/vertical.html
@@ -12,7 +12,7 @@ <h2>{{ partial "PrepareHTML" .title }}</h2>
       {{ range .events -}}
         <article class="event">
           {{ if .title }}
-            <h1 class="event-title">{{ partial "PrepareHTML" .title }}</h1>
+            <h3 class="event-title">{{ partial "PrepareHTML" .title }}</h3>
           {{ end }}
           {{ if .text }}
             <p>{{ partial "PrepareText" .text }}</p>
diff --git a/layouts/partials/organizations/organization.html b/layouts/partials/organizations/organization.html
index e434c3d86..a82c6cc29 100644
--- a/layouts/partials/organizations/organization.html
+++ b/layouts/partials/organizations/organization.html
@@ -1,7 +1,7 @@
 <article class="organization">
   <div>
     {{ $title := partial "PrepareHTML" .Title }}
-    <h1><a href="{{ .Permalink }}" title="{{ safeHTML (i18n "commons.more_aria" (dict "Title" $title)) }}">{{ $title }}</a></h1>
+    <h2><a href="{{ .Permalink }}" title="{{ safeHTML (i18n "commons.more_aria" (dict "Title" $title)) }}">{{ $title }}</a></h2>
   </div>
   <div class="media">
     {{- if .Params.logo -}}
diff --git a/layouts/partials/programs/program.html b/layouts/partials/programs/program.html
index 45e780431..caa4fd805 100644
--- a/layouts/partials/programs/program.html
+++ b/layouts/partials/programs/program.html
@@ -1,11 +1,11 @@
 {{- $title := partial "PrepareHTML" .Title -}}
 <article class="program">
   <div>
-    <h1>
+    <h2>
       <a href="{{ .Permalink }}" title="{{ safeHTML (i18n "commons.more_aria" (dict "Title" $title)) }}">
         {{- $title -}}
       </a>
-    </h1>
+    </h2>
     {{ if (partial "GetTextFromHTML" .Params.presentation) }}
       <p>{{- partial "PrepareHTML" .Params.presentation -}}</p>
     {{ end }}

From bf1f076759fa5d21fc6f042510b1af0d2e81d670 Mon Sep 17 00:00:00 2001
From: alexisben <alex@noesya.coop>
Date: Mon, 23 Jan 2023 12:37:32 +0100
Subject: [PATCH 3/5] edit local files

---
 i18n/en.yml                                | 56 ++++++++++++-------
 i18n/fr.yml                                | 62 ++++++++++++++--------
 layouts/partials/blocks/default_title.html |  2 +-
 3 files changed, 78 insertions(+), 42 deletions(-)

diff --git a/i18n/en.yml b/i18n/en.yml
index 7dbcacee0..90f5e8f3f 100644
--- a/i18n/en.yml
+++ b/i18n/en.yml
@@ -1,22 +1,42 @@
 blocks:
-  call_to_action: Call to action
-  chapter: Chapter
-  contact: Contact
-  datatable: Table
-  definitions: Definitions
-  embed: HTML embed
-  files: Files
-  gallery: Gallery
-  image: Image
-  key_figures: Key figures
-  organization_chart: People
-  pages: Pages
-  partners: Organizations
-  posts: Posts
-  programs: Programs
-  testimonials: Testimonials
-  timeline: Timeline
-  video: Video
+  call_to_action:
+    title: Call to action
+  chapter:
+    title: Chapter
+  contact:
+    title: Contact
+  datatable:
+    title: Table
+  definitions:
+    title: Definitions
+  embed:
+    title: HTML embed
+  files:
+    title: Files
+  gallery:
+    title: Gallery
+  image:
+    title: Image
+  key_figures:
+    title: Key figures
+  organization_chart:
+    title: People
+  pages:
+    title: Pages
+  partners:
+    title: Organizations
+  posts:
+    title: Posts
+  programs:
+    title: Programs
+  testimonials:
+    title: Testimonials
+  timeline:
+    title: Timeline
+    next: Next element
+    previous: Previous element
+  video:
+    title: Video
 categories:
   no_post: No post in this category
   see_more:
diff --git a/i18n/fr.yml b/i18n/fr.yml
index 751a8185b..2487a9868 100644
--- a/i18n/fr.yml
+++ b/i18n/fr.yml
@@ -1,22 +1,42 @@
 blocks:
-  call_to_action: Appel à actions
-  chapter: Chapitre
-  contact: Contact
-  datatable: Tableau
-  definitions: Définitions
-  embed: Intégration HTML
-  files: Fichiers
-  gallery: Galerie
-  image: Image
-  key_figures: Chiffres-clés
-  organization_chart: Personnes
-  pages: Pages
-  partners: Organisations
-  posts: Actualités
-  programs: Formations
-  testimonials: Témoignages
-  timeline: Frise chronologique
-  video: Vidéo
+  call_to_action: 
+    title: Appel à actions
+  chapter: 
+    title: Chapitre
+  contact: 
+    title: Contact
+  datatable: 
+    title: Tableau
+  definitions: 
+    title: Définitions
+  embed: 
+    title: Intégration HTML
+  files: 
+    title: Fichiers
+  gallery: 
+    title: Galerie
+  image: 
+    title: Image
+  key_figures: 
+    title: Chiffres-clés
+  organization_chart: 
+    title: Personnes
+  pages: 
+    title: Pages
+  partners: 
+    title: Organisations
+  posts: 
+    title: Actualités
+  programs: 
+    title: Formations
+  testimonials: 
+    title: Témoignages
+  timeline: 
+    title: Frise chronologique
+    next: Élément suivant
+    previous: Élément précédent
+  video: 
+    title: Vidéo
 categories:
   no_post: Aucun article dans cette catégorie
   see_more:
@@ -197,8 +217,4 @@ volumes:
   plural_name: Volumes
   singular_name: Volume
   table_contents: Table des matières
-  volume_number: Volume {{ .Number }}
-blocks:
-  timeline:
-    next: Élément suivant
-    previous: Élément précédent
+  volume_number: Volume {{ .Number }}
\ No newline at end of file
diff --git a/layouts/partials/blocks/default_title.html b/layouts/partials/blocks/default_title.html
index f9770abf5..c0c1d6559 100644
--- a/layouts/partials/blocks/default_title.html
+++ b/layouts/partials/blocks/default_title.html
@@ -1 +1 @@
-<h2 class="hidden">{{- i18n (printf "blocks.%s" . ) -}}</h2>
\ No newline at end of file
+<h2 class="hidden">{{- i18n (printf "blocks.%s.title" . ) -}}</h2>
\ No newline at end of file

From 370b82aa0300216d64c52f3aced623e17de48b0c Mon Sep 17 00:00:00 2001
From: alexisben <alex@noesya.coop>
Date: Mon, 23 Jan 2023 12:40:47 +0100
Subject: [PATCH 4/5] fix block with hidden title

---
 assets/sass/_theme/blocks/key_figures.sass | 2 +-
 assets/sass/_theme/blocks/pages.sass       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/sass/_theme/blocks/key_figures.sass b/assets/sass/_theme/blocks/key_figures.sass
index 842b18935..caaa63dc1 100644
--- a/assets/sass/_theme/blocks/key_figures.sass
+++ b/assets/sass/_theme/blocks/key_figures.sass
@@ -10,7 +10,7 @@
             @include grid(4, desktop)
         &.odd-items
             @include grid(3, desktop)
-    .top + ul
+    .top:not(.hidden) + ul
         margin-top: $spacing2
     dl
         margin-bottom: 0
diff --git a/assets/sass/_theme/blocks/pages.sass b/assets/sass/_theme/blocks/pages.sass
index 53298a0a0..9a0e218f7 100644
--- a/assets/sass/_theme/blocks/pages.sass
+++ b/assets/sass/_theme/blocks/pages.sass
@@ -173,7 +173,7 @@
                         display: block
                         grid-column: 1 / 8
                         margin-bottom: 0
-                    .top + .description
+                    .top:not(.hidden) + .description
                         grid-column: 1 / 8
                         grid-row: 2 / 3
                     // Default behavior (without page description)

From c188c3d876e991082a05e1af13420f7f78fdfbda Mon Sep 17 00:00:00 2001
From: alexisben <alex@noesya.coop>
Date: Mon, 23 Jan 2023 12:53:08 +0100
Subject: [PATCH 5/5] fix block top title

---
 assets/sass/_theme/blocks/base.sass  | 6 +++---
 assets/sass/_theme/blocks/pages.sass | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/assets/sass/_theme/blocks/base.sass b/assets/sass/_theme/blocks/base.sass
index 67aa545c1..bea6b3ba7 100644
--- a/assets/sass/_theme/blocks/base.sass
+++ b/assets/sass/_theme/blocks/base.sass
@@ -2,15 +2,15 @@
     padding-top: $spacing3
     padding-bottom: $spacing3
     // Mobile & full-width
-    h2, h3
+    h2
         @include h2
     // Desktop with sidebar
     @include media-breakpoint-up(desktop)
         @include in-page-without-sidebar
-            h2, h3
+            h2
                 @include h5
     .top
-        h2, h3
+        h2:not(.hidden)
             + .description
                 margin-top: $spacing1
                 @include media-breakpoint-up(desktop)
diff --git a/assets/sass/_theme/blocks/pages.sass b/assets/sass/_theme/blocks/pages.sass
index 9a0e218f7..851d2b3f5 100644
--- a/assets/sass/_theme/blocks/pages.sass
+++ b/assets/sass/_theme/blocks/pages.sass
@@ -140,7 +140,6 @@
                     @include meta
                     @include icon(arrow, before, true)
                         padding-right: $spacing0
-                        
                     @include hover-translate-icon(before, 5)
                     @include link
                     text-decoration-color: rgba(0,0,0,0)