From b8dbf50033d8c7d8799dce4347b3101908f63dd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Tempez?= Date: Sun, 21 Nov 2021 16:11:40 +0100 Subject: [PATCH] =?UTF-8?q?11.2.00.6=20:=20L'arri=C3=A8re=20plan=20du=20co?= =?UTF-8?q?ntenu=20perso=20est=20d=C3=A9fini=20dans=20le=20th=C3=A8me=20et?= =?UTF-8?q?=20non=20"=C3=A0=20la=20main"=20Fond=20devient=20Arri=C3=A8re-p?= =?UTF-8?q?lan=20dans=20la=20d=C3=A9finition=20des=20couleurs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core.php | 3 ++- core/layout/common.css | 1 + core/module/theme/view/body/body.php | 2 +- core/module/theme/view/footer/footer.php | 2 +- core/module/theme/view/header/header.js.php | 9 +++++++-- core/module/theme/view/header/header.php | 6 +++--- core/module/theme/view/menu/menu.php | 2 +- core/module/theme/view/site/site.php | 2 +- module/gallery/view/theme/theme.php | 2 +- 9 files changed, 18 insertions(+), 11 deletions(-) diff --git a/core/core.php b/core/core.php index 88fa84dd..019bfcd0 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.5'; + const ZWII_VERSION = '11.2.00.6'; const ZWII_UPDATE_CHANNEL = "test"; public static $actions = []; @@ -2266,6 +2266,7 @@ class core extends common { $colors = helper::colorVariants($this->getData(['theme', 'block', 'backgroundColor'])); $css .= '.block {border: 1px solid ' . $this->getdata(['theme','block','borderColor']) . ';}.block h4 {background-color:'. $colors['normal'] . ';color:' . $colors['text'] .';}'; $css .= '.mce-tinymce {border: 1px solid ' . $this->getdata(['theme','block','borderColor']) .' !important;}'; + // Bannière if($this->getData(['theme', 'header', 'margin'])) { if($this->getData(['theme', 'menu', 'position']) === 'site-first') { diff --git a/core/layout/common.css b/core/layout/common.css index 7a22d659..36a1e377 100755 --- a/core/layout/common.css +++ b/core/layout/common.css @@ -505,6 +505,7 @@ header:not(.container) #featureContent { header #featureContent { overflow: hidden; + margin: 0 10px; } diff --git a/core/module/theme/view/body/body.php b/core/module/theme/view/body/body.php index 5a16aef9..6e1f536d 100644 --- a/core/module/theme/view/body/body.php +++ b/core/module/theme/view/body/body.php @@ -66,7 +66,7 @@ $imageFile = file_exists(self::FILE_DIR.'source/'.$this->getData(['theme', 'body', 'image'])) ? $this->getData(['theme', 'body', 'image']) : ""; echo template::file('themeBodyImage', [ 'help' => 'Sélectionner une image', - 'label' => 'Fond', + 'label' => 'Arrière-plan', 'type' => 1, 'value' => $imageFile ]); ?> diff --git a/core/module/theme/view/footer/footer.php b/core/module/theme/view/footer/footer.php index c26ed996..cee78331 100644 --- a/core/module/theme/view/footer/footer.php +++ b/core/module/theme/view/footer/footer.php @@ -57,7 +57,7 @@
'colorPicker', - 'label' => 'Fond', + 'label' => 'Arrière-plan', 'value' => $this->getData(['theme', 'footer', 'backgroundColor']), 'help' => 'Quand le pied de page est dans le site, l\'arrière plan transparent montre le fond de la page. Quand le pied de page est hors du site, l\'arrière plan transparent montre le fond du site.' ]); ?> diff --git a/core/module/theme/view/header/header.js.php b/core/module/theme/view/header/header.js.php index a0983a24..16d05c8c 100644 --- a/core/module/theme/view/header/header.js.php +++ b/core/module/theme/view/header/header.js.php @@ -83,7 +83,7 @@ $("input, select").on("change", function() { var headerFont = $("#themeHeaderFont").val(); var css = "@import url('https://fonts.googleapis.com/css?family=" + headerFont + "');"; - css += "header{background-color:" + $("#themeHeaderBackgroundColor").val() + ";text-align:" + $("#themeHeaderTextAlign").val() + ";"; + css += "header{text-align:" + $("#themeHeaderTextAlign").val() + ";"; if ($("#themeHeaderImage").val()) { // Une image est sélectionnée css += "background-image:url('site/file/source/" + $("#themeHeaderImage").val() + "');background-repeat:" + $("#themeHeaderImageRepeat").val() + ";background-position:" + $("#themeHeaderImagePosition").val() + ";"; @@ -97,7 +97,7 @@ $("input, select").on("change", function() { // Taille, couleur, épaisseur et capitalisation du titre de la bannière - css += "header span{color:" + $("#themeHeaderTextColor").val() + ";font-family:'" + headerFont.replace(/\+/g, " ") + "',sans-serif;font-weight:" + $("#themeHeaderFontWeight").val() + ";font-size:" + $("#themeHeaderFontSize").val() + ";text-transform:" + $("#themeHeaderTextTransform").val() + "}"; + css += "header span{font-family:'" + headerFont.replace(/\+/g, " ") + "',sans-serif;font-weight:" + $("#themeHeaderFontWeight").val() + ";font-size:" + $("#themeHeaderFontSize").val() + ";text-transform:" + $("#themeHeaderTextTransform").val() + "}"; // Cache le titre de la bannière if($("#themeHeaderTextHide").is(":checked")) { @@ -108,6 +108,9 @@ $("input, select").on("change", function() { } } + // Couleur du fond + css += "header{background-color:" + $("#themeHeaderBackgroundColor").val() + ";}"; + // Position de la bannière var positionNav = getData(['theme', 'menu', 'position'])); ?>; @@ -252,9 +255,11 @@ $("#themeHeaderFeature").on("change", function() { if($(this).val() === 'wallpaper') { $(".wallpaperContainer").show(); $(".featureContainer").hide(); + $("#themeHeaderTextColorWrapper").show(); } if($(this).val() === 'feature') { $(".featureContainer").show(); $(".wallpaperContainer").hide(); + $("#themeHeaderTextColorWrapper").hide(); } }).trigger("change"); diff --git a/core/module/theme/view/header/header.php b/core/module/theme/view/header/header.php index 58c2f28a..60020003 100644 --- a/core/module/theme/view/header/header.php +++ b/core/module/theme/view/header/header.php @@ -72,7 +72,7 @@
-
+

Couleurs

@@ -81,7 +81,7 @@ 'colorPicker', 'help' => 'Le curseur horizontal règle le niveau de transparence.', - 'label' => 'Fond', + 'label' => 'Arrière-plan', 'value' => $this->getData(['theme', 'header', 'backgroundColor']) ]); ?>
@@ -157,7 +157,7 @@ $this->getData(['theme', 'header', 'image']) : ""; echo template::file('themeHeaderImage', [ 'help' => 'Sélectionner une image aux dimensions recommandées ci-dessous :', - 'label' => 'Fond', + 'label' => 'Image', 'type' => 1, 'value' => $imageFile ]); ?> diff --git a/core/module/theme/view/menu/menu.php b/core/module/theme/view/menu/menu.php index 360f75bf..1db6aa40 100644 --- a/core/module/theme/view/menu/menu.php +++ b/core/module/theme/view/menu/menu.php @@ -138,7 +138,7 @@ 'colorPicker', 'help' => 'Le curseur horizontal règle le niveau de transparence.', - 'label' => 'Fond', + 'label' => 'Arrière-plan', 'value' => $this->getData(['theme', 'menu', 'backgroundColor']) ]); ?>
diff --git a/core/module/theme/view/site/site.php b/core/module/theme/view/site/site.php index 60d9a321..0184fb0a 100644 --- a/core/module/theme/view/site/site.php +++ b/core/module/theme/view/site/site.php @@ -66,7 +66,7 @@ 'colorPicker', 'help' => 'Le curseur horizontal règle le niveau de transparence.', - 'label' => 'Fond', + 'label' => 'Arrière-plan', 'value' => $this->getData(['theme', 'site', 'backgroundColor']) ]); ?>
diff --git a/module/gallery/view/theme/theme.php b/module/gallery/view/theme/theme.php index 91abfa84..8da3639e 100644 --- a/module/gallery/view/theme/theme.php +++ b/module/gallery/view/theme/theme.php @@ -115,7 +115,7 @@ 'colorPicker', 'help' => 'Le curseur horizontal règle le niveau de transparence.', - 'label' => 'Fond', + 'label' => 'Arrière-plan', 'value' => $this->getData(['module', $this->getUrl(0), 'theme','legendBgColor']) ]); ?>