wip #6316 @1

diff --git a/app/Models/Traits/PublicationSettings.php b/app/Models/Traits/PublicationSettings.php
index b2858ef8e7cb180bf7892d540899178bd494663b..b5101c7338b8e93ecbd8e0131934059bd3c4a104 100644 (file)
--- a/app/Models/Traits/PublicationSettings.php
+++ b/app/Models/Traits/PublicationSettings.php
@@ -550,9 +550,9 @@ trait PublicationSettings
             'v2' => '{"type":"integer","default":16,"editable":true,"label":"\\u00a7!\\u00a7Nombre de pages \\u00e0 pr\\u00e9charger!\\u00a7!","grade":3}',
             'default' => 16,
         ]);
-        $this->addSettingField('priorityToPreload',Checkbox::class,$this->__('Priorité au préchargement sur la fluidité'),['default'=>false,
+        $this->addSettingField('priorityToPreload', Checkbox::class, $this->__('Priorité au préchargement sur la fluidité'), ['default' => false,
             'v2' => '{"type":"boolean","default":false,"editable":true,"label":"\\u00a7!\\u00a7Priorit\\u00e9 au pr\\u00e9chargement sur la fluidit\\u00e9!\\u00a7!","grade":3}',
-            ]);
+        ]);
         $this->addSettingField('maxPages', Integer::class, $this->__('Nombre de pages maximal affiché à l\'ouverture du fluidbook (pas de limite = 0)'), [
             'v2' => '{"type":"integer","default":0,"editable":true,"label":"\\u00a7!\\u00a7Nombre de pages maximal affich\\u00e9 \\u00e0 l\'ouverture du fluidbook (pas de limite = 0)!\\u00a7!","grade":3}',
             'default' => 0,
@@ -2100,27 +2100,38 @@ trait PublicationSettings
     protected function _statsTagCommander()
     {
         $this->addSettingField('section_tc', FormSection::class, $this->__('Tag Commander'));
+        $this->addSettingField('tagcommander_plan_type', SelectFromArray::class, __('Type de plan de marquage'),
+            [
+                'options' => ['file' => __('Fichier'), 'esm' => 'ESM (Harmonie Mutuelle)'],
+                'default' => 'file',
+            ]
+        );
         $this->addSettingField('tagcommander_id', LongText::class, 'Tag commander ID', [
             'v2' => '{"type":"text","default":"","editable":true,"label":"Tag commander ID","grade":3}',
         ]);
         $this->addSettingField('tagcommander_scriptname', LongText::class, 'Nom du script Tagcommander', [
             'v2' => '{"type":"text","default":"tc_Multisite_Head.js,tc_Multisite_Analytics.js,tc_Multisite_Medias.js","editable":true,"label":"Nom du script Tagcommander","grade":3}',
             'default' => 'tc_Multisite_Head.js,tc_Multisite_Analytics.js,tc_Multisite_Medias.js',
+            'when' => ['tagcommander_plan_type' => 'file'],
         ]);
         $this->addSettingField('tagcommander_prod', Checkbox::class, 'Production', [
             'v2' => '{"type":"boolean","default":true,"editable":true,"label":"Production","grade":3}',
             'default' => true,
         ]);
+
         $this->addSettingField('tagcommander_plan', FilesOrURL::class, 'Plan de taggage "Tag commander"', [
             'v2' => '{"type":"freefile","default":"","editable":true,"label":"Plan de taggage \\"Tag commander\\"","grade":3}',
+            'when' => ['tagcommander_plan_type' => 'file'],
         ]);
         $this->addSettingField('tagcommander_event_page', Textarea::class, __('Nom de l\'évenement de vue de page'), [
             'v2' => '{"type":"text","default":"page","editable":true,"grade":3}',
             'default' => 'page',
+            'when' => ['tagcommander_plan_type' => 'file'],
         ]);
         $this->addSettingField('tagcommander_default_vars', Textarea::class, 'Variables par défaut', [
             'v2' => '{"type":"textarea","default":"","editable":true,"label":"Variables par d\\u00e9faut","grade":3}',
         ]);
+
     }
 
     protected function _statsGoogleTagManager()