From 566b64b697d8ba74bf07902bf10a7b699ef9b465 Mon Sep 17 00:00:00 2001
From: alexisben <alex@noesya.coop>
Date: Thu, 29 Dec 2022 17:55:04 +0100
Subject: [PATCH] add objectives and information into program

---
 assets/sass/_theme/sections/programs.sass   | 12 +++++++++---
 i18n/en.yml                                 |  2 ++
 i18n/fr.yml                                 |  2 ++
 layouts/partials/programs/presentation.html | 13 ++++++++++++-
 layouts/partials/programs/single.html       |  6 +++++-
 layouts/partials/programs/toc.html          | 10 +++++++++-
 6 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/assets/sass/_theme/sections/programs.sass b/assets/sass/_theme/sections/programs.sass
index 265f7c76..0fa4bf10 100644
--- a/assets/sass/_theme/sections/programs.sass
+++ b/assets/sass/_theme/sections/programs.sass
@@ -20,6 +20,14 @@ ol.programs
         justify-content: end
         .container
             position: relative
+    &:not(.full-width)
+        .lead
+            font-family: $lead-font-family
+            font-weight: $lead-weight
+            line-height: $lead-line-height
+            @include media-breakpoint-up(desktop)
+                font-size: $lead-size-desktop
+
     ol.programs
         margin-bottom: $spacing3
     .dropdown-share
@@ -135,7 +143,6 @@ ol.programs
                 .content
                     border-top: none
 
-
     .program-table
         tr
             font-size: unset
@@ -195,5 +202,4 @@ ol.programs
             a
             p
                 @include small
-                
-        
\ No newline at end of file
+    
\ No newline at end of file
diff --git a/i18n/en.yml b/i18n/en.yml
index 8fc90feb..432be14a 100644
--- a/i18n/en.yml
+++ b/i18n/en.yml
@@ -131,10 +131,12 @@ programs:
   administrative_information: Administrative information
   contacts: Contacts
   evaluation: Evaluation
+  objectives: Objectives
   opportunities: Opportunities
   _other: Other
   pedagogy: Pedagogy
   prerequisites: Prerequisites
+  presentation: Summary
   pricing: Pricing
   registration: Registration
   roles: Roles
diff --git a/i18n/fr.yml b/i18n/fr.yml
index d7b26891..4f1f9e0b 100644
--- a/i18n/fr.yml
+++ b/i18n/fr.yml
@@ -131,10 +131,12 @@ programs:
   administrative_information: Informations administratives
   contacts: Contacts
   evaluation: Modalités d’évaluation
+  objectives: Objectifs
   opportunities: Débouchés
   _other: Autre
   pedagogy: Méthodes mobilisées
   prerequisites: Prérequis
+  presentation: En bref
   pricing: Tarifs
   registration: Modalités et délais d’accès
   roles: Rôles
diff --git a/layouts/partials/programs/presentation.html b/layouts/partials/programs/presentation.html
index 526f6bcd..2d3893b7 100644
--- a/layouts/partials/programs/presentation.html
+++ b/layouts/partials/programs/presentation.html
@@ -5,8 +5,19 @@
 
         <div>
           {{- partial "programs/image.html" .Params.image -}}
+
+          {{- if partial "GetTextFromHTML" .Params.presentation -}}
+            <section id="{{ urlize (i18n "programs.presentation") }}">
+              <h3>{{ i18n "programs.presentation" }}</h3>
+              <p>{{- partial "PrepareHTML" .Params.presentation -}}</p>
+            </section>
+          {{- end -}}
+
           {{- if partial "GetTextFromHTML" .Params.objectives -}}
-            {{- partial "PrepareHTML" .Params.objectives -}}
+            <section id="{{ urlize (i18n "programs.objectives") }}">
+              <h3>{{ i18n "programs.objectives" }}</h3>
+              {{- partial "PrepareHTML" .Params.objectives -}}
+            </section>
           {{- end -}}
 
           <section id="{{ urlize (i18n "programs.administrative_information") }}">
diff --git a/layouts/partials/programs/single.html b/layouts/partials/programs/single.html
index 44e430b0..0edaa290 100644
--- a/layouts/partials/programs/single.html
+++ b/layouts/partials/programs/single.html
@@ -24,7 +24,11 @@
       <meta itemprop="image" content="{{ $url }}">
     {{- end -}}
   {{- end -}}
-  {{- partial "programs/abstract.html" .Params.presentation -}}
+
+  {{ partial "programs/chapo.html" (dict
+      "with_container" true
+      "context" .
+    ) }}
   {{- partial "programs/presentation.html" . -}}
   {{- partial "programs/children.html" .Pages -}}
   {{- partial "programs/pedagogy.html" . -}}
diff --git a/layouts/partials/programs/toc.html b/layouts/partials/programs/toc.html
index 8e858cfd..a911f2ef 100644
--- a/layouts/partials/programs/toc.html
+++ b/layouts/partials/programs/toc.html
@@ -1,4 +1,6 @@
-{{ $content := partial "GetTextFromHTML" .context.Params.content}}
+{{ $content := partial "GetTextFromHTML" .context.Params.content }}
+{{ $presentation :=  partial "GetTextFromHTML" .context.Params.presentation }}
+{{ $objectives :=  partial "GetTextFromHTML" .context.Params.objectives }}
 {{ $pedagogy :=  partial "GetTextFromHTML" .context.Params.pedagogy }}
 {{ $evaluation :=  partial "GetTextFromHTML" .context.Params.evaluation }}
 {{ $teachers := .context.Params.teachers }}
@@ -24,6 +26,12 @@
     <li>
       <a href="#{{ urlize (i18n "programs.toc.presentation") }}">{{ i18n "programs.toc.presentation" }}</a>
        <ol>
+          {{- if $presentation -}}
+            <li><a href="#{{ urlize (i18n "programs.presentation") }}">{{ i18n "programs.presentation" }}</a></li>
+          {{- end -}}
+          {{- if $objectives -}}
+            <li><a href="#{{ urlize (i18n "programs.objectives") }}">{{ i18n "programs.objectives" }}</a></li>
+          {{- end -}}
           <li><a href="#{{ urlize (i18n "programs.administrative_information") }}">{{ i18n "programs.administrative_information" }}</a></li>
           {{- if .context.Params.blocks -}}
             {{- partial "blocks/toc" .context.Params.blocks -}}
-- 
GitLab