wip #7470 @4:00

diff --git a/app/Helpers/Fields.php b/app/Helpers/Fields.php
index 55895625646a6364c8ad44a1a1549d230c51e8ea..42b857c6343c556e836b8252876ecaf832261e44 100644 (file)
--- a/app/Helpers/Fields.php
+++ b/app/Helpers/Fields.php
@@ -18,6 +18,9 @@ class Fields
             'strike',
             'list-ordered',
             'list-unordered',
+            'code',
+            'code-block',
+            'clean',
             [ 'indent' => '-1'],
             [ 'indent' => '+1' ]
         ];

diff --git a/resources/views/admin/settings/strings.blade.php b/resources/views/admin/settings/strings.blade.php
index 8912822454a0d5758f6effc834a2924dd022e34e..d8979dd7c35eb8530ef82525bacf8836d6ff6c98 100644 (file)
--- a/resources/views/admin/settings/strings.blade.php
+++ b/resources/views/admin/settings/strings.blade.php
@@ -3,43 +3,57 @@
     'additionalFieldsets' => []
 ])
 
-@section('fieldsets')
-    @formField('wysiwyg', [
-        'label' => 'Titre principal',
+@section('contentFields')
+
+    @formField('input', [
+        'label' => 'Titre principal page accueil',
         'name' => 'main_title',
         'maxlength' => 1000,
         'required' => true,
         'toolbarOptions' => \App\Helpers\Fields::fullToolbar(),
     ])
-@stop
-
-@section('contentFields')
 
-    @formField('wysiwyg', [
-        'label' => 'Titre principal',
-        'name' => 'main_title',
+    @formField('input', [
+        'label' => 'Date édition du jour',
+        'name' => 'date_home',
         'maxlength' => 1000,
         'required' => true,
         'toolbarOptions' => \App\Helpers\Fields::fullToolbar(),
     ])
 
-    @formField('wysiwyg', [
-        'label' => 'Date édition du jour',
-        'name' => 'not_register',
+    @formField('input', [
+        'label' => 'Titre pas encore abonné',
+        'name' => 'not_register_title',
         'maxlength' => 1000,
         'required' => true,
         'toolbarOptions' => \App\Helpers\Fields::fullToolbar(),
     ])
 
-    @formField('wysiwyg', [
-        'label' => 'Texte lien pas encore abonné',
+    @formField('input', [
+        'label' => 'Texte lien offre abonnement',
         'name' => 'not_register_link',
         'maxlength' => 1000,
         'required' => true,
         'toolbarOptions' => \App\Helpers\Fields::fullToolbar(),
     ])
 
-    @formField('wysiwyg', [
+    @formField('input', [
+        'label' => 'Titre découverte page accueil',
+        'name' => 'title_discover_home',
+        'maxlength' => 1000,
+        'required' => true,
+        'toolbarOptions' => \App\Helpers\Fields::fullToolbar(),
+    ])
+
+    @formField('input', [
+        'label' => 'Texte pastille découverte page accueil',
+        'name' => 'text_discover_home',
+        'maxlength' => 1000,
+        'required' => true,
+        'toolbarOptions' => \App\Helpers\Fields::fullToolbar(),
+    ])
+
+    @formField('input', [
         'label' => 'Titre nos précédentes éditions',
         'name' => 'title_last_edition',
         'maxlength' => 1000,
@@ -47,9 +61,106 @@
         'toolbarOptions' => \App\Helpers\Fields::fullToolbar(),
     ])
 
+    @formField('input', [
+        'label' => 'Titre bloc image accueil',
+        'name' => 'title_bloc_image_home',
+        'maxlength' => 1000,
+        'required' => true,
+        'toolbarOptions' => \App\Helpers\Fields::fullToolbar(),
+    ])
+
     @formField('wysiwyg', [
-        'label' => 'Texte bloc image',
-        'name' => 'text_bloc_image',
+        'label' => 'Texte bloc image accueil',
+        'name' => 'text_bloc_image_home',
+        'maxlength' => 1000,
+        'required' => true,
+        'toolbarOptions' => \App\Helpers\Fields::fullToolbar(),
+    ])
+
+    @formField('input', [
+        'label' => 'Titre quotidien accueil',
+        'name' => 'title_quotidien_home',
+        'maxlength' => 1000,
+        'required' => true,
+        'toolbarOptions' => \App\Helpers\Fields::fullToolbar(),
+    ])
+
+    @formField('input', [
+        'label' => 'Titre principal - page découvrir psq',
+        'name' => 'main_title_discover_psq',
+        'maxlength' => 1000,
+        'required' => true,
+        'toolbarOptions' => \App\Helpers\Fields::fullToolbar(),
+    ])
+
+    @formField('input', [
+        'label' => 'Sous-titre - page découvrir psq',
+        'name' => 'subtitle_discover_psq',
+        'maxlength' => 1000,
+        'required' => true,
+        'toolbarOptions' => \App\Helpers\Fields::fullToolbar(),
+    ])
+
+    @formField('input', [
+        'label' => 'Titre principal - page abonnement',
+        'name' => 'main_title_subscription',
+        'maxlength' => 1000,
+        'required' => true,
+        'toolbarOptions' => \App\Helpers\Fields::fullToolbar(),
+    ])
+
+    @formField('input', [
+        'label' => 'Sous-titre - page abonnement',
+        'name' => 'subtitle_subscription',
+        'maxlength' => 1000,
+        'required' => true,
+        'toolbarOptions' => \App\Helpers\Fields::fullToolbar(),
+    ])
+
+    @formField('input', [
+        'label' => 'Texte - page abonnement',
+        'name' => 'subtitle_subscription',
+        'maxlength' => 1000,
+        'required' => true,
+        'toolbarOptions' => \App\Helpers\Fields::fullToolbar(),
+    ])
+
+    @formField('input', [
+        'label' => 'Titre formulaire - page découvrir psq',
+        'name' => 'form_title_discover_psq',
+        'maxlength' => 1000,
+        'required' => true,
+        'toolbarOptions' => \App\Helpers\Fields::fullToolbar(),
+    ])
+
+    @formField('input', [
+        'label' => 'Nom complet',
+        'name' => 'form_fullname',
+        'maxlength' => 1000,
+        'required' => true,
+        'toolbarOptions' => \App\Helpers\Fields::fullToolbar(),
+    ])
+
+    @formField('input', [
+        'label' => 'Adresse email Pro',
+        'name' => 'form_email_pro',
+        'maxlength' => 1000,
+        'type' => 'email',
+        'required' => true,
+        'toolbarOptions' => \App\Helpers\Fields::fullToolbar(),
+    ])
+
+    @formField('input', [
+        'label' => 'Employeur',
+        'name' => 'form_employer',
+        'maxlength' => 1000,
+        'required' => true,
+        'toolbarOptions' => \App\Helpers\Fields::fullToolbar(),
+    ])
+
+    @formField('input', [
+        'label' => 'Commentaires (facultatif)',
+        'name' => 'form_commentary',
         'maxlength' => 1000,
         'required' => true,
         'toolbarOptions' => \App\Helpers\Fields::fullToolbar(),

diff --git a/resources/views/auth/discover/index.blade.php b/resources/views/auth/discover/index.blade.php
index f229fc5845076b85a2847db6010f0dbe21285b5a..633c083a10cb9c6c09c5aeb4e1855f43be8de9a9 100644 (file)
--- a/resources/views/auth/discover/index.blade.php
+++ b/resources/views/auth/discover/index.blade.php
@@ -1,4 +1,5 @@
 @extends('layouts.v2.app')
+@inject('settings', \A17\Twill\Repositories\SettingRepository::class)
 
 @section('content')
 
@@ -8,10 +9,8 @@
                 <x-cover :pdf="$last_pdf->first()" type="3">
                 </x-cover>
                 <div class="psq-bloc-text psq-banner">
-                    <h1 class="bigtitle">Découvrez gratuitement
-                        notre quotidien
-                        durant 1 mois</h1>
-                    <p class="subtext f-20">Recevez gratuitement nos prochaines éditions sans engagement de votre part.</p>
+                    <h1 class="bigtitle">{!! $settings->byKey('main_title_discover_psq') !!}</h1>
+                    <p class="subtext f-20">{!! $settings->byKey('subtitle_discover_psq') !!}</p>
                 </div>
             </div>
         </div>
@@ -21,7 +20,7 @@
         <div class="container card-container-form card-decouvrir-psq">
             <div class="card form">
                 <div class="card-header text-lg-left text-center">
-                    Notre offre découverte
+                    {!! $settings->byKey('form_title_discover_psq') !!}
                 </div>
                 <div class="card-body">
                     <form method="POST" action="{{ route('discover.register') }}">
@@ -30,7 +29,7 @@
                             <input type="hidden" name="redirect_to" value="{{request()->redirect_to}}">
                         @endif
                         <div class="form-group">
-                            <label for="last_name">{{ 'Nom complet' }} *</label>
+                            <label for="last_name">{!! $settings->byKey('form_fullname') !!} *</label>
 
                             <div>
                                 <input id="last_name" type="text" class="form-control @error('last_name') is-invalid @enderror" name="last_name" value="{{ old('last_name') }}" required autocomplete="family-name">
@@ -44,7 +43,7 @@
                         </div>
 
                         <div class="form-group">
-                            <label for="email">{{ __('E-Mail Address') }} *</label>
+                            <label for="email">{!! $settings->byKey('form_email_pro') !!} *</label>
 
                             <div>
                                 <input id="email" type="email" class="form-control @error('email') is-invalid @enderror" name="email" value="{{ old('email') }}" required autocomplete="email">
@@ -58,7 +57,7 @@
                         </div>
 
                         <div class="form-group">
-                            <label for="employer">{{ __('Employeur') }} *</label>
+                            <label for="employer">{!! $settings->byKey('form_employer') !!} *</label>
 
                             <div>
                                 <input id="employer" type="text" class="form-control @error('employer') is-invalid @enderror" name="employer" value="{{ old('employer') }}" required>
@@ -71,7 +70,9 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label for="comments" class="col-form-label">Commentaires (facultatif)</label>
+                            <label for="comments" class="col-form-label">
+                                {!! $settings->byKey('form_commentary') !!}
+                            </label>
 
                             <div>
                                 <textarea id="comments" rows="3" type="text" class="form-control @error('comments') is-invalid @enderror" name="comments" value="{{ old('comments') }}"></textarea>

diff --git a/resources/views/home/index.blade.php b/resources/views/home/index.blade.php
index 549a494f7b598d662825fba927e6eca7f164ebc3..9921e0dd6245d9244cb55bea3b5e6e7f33e6f59e 100644 (file)
--- a/resources/views/home/index.blade.php
+++ b/resources/views/home/index.blade.php
@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@inject('settings', \A17\Twill\Repositories\SettingRepository::class)
 
 @section('content')
     <div class="container psq-actu">
@@ -22,7 +23,6 @@
         @endif
 
 
-
         @if (session('resent'))
             <div class="alert alert-success" role="alert">
                 {{ __('A fresh verification link has been sent to your email address.') }}
@@ -43,15 +43,15 @@
                 <div class="col-lg-8 col1">
                     <div class="psq-home-edition-jour">
                         <div class="grid-1">
-                            <h1 class="bigtitle">L'édition du jour</h1>
-                            <p class="date m-0">Lundi 17 septembre 2024</p>
+                            <h1 class="bigtitle">{!! $settings->byKey('main_title') !!}</h1>
+                            <p class="date m-0">{!! $settings->byKey('date_home') !!}</p>
                             <a href="" class="btnorange">Lire le quotidien</a>
                         </div>
                         <x-cover :pdf="$last_pdf->first()" type="3">
                         </x-cover>
                         <div class="grid-2">
-                            <h2>Pas encore abonné ?</h2>
-                            <a href="" class="underline">Découvrez notre offre d’abonnement.</a>
+                            <h2>{!! $settings->byKey('not_register_title') !!}</h2>
+                            <a href="" class="underline">{!! $settings->byKey('not_register_link') !!}</a>
                         </div>
                     </div>
                     {{--@foreach($last_pdf->first()->headlines ?? [] as $headline)
@@ -62,11 +62,11 @@
                     @endforeach--}}
                 </div>
                 <div class="col-lg-4 col2 d-flex flex-column position-relative right-block" style="z-index:1;">
-                    <h2 class="m-0 regulartitle">Découvrez gratuitement notre quotidien durant 1 mois</h2>
+                    <h2 class="m-0 regulartitle">{!! $settings->byKey('title_discover_home') !!}</h2>
                     <div class="psq-home-pdfimage">
                         <img src="{{ $last_pdf->first()->coverUrl }}" alt="" class="fb" />
                         <div class="pastille">
-                            Recevez gratuitement nos prochaines éditions sans engagement de votre part.
+                            {!! $settings->byKey('text_discover_home') !!}
                         </div>
                     </div>
 
@@ -77,7 +77,7 @@
 
         <div class="psq-home-last-edition row p-64-0">
             <div class="col-12 d-flex flex-column">
-                <h2 class="mediumtitle m-0">Nos précédentes éditions</h2>
+                <h2 class="mediumtitle m-0">{!! $settings->byKey('title_last_edition') !!}</h2>
                 <div id="carousel" class="row m-0 embla">
                     <div class="embla__viewport">
                         <div class="embla__container">
@@ -107,7 +107,6 @@
             </div>
         </div>
 
-
         <div class="line col-12 dotted d-none"></div>
 
         <div class="psq-home-section-footer row p-64-0">
@@ -116,19 +115,15 @@
                     <img src="{{ @asset('img/offre_abonnement.png') }}" />
                 </div>
                 <div class="texts bg-clearblue w-50 d-flex flex-column justify-content-center">
-                    <h3 class="regulartitle">L’actualité des acteurs du médicament et de ses partenaires en France et
-                        ailleurs avant 11h dans votre boite mail.</h3>
+                    <h3 class="regulartitle">{!! $settings->byKey('title_bloc_image_home') !!}</h3>
                     <div class="lilline"></div>
-                    <p class="liltitle">4 éditions par semaine
-                        8 à 12 pages par édition</p>
-                    <p>Depuis 13 ans, plus de 2300 ABONNÉS, au sein de 95 laboratoires pharmaceutiques et 50 entreprises
-                        partenaires de l’industrie du médicament.</p>
-                    <a href="#" class="linkunderline">Découvrez notre offre d’abonnement.</a>
+                    {!! $settings->byKey('text_bloc_image_home') !!}
+                    <a href="#" class="linkunderline">{!! $settings->byKey('not_register_link') !!}</a>
                 </div>
             </div>
             <div class="col-lg-4">
                 <div class="p-64 bg-blue d-flex flex-column justify-content-center align-items-center pdf-block radius">
-                    <h3 class="title-feuilleter regulartitle">Feuilletez gratuitement un de nos anciens numéros</h3>
+                    <h3 class="title-feuilleter regulartitle">{{ $settings->byKey('title_quotidien_home') }}</h3>
                     <img src="{{ $last_pdf->first()->coverUrl }}" alt="" />
                     <a href="#" class="btnorange">Feuilleter un quotidien</a>
                 </div>