diff --git a/core/core.php b/core/core.php index 7fe7fda9..87e883bb 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 @@
-
-

Contenu personnalisé

- 'Texte ou HTML', - 'value' => $this->getData(['theme', 'footer', 'text']), - 'class' => 'editorWysiwyg' - ]); ?> -
+ '
Contenu personnalisé
', + 'value' => $this->getData(['theme', 'footer', 'text']), + 'class' => 'editorWysiwyg' + ]); ?>
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 @@
-
-

Contenu personnalisé

-
-
- 'editorWysiwyg', - 'value' => $this->getData(['theme', 'header', 'featureContent']) - ]); ?> -
+
+
+ '
Contenu personnalisé
', + 'class' => 'editorWysiwyg', + 'value' => $this->getData(['theme', 'header', 'featureContent']) + ]); ?>
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