From 47bab6cf33383f38b4bfd0b1d4e48fd6457d6907 Mon Sep 17 00:00:00 2001
From: Abdel LAMRANI <mohammed-abdelwadoud.lamrani@ldc.fr>
Date: Tue, 7 Jul 2026 17:03:32 +0200
Subject: [PATCH 1/2] fix reviews for commitmentns and breding

---
 resources/sass/fo/pages/breeding/approaches.scss    |  2 +-
 .../section/cahier-des-charges-section.blade.php    | 10 ++++++++--
 .../our-breeder-section.blade.php                   |  2 +-
 .../pages/breeding/sortant-a-l-exterieur.blade.php  | 13 +++----------
 .../views/fo/pages/commitments/raise.blade.php      |  3 ---
 5 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/resources/sass/fo/pages/breeding/approaches.scss b/resources/sass/fo/pages/breeding/approaches.scss
index 6b964576..bd816ff1 100644
--- a/resources/sass/fo/pages/breeding/approaches.scss
+++ b/resources/sass/fo/pages/breeding/approaches.scss
@@ -107,7 +107,7 @@
 
     .negative-margin-sm {
         padding-top: 3rem;
-        margin-top: -3rem;
+        margin-top: 0;
 
         @include media-breakpoint-up(md) {
             padding-top: 3rem;
diff --git a/resources/views/components/fo/breeding/section/cahier-des-charges-section.blade.php b/resources/views/components/fo/breeding/section/cahier-des-charges-section.blade.php
index 2d106c4e..2e170a04 100644
--- a/resources/views/components/fo/breeding/section/cahier-des-charges-section.blade.php
+++ b/resources/views/components/fo/breeding/section/cahier-des-charges-section.blade.php
@@ -1,12 +1,12 @@
 @php
     $items = $sections;
 @endphp
-@props(['onglets' => [], 'sections' => [], 'staticPageModel'])
+@props(['onglets' => [], 'sections' => [], 'staticPageModel', 'encart' => false])
 <section class="position-relative line-border-large" id="sortant-a-l-exterieur">
     <div class="position-absolute h-100 w-100 top-0 z-0">
         <div class="bg-green-wood h-100 w-100" id="demarche-bg"></div>
     </div>
-    <div class="container-fluid position-relative z-1 py-5">
+    <div class="container-fluid position-relative z-1 py-5 wrapper">
 
         <div class="row w-100 justify-content-center px-md-4 mx-auto px-1">
             <div class="col-12 mb-2">
@@ -75,6 +75,12 @@
                     </div>
                 @endforeach
             </div>
+            @if ($encart)
+            <div class="mt-5">
+                <x-fo.breeding.section.sortant-a-l-exterieur.our-breeder-section />
+            </div>
+            @endif
         </div>
+        
     </div>
 </section>
diff --git a/resources/views/components/fo/breeding/section/sortant-a-l-exterieur/our-breeder-section.blade.php b/resources/views/components/fo/breeding/section/sortant-a-l-exterieur/our-breeder-section.blade.php
index 38e2d17e..cd1b33b3 100644
--- a/resources/views/components/fo/breeding/section/sortant-a-l-exterieur/our-breeder-section.blade.php
+++ b/resources/views/components/fo/breeding/section/sortant-a-l-exterieur/our-breeder-section.blade.php
@@ -1,4 +1,4 @@
-<div class="container-fluid position-relative z-1 pt-4 pb-5">
+<div class="container-fluid position-relative z-1 pt-4 pb-5>
     <div class="mt-5">
         <x-fo.breeding.sortant-a-l-exterieur-card href="{{ route('fo.breeding.oui-c-est-bon') }}"
             title="{{ __('La démarche Oui c\'est bon') }}" containerTitle="{{ __('Découvrez aussi') }}"
diff --git a/resources/views/fo/pages/breeding/sortant-a-l-exterieur.blade.php b/resources/views/fo/pages/breeding/sortant-a-l-exterieur.blade.php
index 885c1bd7..d0cc0191 100644
--- a/resources/views/fo/pages/breeding/sortant-a-l-exterieur.blade.php
+++ b/resources/views/fo/pages/breeding/sortant-a-l-exterieur.blade.php
@@ -6,16 +6,9 @@
 @section('content')
     <x-fo.breeding.section.header-section :staticPageModel="$staticPageModel" />
     <section class="position-relative line-border-large" id="sortant-a-l-exterieur">
-        <x-fo.breeding.section.cahier-des-charges-section :staticPageModel="$staticPageModel" :onglets="$categoryApproachModels"
-            :sections="$sections" />
-        <x-fo.breeding.section.sortant-a-l-exterieur.galery-section :sliderImages="$sliderImages" title="{{ $staticPageModel->data['galery_title']['value'] }}" />
-        <div class="position-relative">
-            <div class="position-absolute h-100 w-100 top-0 z-0">
-                <div class="bg-green-wood h-100 w-100 line-border-large" id="demarche-bg"></div>
-            </div>
-
-            <x-fo.breeding.section.sortant-a-l-exterieur.our-breeder-section />
-        </div>
+        <x-fo.breeding.section.cahier-des-charges-section :staticPageModel="$staticPageModel" :onglets="$categoryApproachModels" :sections="$sections" encart=true/>
+        <x-fo.breeding.section.sortant-a-l-exterieur.galery-section :sliderImages="$sliderImages"
+            title="{{ $staticPageModel->data['galery_title']['value'] }}" />
     </section>
     {{-- <section class="pb-3 pt-5" id="breeder-map-section">
         <div class="pt-5">
diff --git a/resources/views/fo/pages/commitments/raise.blade.php b/resources/views/fo/pages/commitments/raise.blade.php
index de4f195e..359028d7 100644
--- a/resources/views/fo/pages/commitments/raise.blade.php
+++ b/resources/views/fo/pages/commitments/raise.blade.php
@@ -120,7 +120,6 @@
                     'picto_alt' => __($section_4->media_picto->alt),
                     'picto_title' => __($section_4->media_picto->title),
                     'reduction' => $reduction_4,
-                    'btnLink' => route('fo.breeding.oui-c-est-bon'),
                     'reversed' => true,
                 ])
                 {{-- COMPLEX FLEX ITEMS --}}
@@ -149,8 +148,6 @@
             'picto_alt' => __($section_5->media_picto->alt),
             'picto_title' => __($section_5->media_picto->title),
             'reduction' => $reduction_5,
-            'btnLabel' => str(__('découvrir la démarche'))->upper(),
-            'btnLink' => route('fo.breeding.sortant-a-l-exterieur'),
             'reversed' => true,
         ])
         {{-- COMPLEX FLEX ITEMS --}}

