From 2aa012479cea3e44fc967830abdfbdebb42ac781 Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Tue, 11 Feb 2020 11:09:11 +0100 Subject: [PATCH 1/3] (9.2.20] petite erreur de syntaxe --- core/layout/common.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/layout/common.css b/core/layout/common.css index 8bf683af..a2243ac0 100755 --- a/core/layout/common.css +++ b/core/layout/common.css @@ -985,7 +985,7 @@ label { background: #F5F5F5; text-align: center; float: right; - min-height :100%; + min-height: 100%; } .inputFile:hover { text-decoration: none; From b41d28b0c86c978863ae3f84970dba83027ba28c Mon Sep 17 00:00:00 2001 From: fredtempez Date: Tue, 11 Feb 2020 20:10:43 +0100 Subject: [PATCH 2/3] =?UTF-8?q?[9.2.21]=20correction=20d=C3=A9finitive=20d?= =?UTF-8?q?es=20br=20dans=20le=20footer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core.php | 4 ++-- core/layout/common.css | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/core/core.php b/core/core.php index adb18aff..4af96a47 100644 --- a/core/core.php +++ b/core/core.php @@ -33,7 +33,7 @@ class common { const TEMP_DIR = 'site/tmp/'; // Numéro de version - const ZWII_VERSION = '9.2.20'; + const ZWII_VERSION = '9.2.21'; public static $actions = []; public static $coreModuleIds = [ @@ -2075,7 +2075,7 @@ class layout extends common { */ public function showFooterText() { if($footerText = $this->getData(['theme', 'footer', 'text']) OR $this->getUrl(0) === 'theme') { - echo '
' . nl2br($footerText) . '
'; + echo '
' . $footerText . '
'; } } diff --git a/core/layout/common.css b/core/layout/common.css index a2243ac0..bfe8bf15 100755 --- a/core/layout/common.css +++ b/core/layout/common.css @@ -640,12 +640,6 @@ footer #footerbody > div { font-size: inherit; } -/* Corrige le problème des
dans les col du texte personnalisé */ -#footerText div { - display: inline-flex; - float: left; -} - /* Conserve le pied de page sur une ligne */ @media (max-width: 768px) { body > footer { From b2284caae4c316712936e21c09edee80cf4f8b06 Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Thu, 13 Feb 2020 10:48:56 +0100 Subject: [PATCH 3/3] =?UTF-8?q?[9.2.21]=20=20param=C3=A8tre=20ic=C3=B4ne?= =?UTF-8?q?=20back=20to=20top?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core.php | 11 ++++++ core/layout/common.css | 4 +- core/module/install/ressource/defaultdata.php | 4 +- core/module/theme/theme.php | 4 +- core/module/theme/view/body/body.css | 16 ++++++++ core/module/theme/view/body/body.js.php | 2 + core/module/theme/view/body/body.php | 38 +++++++++++++++---- 7 files changed, 68 insertions(+), 11 deletions(-) create mode 100644 core/module/theme/view/body/body.css diff --git a/core/core.php b/core/core.php index 4af96a47..551c4a26 100644 --- a/core/core.php +++ b/core/core.php @@ -1047,6 +1047,15 @@ class common { $this->setData(['core', 'dataVersion', 9216]); $this->saveData(); } + // Version 9.2.21 + if($this->getData(['core', 'dataVersion']) < 9221) { + // Utile pour l'installation d'un backup sur un autre serveur + // mais avec la réécriture d'URM + $this->setData(['theme', 'body', 'toTopbackgroundColor', 'rgba(33, 34, 35, .8)' ]); + $this->setData(['theme', 'body', 'toTopColor', 'rgba(255, 255, 255, 1)' ]); + $this->setData(['core', 'dataVersion', 9221]); + $this->saveData(); + } } } @@ -1129,6 +1138,8 @@ class core extends common { if($themeBodyImage = $this->getData(['theme', 'body', 'image'])) { $css .= 'body{background-image:url("../file/source/' . $themeBodyImage . '");background-position:' . $this->getData(['theme', 'body', 'imagePosition']) . ';background-attachment:' . $this->getData(['theme', 'body', 'imageAttachment']) . ';background-size:' . $this->getData(['theme', 'body', 'imageSize']) . ';background-repeat:' . $this->getData(['theme', 'body', 'imageRepeat']) . '}'; } + // Icône BacktoTop + $css .= '#backToTop {background-color:' .$this->getData(['theme', 'body', 'toTopbackgroundColor']). ';color:'.$this->getData(['theme', 'body', 'toTopColor']).';}'; // Site $colors = helper::colorVariants($this->getData(['theme', 'link', 'textColor'])); $css .= 'a{color:' . $colors['normal'] . '}'; diff --git a/core/layout/common.css b/core/layout/common.css index bfe8bf15..002e0718 100755 --- a/core/layout/common.css +++ b/core/layout/common.css @@ -743,8 +743,10 @@ footer #footerSocials .zwiico-github:hover { right: 30px; bottom: 50px; padding: 13px 16px 16px; + /* + Paramétré dans le thème (9.2.21) background: rgba(33, 34, 35, .8); - color: #FFF; + color: #FFF;*/ cursor: pointer; display: none; border-radius: 50%; diff --git a/core/module/install/ressource/defaultdata.php b/core/module/install/ressource/defaultdata.php index 4283dda6..968d6a66 100644 --- a/core/module/install/ressource/defaultdata.php +++ b/core/module/install/ressource/defaultdata.php @@ -441,7 +441,9 @@ class install extends common { 'imageAttachment' => 'scroll', 'imageRepeat' => 'no-repeat', 'imagePosition' => 'top center', - 'imageSize' => 'auto' + 'imageSize' => 'auto', + 'toTopbackgroundColor' => 'rgba(33, 34, 35, .8)', + 'toTopColor' => 'rgba(255, 255, 255, 1)' ], 'button' => [ 'backgroundColor' => 'rgba(32, 59, 82, 1)' diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php index 67f5594b..79f01070 100755 --- a/core/module/theme/theme.php +++ b/core/module/theme/theme.php @@ -275,7 +275,9 @@ class theme extends common { 'imageAttachment' => $this->getInput('themeBodyImageAttachment'), 'imagePosition' => $this->getInput('themeBodyImagePosition'), 'imageRepeat' => $this->getInput('themeBodyImageRepeat'), - 'imageSize' => $this->getInput('themeBodyImageSize') + 'imageSize' => $this->getInput('themeBodyImageSize'), + 'toTopbackgroundColor' => $this->getInput('themeBodyToTopBackground'), + 'toTopColor' => $this->getInput('themeBodyToTopColor') ]]); // Valeurs en sortie $this->addOutput([ diff --git a/core/module/theme/view/body/body.css b/core/module/theme/view/body/body.css new file mode 100644 index 00000000..f4e66975 --- /dev/null +++ b/core/module/theme/view/body/body.css @@ -0,0 +1,16 @@ +/** + * This file is part of Zwii. * + * For full copyright and license information, please see the LICENSE + * file that was distributed with this source code. + * + * @author Rémi Jean + * @copyright Copyright (C) 2008-2018, Rémi Jean + * @license GNU General Public License, version 3 + * @author Frédéric Tempez + * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @link http://zwiicms.com/ + */ + +#backToTop { + display: block; +} \ No newline at end of file diff --git a/core/module/theme/view/body/body.js.php b/core/module/theme/view/body/body.js.php index b6429b7e..e051b873 100755 --- a/core/module/theme/view/body/body.js.php +++ b/core/module/theme/view/body/body.js.php @@ -24,6 +24,8 @@ $("input, select").on("change", function() { else { css += "body{background-image:none}"; } + css += '#backToTop {background-color:' + $("#themeBodyToTopBackground").val() + ';color:' + $("#themeBodyToTopColor").val() + ';}'; + // Ajout du css au DOM $("#themePreview").remove(); $("