From f25b27eae089f03972a4282a2936946a2fab5324 Mon Sep 17 00:00:00 2001
From: Fred Tempez <ftempez@gmail.com>
Date: Wed, 19 Aug 2020 21:08:21 +0200
Subject: [PATCH] =?UTF-8?q?Search=20gestion=20du=20th=C3=A8me=20modifi?=
 =?UTF-8?q?=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 module/search/ressource/defaultdata.php |  6 ++++++
 module/search/search.php                | 16 ++++++++++------
 module/search/view/config/config.php    | 18 ++++++++----------
 module/search/view/index/index.css      |  2 +-
 module/search/view/index/index.php      |  4 ++--
 5 files changed, 27 insertions(+), 19 deletions(-)
 create mode 100644 module/search/ressource/defaultdata.php

diff --git a/module/search/ressource/defaultdata.php b/module/search/ressource/defaultdata.php
new file mode 100644
index 00000000..70f27c6c
--- /dev/null
+++ b/module/search/ressource/defaultdata.php
@@ -0,0 +1,6 @@
+<?php
+class theme extends search {
+	public static $defaultData = [
+        'keywordColor'      => 'rgba(229, 229, 1, 1)'
+    ];
+}
\ No newline at end of file
diff --git a/module/search/search.php b/module/search/search.php
index 49d3e815..feba7693 100755
--- a/module/search/search.php
+++ b/module/search/search.php
@@ -32,21 +32,25 @@ class search extends common {
 	public static $motclef = '';
 	public static $motentier = '';
 
-	// paramètres pas défaut
-	public static $defaultButtonText = 'Rechercher';
-	public static $defaultPlaceHolder = 'Un plusieurs mots-clés séparés par un espace ou par +';
-
 	const SEARCH_VERSION = '1.1';
 
 	// Configuration vide
 	public function config() {
+		// Initialisation des données de thème de la galerie dasn theme.json
+		// Création des valeur par défaut absentes
+		if ( $this->getData(['theme', 'search']) === null ) {
+			require_once('module/search/ressource/defaultdata.php');
+			$this->setData(['theme', 'search', theme::$defaultData]);
+		}
 		if($this->isPost())  {
 			// Soumission du formulaire
-			$this->setData(['module', 'search', [
+			$this->setData(['theme', 'search', [
+				'keywordColor' => $this->getInput('searchKeywordColor')
+			]]);
+			$this->setData(['module', $this->getUrl(0), [
 				'submitText' => $this->getInput('searchSubmitText'),
 				'placeHolder' => $this->getInput('searchPlaceHolder'),
 				'resultHideContent' => $this->getInput('searchResultHideContent',helper::FILTER_BOOLEAN),
-				'keywordColor' => $this->getInput('searchKeywordColor')
 			]]);
 			// Création des fichiers CSS
 			$content = file_get_contents('module/search/ressource/vartheme.css');
diff --git a/module/search/view/config/config.php b/module/search/view/config/config.php
index 9e79794e..ed1c6b39 100755
--- a/module/search/view/config/config.php
+++ b/module/search/view/config/config.php
@@ -17,26 +17,24 @@
 			<div class="block">
 			<h4>Paramètres</h4>
 				<div class="row">
-					<div class="col4">
+					<div class="col3">
 						<?php echo template::text('searchKeywordColor', [
 							'class' => 'colorPicker',
-							'help' => 'Le curseur horizontal règle le niveau de transparence.',
-							'label' => 'Mot-clef en évidence',
-							'value' => $this->getData(['module', 'search', 'keywordColor'])
+							'help' => ' Cette couleur est commune à tous les modules de recherche. Le curseur horizontal règle le niveau de transparence.',
+							'label' => 'Mot-clef en évidence.',
+							'value' => $this->getData(['theme', 'search', 'keywordColor'])
 						]); ?>
 					</div>
-					<div class="col4">
+					<div class="col3">
 						<?php echo template::text('searchSubmitText', [
 								'label' => 'Texte du bouton',
-								'value' => $this->getData(['module', 'search', 'submitText']),
-								'placeholder' => $module::$defaultButtonText
+								'value' => $this->getData(['module', $this->getUrl(0), 'submitText']) ? $this->getData(['module', $this->getUrl(0), 'submitText']) : 'Rechercher'
 							]); ?>
 					</div>
-					<div class="col4">
+					<div class="col6">
 						<?php echo template::text('searchPlaceHolder', [
 								'label' => 'Aide dans la zone de saisie',
-								'value' => $this->getData(['module', 'search', 'placeHolder']),
-								'placeholder' => $module::$defaultPlaceHolder
+								'value' => $this->getData(['module', $this->getUrl(0), 'placeHolder']) ? $this->getData(['module', $this->getUrl(0), 'placeHolder']) : 'Un plusieurs mots-clés séparés par un espace ou par +'
 							]); ?>
 					</div>
 				</div>
diff --git a/module/search/view/index/index.css b/module/search/view/index/index.css
index 2030ce0a..8e5dc743 100755
--- a/module/search/view/index/index.css
+++ b/module/search/view/index/index.css
@@ -1,5 +1,5 @@
 .searchKeyword {
-	--keywordColor: rgba(80, 237, 9, 0.88);
+	--keywordColor: rgba(229, 229, 1, 1);
 }
 .searchTitle {
     font: caption;
diff --git a/module/search/view/index/index.php b/module/search/view/index/index.php
index d87515a4..0b40c108 100755
--- a/module/search/view/index/index.php
+++ b/module/search/view/index/index.php
@@ -4,13 +4,13 @@
             <div class="row">
                 <div class="col9 verticalAlignMiddle">
                     <?php echo template::text('searchMotphraseclef', [
-                        'placeholder' => $this->getData(['module',$this->getUrl(0),'placeHolder']) ? $this->getData(['module',$this->getUrl(0),'placeHolder']) : $module::$defaultPlaceHolder,
+                        'placeholder' => $this->getData(['module', $this->getUrl(0), 'placeHolder']) ? $this->getData(['module', $this->getUrl(0), 'placeHolder']) : 'Un plusieurs mots-clés séparés par un espace ou par +',
                         'value' => $module::$motclef
                     ]); ?>
                 </div>
                 <div class="col3 verticalAlignMiddle">
                     <?php echo template::submit('pageEditSubmit', [
-                        'value' => $this->getData(['module',$this->getUrl(0),'submitText']) ? $this->getData(['module',$this->getUrl(0),'submitText']) : $module::$defaultButtonText
+                        'value' => $this->getData(['module', $this->getUrl(0), 'submitText']) ? $this->getData(['module', $this->getUrl(0), 'submitText']) : 'Rechercher'
                     ]); ?>
                 </div>
             </div>