diff --git a/core/core.php b/core/core.php index 873fcc5b..534bff60 100755 --- a/core/core.php +++ b/core/core.php @@ -1527,7 +1527,7 @@ class core extends common { // Version $css = '/*' . md5(json_encode($this->getData(['admin']))) . '*/'; $css .= '#site{background-color:' . $this->getData(['admin','backgroundColor']) . ';}'; - $css .= 'body, .row > div {font:' . $this->getData(['admin','fontSize']) . ' "' . $this->getData(['admin','font']) . '", sans-serif;}'; + $css .= 'body, .row > div {font:' . $this->getData(['admin','fontSize']) . ' "' . $this->getData(['admin','fontText']) . '", sans-serif;}'; $css .= 'body h1, h2, h3, h4, h5, h6 {font-family:' . $this->getData(['admin','fontTitle' ]) . ', sans-serif;color:' . $this->getData(['admin','colorTitle' ]) . ';}'; $css .= 'body:not(.editorWysiwyg),.block h4,input[type=email],input[type=text],input[type=password],.inputFile,select,textarea:not(.editorWysiwyg),.inputFile,span .zwiico-help,.button.buttonGrey {color:' . $this->getData(['admin','colorText']) . ';}'; $colors = helper::colorVariants($this->getData(['admin','backgroundColorButton'])); @@ -1538,10 +1538,10 @@ class core extends common { $css .= '.button.buttonGrey {background: ' . $colors['normal'] . ';}.button.buttonGrey:hover {background:' . $colors['darken'] . '}.button.buttonGrey:active {background:' . $colors['veryDarken'] . '}'; $colors = helper::colorVariants($this->getData(['admin','backgroundColorButtonRed'])); $css .= '.button.buttonRed {background: ' . $colors['normal'] . ';}.button.buttonRed:hover {background:' . $colors['darken'] . '}.button.buttonRed:active {background:' . $colors['veryDarken'] . '}'; - $colors = helper::colorVariants($this->getData(['admin','backgroundColorButtonRed'])); - $css .= '.button.buttonRed {background: ' . $colors['normal'] . ';}.button.buttonRed:hover {background:' . $colors['darken'] . '}.button.buttonRed:active {background:' . $colors['veryDarken'] . '}'; $colors = helper::colorVariants($this->getData(['admin','backgroundColorButtonGreen'])); $css .= 'button[type=submit] {background-color: ' . $colors['normal']. ';color: ' . $this->getData(['admin','colorButtonText']) . '}button[type=submit]:hover {background-color: ' . $colors['darken'] . ';}'; + $colors = helper::colorVariants($this->getData(['admin','backgroundBlockColor'])); + $css .= '.block {border: 1px solid ' . $this->getData(['admin','borderBlockColor']) . ';}.block h4 {background: ' . $colors['normal'] . ';color:' . $colors['text']. ';}'; // Enregistre la personnalisation file_put_contents(self::DATA_DIR.'admin.css', $css); } diff --git a/core/module/install/ressource/defaultdata.php b/core/module/install/ressource/defaultdata.php index ddbd2e20..75be736a 100755 --- a/core/module/install/ressource/defaultdata.php +++ b/core/module/install/ressource/defaultdata.php @@ -163,7 +163,7 @@ class init extends common { ], 'admin' => [ 'backgroundColor' => 'rgba(255, 255, 255, 1)', - 'font' => 'open+Sans', + 'fontText' => 'open+Sans', 'fontSize' => '13px', 'fontTitle' => 'Oswald', 'colorText' => 'rgba(33, 34, 35, 1)', @@ -172,7 +172,9 @@ class init extends common { 'backgroundColorButton' => 'rgba(44, 79, 110, 1)', 'backgroundColorButtonGrey' => 'rgba(236, 239, 241, 1)', 'backgroundColorButtonRed' => 'rgba(231, 76, 60, 1)', - 'backgroundColorButtonGreen' => 'rgba(57, 112, 12, 1)' + 'backgroundColorButtonGreen' => 'rgba(57, 112, 12, 1)', + 'backgroundBlockColor' => 'rgba(236, 239, 241, 1)', + 'borderBlockColor' => 'rgba(236, 239, 241, 1)', ], ]; diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php index 0449d57e..32cd0607 100755 --- a/core/module/theme/theme.php +++ b/core/module/theme/theme.php @@ -247,17 +247,19 @@ class theme extends common { // Soumission du formulaire if($this->isPost()) { $this->setData(['admin', [ - 'backgroundColor' => $this->getInput('themeAdminBackgroundColor'), - 'colorTitle' => $this->getInput('themeAdmincolorTitle'), - 'colorText' => $this->getInput('themeAdmincolorText'), - 'colorButtonText' => $this->getInput('themeAdmincolorButtonText'), - 'backgroundColorButton' => $this->getInput('themeAdmincolorButton'), - 'backgroundColorButtonGrey' => $this->getInput('themeAdmincolorGrey'), - 'backgroundColorButtonRed' => $this->getInput('themeAdmincolorRed'), - 'backgroundColorButtonGreen'=> $this->getInput('themeAdmincolorGreen'), - 'font' => $this->getInput('themeFont'), - 'fontSize' => $this->getInput('themeTextFontSize'), - 'fontTitle' => $this->getInput('themeFontTitle') + 'backgroundColor' => $this->getInput('adminBackgroundColor'), + 'colorTitle' => $this->getInput('adminColorTitle'), + 'colorText' => $this->getInput('adminColorText'), + 'colorButtonText' => $this->getInput('adminColorButtonText'), + 'backgroundColorButton' => $this->getInput('adminColorButton'), + 'backgroundColorButtonGrey' => $this->getInput('adminColorGrey'), + 'backgroundColorButtonRed' => $this->getInput('adminColorRed'), + 'backgroundColorButtonGreen'=> $this->getInput('adminColorGreen'), + 'fontText' => $this->getInput('adminFontText'), + 'fontSize' => $this->getInput('adminFontTextSize'), + 'fontTitle' => $this->getInput('adminFontTitle'), + 'backgroundBlockColor' => $this->getInput('adminBackGroundBlockColor'), + 'borderBlockColor' => $this->getInput('adminBorderBlockColor'), ]]); // Valeurs en sortie $this->addOutput([ @@ -540,7 +542,8 @@ class theme extends common { */ public function resetAdmin() { // Supprime le fichier de personnalisation avancée - unlink(self::DATA_DIR.'admin.json'); + //unlink(self::DATA_DIR.'admin.json'); + $this->initData('admin'); // Valeurs en sortie $this->addOutput([ 'notification' => 'Thème réinitialisé', diff --git a/core/module/theme/view/admin/admin.css b/core/module/theme/view/admin/admin.css index bfeedf7c..a7f42f05 100755 --- a/core/module/theme/view/admin/admin.css +++ b/core/module/theme/view/admin/admin.css @@ -13,4 +13,4 @@ */ /* Thème administration */ -@import url("site/data/admin.css"); \ No newline at end of file +@import url("site/data/admin.css"); diff --git a/core/module/theme/view/admin/admin.js.php b/core/module/theme/view/admin/admin.js.php new file mode 100644 index 00000000..2818bf39 --- /dev/null +++ b/core/module/theme/view/admin/admin.js.php @@ -0,0 +1,47 @@ +/** + * 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 Fred Tempez + * @copyright Copyright (C) 2008-2018, Rémi Jean + * @license GNU General Public License, version 3 + * @link http://zwiicms.com/ + */ + + /** + * Aperçu en direct + */ +$("input, select").on("change", function() { + + var titleFont = $("#adminFontTitle").val(); + var textFont = $("#adminFontText").val(); + var css = "@import url('https://fonts.googleapis.com/css?family=" + titleFont + "|" + textFont + "');"; + + var css = "#site{background-color:" + $("#adminBackgroundColor").val() + ";}"; + css += "body, .row > div {font:" + $("#adminFontTextSize").val() + " '" + textFont + "', sans-serif;}"; + css += "body h1, h2, h3, h4, h5, h6 {font-family:'" + titleFont + "', sans-serif; color:" + $("#adminColorTitle").val() + ";}"; + css += "body:not(.editorWysiwyg),.block h4,input[type=email],input[type=text],input[type=password],.inputFile,select,textarea:not(.editorWysiwyg),.inputFile,span .zwiico-help,.button.buttonGrey {color:" + $("#adminColorText").val() + ";}"; + var colors = core.colorVariants($("#adminColorButton").val()); + css += ".button,input[type='checkbox']:checked + label::before,.speechBubble{ background-color:" + colors.normal + "; color:" + $("#adminColorButtonText").val() + ";}"; + css += ".speechBubble::before {border-color:" + colors.normal + " transparent transparent transparent;}"; + css += ".button:hover, button[type=submit]:hover { background-color:" + colors.darken + ";}"; + var colors = core.colorVariants($("#adminColorGrey").val()); + css += ".button.buttonGrey {background: " + colors.normal + ";}.button.buttonGrey:hover {background:" + colors.darken + "}.button.buttonGrey:active {background:" + colors.veryDarken + "}"; + var colors = core.colorVariants($("#adminColorRed").val()); + css += ".button.buttonRed {background: " + colors.normal + ";}.button.buttonRed:hover {background:" + colors.darken + "}.button.buttonRed:active {background:" + colors.veryDarken + "}"; + var colors = core.colorVariants($("#adminColorGreen").val()); + css += "button[type=submit] {background-color: " + colors.normal + ";color: " + $("#adminColorButtonText").val() + "}button[type=submit]:hover {background-color: " + colors.darken + ";}"; + var colors = core.colorVariants($("#adminBackGroundBlockColor").val()); + css += ".block {border: 1px solid " + $("#adminBorderBlockColor").val() + ";}.block h4 {background: " + colors.normal + ";color:" + colors.text + ";}"; + + // Ajout du css au DOM + $("#themePreview").remove(); + $("