From 4721782368d31d4fd09feea2057ad6c0bd6dca94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Tempez?= <frederic.tempez@outlook.com>
Date: Sun, 21 Nov 2021 10:28:06 +0100
Subject: [PATCH] =?UTF-8?q?11.2.00.5=20aper=C3=A7u=20contenu=20perso=20en-?=
 =?UTF-8?q?t=C3=AAte=20+=20aspect=20bloc=20zone=20de=20saisie?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core.php                            |  2 +-
 core/module/theme/theme.php              |  2 +-
 core/module/theme/view/footer/footer.css | 13 ++++++++++++-
 core/module/theme/view/footer/footer.php | 13 +++++--------
 core/module/theme/view/header/header.css | 13 ++++++++++++-
 core/module/theme/view/header/header.php | 16 +++++++---------
 core/vendor/tinymce/init.js              |  4 ++++
 7 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/core/core.php b/core/core.php
index da062e89..88fa84dd 100644
--- a/core/core.php
+++ b/core/core.php
@@ -45,7 +45,7 @@ class common {
 
 	// Numéro de version
 	const ZWII_UPDATE_URL = 'https://forge.chapril.org/ZwiiCMS-Team/update/raw/branch/master/';
-	const ZWII_VERSION = '11.2.00.4';
+	const ZWII_VERSION = '11.2.00.5';
 	const ZWII_UPDATE_CHANNEL = "test";
 
 	public static $actions = [];
diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php
index 4fab30d5..a76379b4 100644
--- a/core/module/theme/theme.php
+++ b/core/module/theme/theme.php
@@ -457,7 +457,7 @@ class theme extends common {
 				'imageContainer' => $this->getInput('themeHeaderImageContainer'),
 				'tinyHidden' => $this->getInput('themeHeaderTinyHidden', helper::FILTER_BOOLEAN),
 				'feature' => $this->getInput('themeHeaderFeature'),
-				'featureContent' => $this->getInput('themeHeaderContent', null)
+				'featureContent' => $this->getInput('themeHeaderText', null)
 			]]);
 			// Modification de la position du menu selon la position de la bannière
 			if  ( $this->getData(['theme','header','position']) == 'site'  )
diff --git a/core/module/theme/view/footer/footer.css b/core/module/theme/view/footer/footer.css
index 5a91e7a7..56873688 100755
--- a/core/module/theme/view/footer/footer.css
+++ b/core/module/theme/view/footer/footer.css
@@ -15,4 +15,15 @@
 
 /** NE PAS EFFACER
 * admin.css
-*/
\ No newline at end of file
+*/
+
+/**
+* Titre zone TinyMCE
+*/
+.titleWysiwygContent {
+    font-family: "Oswald",sans-serif;
+    font-weight: normal;
+    text-transform: none;
+    font-size: 1.0em;
+    margin: 10px;
+}
\ No newline at end of file
diff --git a/core/module/theme/view/footer/footer.php b/core/module/theme/view/footer/footer.php
index 874f37e3..c26ed996 100644
--- a/core/module/theme/view/footer/footer.php
+++ b/core/module/theme/view/footer/footer.php
@@ -140,14 +140,11 @@
 </div>
 <div class="row">
     <div class="col12">
-        <div class="block">
-            <h4>Contenu personnalisé</h4>
-            <?php echo template::textarea('themeFooterText', [
-					'label' => '<strong>Texte ou HTML</strong>',
-					'value' => $this->getData(['theme', 'footer', 'text']),
-					'class' => 'editorWysiwyg'
-				]); ?>
-        </div>
+        <?php echo template::textarea('themeFooterText', [
+                'label' => '<div class="titleWysiwygContent">Contenu personnalisé</div>',
+                'value' => $this->getData(['theme', 'footer', 'text']),
+                'class' => 'editorWysiwyg'
+            ]); ?>
     </div>
 </div>
 <div class="row">
diff --git a/core/module/theme/view/header/header.css b/core/module/theme/view/header/header.css
index d2dafebe..897020a3 100755
--- a/core/module/theme/view/header/header.css
+++ b/core/module/theme/view/header/header.css
@@ -14,4 +14,15 @@
 
 /** NE PAS EFFACER
 * admin.css
-*/
\ No newline at end of file
+*/
+
+/**
+* Titre zone TinyMCE
+*/
+.titleWysiwygContent {
+    font-family: "Oswald",sans-serif;
+    font-weight: normal;
+    text-transform: none;
+    font-size: 1.0em;
+    margin: 10px;
+}
\ No newline at end of file
diff --git a/core/module/theme/view/header/header.php b/core/module/theme/view/header/header.php
index 77e08d31..58c2f28a 100644
--- a/core/module/theme/view/header/header.php
+++ b/core/module/theme/view/header/header.php
@@ -205,15 +205,13 @@
 </div>
 <div class="row featureContainer">
     <div class="col12">
-        <div class="block">
-            <h4>Contenu personnalisé</h4>
-            <div class="row">
-                <div class="col12">
-                    <?php echo template::textarea('themeHeaderContent', [
-                        'class' => 'editorWysiwyg',
-                        'value' => $this->getData(['theme', 'header', 'featureContent'])
-                    ]); ?>
-                </div>
+        <div class="row">
+            <div class="col12">
+                <?php echo template::textarea('themeHeaderText', [
+                    'label' => '<div class="titleWysiwygContent">Contenu personnalisé</div>',
+                    'class' => 'editorWysiwyg',
+                    'value' => $this->getData(['theme', 'header', 'featureContent'])
+                ]); ?>
             </div>
         </div>
     </div>
diff --git a/core/vendor/tinymce/init.js b/core/vendor/tinymce/init.js
index 571fc400..ea91fcf4 100755
--- a/core/vendor/tinymce/init.js
+++ b/core/vendor/tinymce/init.js
@@ -20,6 +20,10 @@ tinymce.init({
 				if (ed.id === 'themeFooterText') {
 					$("#footerText").html(tinyMCE.get('themeFooterText').getContent());
 				}
+				if (ed.id === 'themeHeaderText') {
+					$("#featureContent").html(tinyMCE.get('themeHeaderText').getContent());
+				}
+
 			});
 		},
 	// Langue