diff --git a/resources/views/fo/layouts/header-banner.blade.php b/resources/views/fo/layouts/header-banner.blade.php index f8127673..856cecc3 100644 --- a/resources/views/fo/layouts/header-banner.blade.php +++ b/resources/views/fo/layouts/header-banner.blade.php @@ -20,8 +20,10 @@ @endif

{{ $staticPageModel->title }}

- @if (isset($staticPageModel->content)) -

{!! clean($staticPageModel->content) !!}

+ @if (isset($content) && !empty($content)) +

{!! clean($content) !!}

+ @else +

{!! clean($staticPageModel->subtitle) !!}

@endif diff --git a/resources/views/fo/pages/commitments/brand.blade.php b/resources/views/fo/pages/commitments/brand.blade.php index 0bf5ef8e..e0bbd3ee 100644 --- a/resources/views/fo/pages/commitments/brand.blade.php +++ b/resources/views/fo/pages/commitments/brand.blade.php @@ -55,6 +55,7 @@ 'picto_alt' => __($staticPageModel->picture_alt), 'picto_title' => __($staticPageModel->picture_title), 'picto_baner' => $staticPageModel->data['picto_banner'], + 'content' => $staticPageModel->content ]) {{-- PARAGRAPH WITH PICTURE --}} @if ($section_2_model->visibility) diff --git a/resources/views/fo/pages/commitments/eat.blade.php b/resources/views/fo/pages/commitments/eat.blade.php index d8565bfc..61dd7591 100644 --- a/resources/views/fo/pages/commitments/eat.blade.php +++ b/resources/views/fo/pages/commitments/eat.blade.php @@ -65,6 +65,7 @@ 'picto_alt' => __($staticPageModel->picture_alt), 'picto_title' => __($staticPageModel->picture_title), 'picto_baner' => $staticPageModel->data['picto_banner'], + 'content' => $staticPageModel->content ]) {{-- TAB-TEXTS --}} @php diff --git a/resources/views/fo/pages/commitments/life.blade.php b/resources/views/fo/pages/commitments/life.blade.php index 45753140..d2b80713 100644 --- a/resources/views/fo/pages/commitments/life.blade.php +++ b/resources/views/fo/pages/commitments/life.blade.php @@ -34,6 +34,7 @@ 'picto_alt' => __($staticPageModel->picture_alt), 'picto_title' => __($staticPageModel->picture_title), 'picto_baner' => $staticPageModel->data['picto_banner'], + 'content' => $staticPageModel->content ]) {{-- PARAGRAPH WITH PICTURE --}} @if ($section_2_model->visibility) diff --git a/resources/views/fo/pages/commitments/raise.blade.php b/resources/views/fo/pages/commitments/raise.blade.php index cfb791ac..48aa63ae 100644 --- a/resources/views/fo/pages/commitments/raise.blade.php +++ b/resources/views/fo/pages/commitments/raise.blade.php @@ -65,6 +65,7 @@ 'picto_alt' => __($staticPageModel->picture_alt), 'picto_title' => __($staticPageModel->picture_title), 'picto_baner' => $staticPageModel->data['picto_banner'], + 'content' => $staticPageModel->content ]) {{-- PARAGRAPH WITH PICTURE --}} @if ($section_2_model->visibility) diff --git a/resources/views/fo/pages/commitments/respect.blade.php b/resources/views/fo/pages/commitments/respect.blade.php index 3b33811d..e309d03b 100644 --- a/resources/views/fo/pages/commitments/respect.blade.php +++ b/resources/views/fo/pages/commitments/respect.blade.php @@ -3,7 +3,7 @@ $badge = new stdClass(); $badge->label = str("engagement n°{$commitmentId}")->upper(); $badge->color = '#006633'; - + $section_2_model = $staticPageModel->sections[0]; $section_2 = $section_2_model->data; $section_2_pictos = $section_2_model->pictos; @@ -17,7 +17,7 @@ $section_4 = $section_4_model->data; $section_4_pictos = $section_4_model->pictos; $reduction_4 = $section_4_model->blocks[0]->data; - + @endphp @@ -37,6 +37,7 @@ 'picto_alt' => __($staticPageModel->picture_alt), 'picto_title' => __($staticPageModel->picture_title), 'picto_baner' => $staticPageModel->data['picto_banner'], + 'content' => $staticPageModel->content ]) {{-- PARAGRAPH WITH VISUAL AND COMPLEX ITEMS --}} @@ -108,7 +109,7 @@ 'collection' => $section_4_pictos, ]) @endif - + {{-- OTHER COMMITMENTS --}} @include('fo.partials.commitments.other-commitments', [ 'number' => $commitmentId,