From 86b5a0579c9e1f4d35a5f9b88248374af1699364 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Thu, 21 Dec 2023 12:21:34 +0100 Subject: [PATCH] Cookie notice 4.0.0 bump --- views/vendor/cn-cookies.blade.php | 50 ++++++++----------- .../standard.blade.php | 24 +++------ 2 files changed, 28 insertions(+), 46 deletions(-) diff --git a/views/vendor/cn-cookies.blade.php b/views/vendor/cn-cookies.blade.php index 93ebf89..3dd0499 100644 --- a/views/vendor/cn-cookies.blade.php +++ b/views/vendor/cn-cookies.blade.php @@ -1,38 +1,32 @@ {{-- blade-formatter-disable --}} @php -$site_name = Str::ucfirst(config('app.name')); +$site_name = Str::ucfirst($settingsGlobal->name); $logo_picture_url = Vite::asset('resources/theme/mounted/assets/images/home_logo.png'); $logo_title_text = __('Logo du site :name', ['name' => $site_name]); $logo_alt_text = __('Logo :name', ['name' => $site_name]); -$confidentiality_page_url = route('fo.charte'); $strings = (object)[ - 'modal_title' => __('Fenetre de gestion de cookies'), - 'button_customize_cookies' => __('cookie-notice.button_customize_cookies'), - 'button_close_cookies' => __('cookie-notice.button_close_cookies'), - 'button_forbid' => __('cookie-notice.button_forbid'), - 'button_allow' => __('cookie-notice.button_allow'), - 'button_forbid_all' => Str::upper(__('cookie-notice.button_forbid_all')), - 'button_allow_all' => Str::upper(__('cookie-notice.button_allow_all')), - 'button_customize' => Str::upper(__('cookie-notice.button_customize')), - 'button_forbid_all_title' => __('cookie-notice.button_forbid_all_title'), - 'button_allow_all_title' => __('cookie-notice.button_allow_all_title'), - 'button_back' => Str::upper(__('cookie-notice.button_back')), - 'banner_title' => __('cookie-notice.banner_title', ['site_name' => $site_name]), - 'banner_text_open' => __('cookie-notice.banner_text_open', ['site_name' => $site_name]), - 'banner_text' => __('cookie-notice.banner_text'), - 'banner_details' => __('cookie-notice.banner_details'), - 'banner_details_link' => __('cookie-notice.banner_details_link'), - 'banner_details_link_title' => __('cookie-notice.banner_details_link_title'), - 'banner_more_details' => __('cookie-notice.banner_more_details'), - 'banner_less_details' => __('cookie-notice.banner_less_details'), - 'Panel_title' => __('cookie-notice.Panel_title'), - 'Panel_content' => __('cookie-notice.Panel_content'), - 'Panel_subtitle' => __('cookie-notice.Panel_subtitle'), - 'Panel_details' => __('cookie-notice.Panel_details'), - 'picture_cookie_title' => __('Image d\'un bon gros cookie'), - 'navigation_title' => __('Navigation du panneau des cookie'), + 'modal_title' => __('cookie-notice.modal_title'), + 'button_customize_cookies' => __('cookie-notice.button_customize_cookies'), + 'button_close_cookies' => __('cookie-notice.button_close_cookies'), + 'button_title_open_new_tab' => __('cookie-notice.button_title_open_new_tab'), + 'button_forbid' => __('cookie-notice.button_forbid'), + 'button_allow' => __('cookie-notice.button_allow'), + 'button_forbid_all' => Str::upper(__('cookie-notice.button_forbid_all')), + 'button_allow_all' => Str::upper(__('cookie-notice.button_allow_all')), + 'button_customize' => Str::upper(__('cookie-notice.button_customize')), + 'button_forbid_all_title' => __('cookie-notice.button_forbid_all_title'), + 'button_allow_all_title' => __('cookie-notice.button_allow_all_title'), + 'button_back' => Str::upper(__('cookie-notice.button_back')), + 'banner_title' => __('cookie-notice.banner_title', ['site_name' => $site_name]), + 'banner_text' => __('cookie-notice.banner_text'), + 'panel_title' => __('cookie-notice.panel_title'), + 'panel_content' => __('cookie-notice.panel_content'), + 'panel_subtitle' => __('cookie-notice.panel_subtitle'), + 'panel_details' => __('cookie-notice.panel_details'), + 'picture_cookie_title' => __('cookie-notice.picture_cookie_title'), + 'navigation_title' => __('cookie-notice.navigation_title'), ]; $cookies = []; @@ -71,7 +65,7 @@ SCRIPT; {{-- INCLUDE TEMPLATE --}} @include('theme::vendor.cookie-notice-templates.standard', compact( 'site_name', 'logo_picture_url', 'logo_alt_text', - 'logo_title_text', 'confidentiality_page_url', 'strings' + 'logo_title_text', 'strings' )) @push('scripts') diff --git a/views/vendor/cookie-notice-templates/standard.blade.php b/views/vendor/cookie-notice-templates/standard.blade.php index c17f9b4..154a40c 100644 --- a/views/vendor/cookie-notice-templates/standard.blade.php +++ b/views/vendor/cookie-notice-templates/standard.blade.php @@ -22,7 +22,7 @@ {{-- CONTENT VIEW --}} -
+
{{-- 1ST PAGE BANNER --}}
@@ -33,27 +33,15 @@ {!! nl2br(e($strings->banner_title)) !!}
-

{!! nl2br(e($strings->banner_text)) !!}

-

{!! nl2br(e($strings->banner_text_open)) !!}

+

{!! nl2br(e($strings->banner_text)) !!}

-
-

- {!! nl2br(e($strings->banner_details)) !!}
- {{ $strings->banner_details_link }} -

-
-
- -
{{-- 2ND PAGE CUSTOMIZE PANEL --}}
-

{{ $strings->Panel_title }}

-

{!! nl2br(e($strings->Panel_subtitle)) !!}

-

{!! nl2br(e($strings->Panel_details)) !!}

+

{{ $strings->panel_title }}

+

{!! nl2br(e($strings->panel_subtitle)) !!}

+

{!! nl2br(e($strings->panel_details)) !!}

{{-- COOKIES LIST --}}
    @@ -76,7 +64,7 @@
    #name #description - #link + #link