From c375384bcf28e8ab0333682700e33b6b808dcc7e Mon Sep 17 00:00:00 2001
From: Abdel LAMRANI <mohammed-abdelwadoud.lamrani@ldc.fr>
Date: Tue, 7 Jul 2026 17:05:47 +0200
Subject: [PATCH 2/2] fix reviews for commitmentns and breding

---
 .../fo/breeding/section/cahier-des-charges-section.blade.php    | 2 +-
 .../section/sortant-a-l-exterieur/our-breeder-section.blade.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/components/fo/breeding/section/cahier-des-charges-section.blade.php b/resources/views/components/fo/breeding/section/cahier-des-charges-section.blade.php
index 2e170a04..ba4670d1 100644
--- a/resources/views/components/fo/breeding/section/cahier-des-charges-section.blade.php
+++ b/resources/views/components/fo/breeding/section/cahier-des-charges-section.blade.php
@@ -6,7 +6,7 @@
     <div class="position-absolute h-100 w-100 top-0 z-0">
         <div class="bg-green-wood h-100 w-100" id="demarche-bg"></div>
     </div>
-    <div class="container-fluid position-relative z-1 py-5 wrapper">
+    <div class="container-fluid position-relative z-1 py-5">
 
         <div class="row w-100 justify-content-center px-md-4 mx-auto px-1">
             <div class="col-12 mb-2">
diff --git a/resources/views/components/fo/breeding/section/sortant-a-l-exterieur/our-breeder-section.blade.php b/resources/views/components/fo/breeding/section/sortant-a-l-exterieur/our-breeder-section.blade.php
index cd1b33b3..38e2d17e 100644
--- a/resources/views/components/fo/breeding/section/sortant-a-l-exterieur/our-breeder-section.blade.php
+++ b/resources/views/components/fo/breeding/section/sortant-a-l-exterieur/our-breeder-section.blade.php
@@ -1,4 +1,4 @@
-<div class="container-fluid position-relative z-1 pt-4 pb-5>
+<div class="container-fluid position-relative z-1 pt-4 pb-5">
     <div class="mt-5">
         <x-fo.breeding.sortant-a-l-exterieur-card href="{{ route('fo.breeding.oui-c-est-bon') }}"
             title="{{ __('La démarche Oui c\'est bon') }}" containerTitle="{{ __('Découvrez aussi') }}"