Merge branch 'master' into dev10

This commit is contained in:
Fred Tempez 2020-03-16 10:21:27 +01:00
commit d8eb134eba
21 changed files with 575 additions and 49 deletions

View File

@ -1202,6 +1202,7 @@ class core extends common {
$css .= $this->getData(['theme', 'site', 'width']) === '100%' ? '#site{margin:0 auto !important;} body{margin:0 auto !important;} #bar{margin:0 auto !important;} body > header{margin:0 auto !important;} body > nav {margin: 0 auto !important;} body > footer {margin:0 auto !important;}': '';
$css .= $this->getData(['theme', 'site', 'width']) === '750px' ? '.button, button{font-size:0.8em;}' : '';
$css .= '#site{background-color:' . $this->getData(['theme', 'site', 'backgroundColor']) . ';border-radius:' . $this->getData(['theme', 'site', 'radius']) . ';box-shadow:' . $this->getData(['theme', 'site', 'shadow']) . ' #212223;}';
$css .= '.editorWysiwyg {background-color:' . $this->getData(['theme', 'site', 'backgroundColor']) . ';}';
$colors = helper::colorVariants($this->getData(['theme', 'button', 'backgroundColor']));
$css .= '.speechBubble,.button,.button:hover,button[type=\'submit\'],.pagination a,.pagination a:hover,input[type=\'checkbox\']:checked + label:before,input[type=\'radio\']:checked + label:before,.helpContent{background-color:' . $colors['normal'] . ';color:' . $colors['text'] . '}';
$css .= '.helpButton span{color:' . $colors['normal'] . '}';

View File

@ -8,6 +8,8 @@
*
* @author Rémi Jean <remi.jean@outlook.com>
* @copyright Copyright (C) 2008-2018, Rémi Jean
* @author Frédéric Tempez <frederic.tempez@outlook.com>
* @copyright Copyright (C) 2018-2020, Frédéric Tempez
* @license GNU General Public License, version 3
* @link http://zwiicms.com/
*/

View File

@ -0,0 +1,32 @@
/**
* 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 <remi.jean@outlook.com>
* @copyright Copyright (C) 2008-2018, Rémi Jean
* @author Frédéric Tempez <frederic.tempez@outlook.com>
* @copyright Copyright (C) 2018-2020, Frédéric Tempez
* @license GNU General Public License, version 3
* @link http://zwiicms.com/
*/
#site {
background-color: rgba(255, 255, 255, 1);
}
body,
.block h4,
input[type="email"],
input[type="text"],
input[type="password"],
.inputFile,
select,
textarea,
.inputFile,
.button.buttonGrey,
.button.buttonGrey:hover {
color: rgba(33, 34, 35, 1);
}

View File

@ -0,0 +1,32 @@
/**
* 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 <remi.jean@outlook.com>
* @copyright Copyright (C) 2008-2018, Rémi Jean
* @author Frédéric Tempez <frederic.tempez@outlook.com>
* @copyright Copyright (C) 2018-2020, Frédéric Tempez
* @license GNU General Public License, version 3
* @link http://zwiicms.com/
*/
#site {
background-color: rgba(255, 255, 255, 1);
}
body,
.block h4,
input[type="email"],
input[type="text"],
input[type="password"],
.inputFile,
select,
textarea,
.inputFile,
.button.buttonGrey,
.button.buttonGrey:hover {
color: rgba(33, 34, 35, 1);
}

View File

@ -0,0 +1,32 @@
/**
* 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 <remi.jean@outlook.com>
* @copyright Copyright (C) 2008-2018, Rémi Jean
* @author Frédéric Tempez <frederic.tempez@outlook.com>
* @copyright Copyright (C) 2018-2020, Frédéric Tempez
* @license GNU General Public License, version 3
* @link http://zwiicms.com/
*/
#site {
background-color: rgba(255, 255, 255, 1);
}
body,
.block h4,
input[type="email"],
input[type="text"],
input[type="password"],
.inputFile,
select,
textarea,
.inputFile,
.button.buttonGrey,
.button.buttonGrey:hover {
color: rgba(33, 34, 35, 1);
}

View File

@ -0,0 +1,32 @@
/**
* 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 <remi.jean@outlook.com>
* @copyright Copyright (C) 2008-2018, Rémi Jean
* @author Frédéric Tempez <frederic.tempez@outlook.com>
* @copyright Copyright (C) 2018-2020, Frédéric Tempez
* @license GNU General Public License, version 3
* @link http://zwiicms.com/
*/
#site {
background-color: rgba(255, 255, 255, 1);
}
body,
.block h4,
input[type="email"],
input[type="text"],
input[type="password"],
.inputFile,
select,
textarea,
.inputFile,
.button.buttonGrey,
.button.buttonGrey:hover {
color: rgba(33, 34, 35, 1);
}

View File

@ -14,3 +14,22 @@
#backToTop {
display: block;
}
#site {
background-color: rgba(255, 255, 255, 1);
}
body,
.block h4,
input[type="email"],
input[type="text"],
input[type="password"],
.inputFile,
select,
textarea,
.inputFile,
.button.buttonGrey,
.button.buttonGrey:hover {
color: rgba(33, 34, 35, 1);
}

View File

@ -0,0 +1,32 @@
/**
* 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 <remi.jean@outlook.com>
* @copyright Copyright (C) 2008-2018, Rémi Jean
* @author Frédéric Tempez <frederic.tempez@outlook.com>
* @copyright Copyright (C) 2018-2020, Frédéric Tempez
* @license GNU General Public License, version 3
* @link http://zwiicms.com/
*/
#site {
background-color: rgba(255, 255, 255, 1);
}
body,
.block h4,
input[type="email"],
input[type="text"],
input[type="password"],
.inputFile,
select,
textarea,
.inputFile,
.button.buttonGrey,
.button.buttonGrey:hover {
color: rgba(33, 34, 35, 1);
}

View File

@ -22,8 +22,10 @@ $("input, select").on("change", function() {
// Couleurs du pied de page
var colors = core.colorVariants($("#themeFooterBackgroundColor").val());
var textColor = $("#themeFooterTextColor").val();
var css = "footer{background-color:" + colors.normal + ";color:" + textColor + "}";
var css = "footer {background-color:" + colors.normal + ";color:" + textColor + "}";
css += "footer a{color:" + textColor + "}";
// Couleur de l'éditeur
css += ".editorWysiwyg{background-color:" + colors.normal + " !important; color:" + textColor + " !important;}";
// Hauteur du pied de page
//css += "#footersiteLeft, #footersiteCenter, #footersiteRight, #footerbodyLeft, #footerbodyCenter, #footerbodyRight {margin:" + $("#themeFooterHeight").val() + " 0}";
css += "footer #footersite > div{margin:" + $("#themeFooterHeight").val() + " 0}";

View File

@ -0,0 +1,32 @@
/**
* 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 <remi.jean@outlook.com>
* @copyright Copyright (C) 2008-2018, Rémi Jean
* @author Frédéric Tempez <frederic.tempez@outlook.com>
* @copyright Copyright (C) 2018-2020, Frédéric Tempez
* @license GNU General Public License, version 3
* @link http://zwiicms.com/
*/
#site {
background-color: rgba(255, 255, 255, 1);
}
body,
.block h4,
input[type="email"],
input[type="text"],
input[type="password"],
.inputFile,
select,
textarea,
.inputFile,
.button.buttonGrey,
.button.buttonGrey:hover {
color: rgba(33, 34, 35, 1);
}

View File

@ -54,3 +54,24 @@ nav li ul {
#themeOverlayBody {
position: fixed; /* Sinon l'overlay s'arrête à la hauteur de la fenêtre et non de la page*/
}
/* Contrastes */
#site {
background-color: rgba(255, 255, 255, 1);
}
body,
.block h4,
input[type="email"],
input[type="text"],
input[type="password"],
.inputFile,
select,
textarea,
.inputFile,
.button.buttonGrey,
.button.buttonGrey:hover {
color: rgba(33, 34, 35, 1);
}

View File

@ -0,0 +1,32 @@
/**
* 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 <remi.jean@outlook.com>
* @copyright Copyright (C) 2008-2018, Rémi Jean
* @author Frédéric Tempez <frederic.tempez@outlook.com>
* @copyright Copyright (C) 2018-2020, Frédéric Tempez
* @license GNU General Public License, version 3
* @link http://zwiicms.com/
*/
#site {
background-color: rgba(255, 255, 255, 1);
}
body,
.block h4,
input[type="email"],
input[type="text"],
input[type="password"],
.inputFile,
select,
textarea,
.inputFile,
.button.buttonGrey,
.button.buttonGrey:hover {
color: rgba(33, 34, 35, 1);
}

View File

@ -0,0 +1,32 @@
/**
* 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 <remi.jean@outlook.com>
* @copyright Copyright (C) 2008-2018, Rémi Jean
* @author Frédéric Tempez <frederic.tempez@outlook.com>
* @copyright Copyright (C) 2018-2020, Frédéric Tempez
* @license GNU General Public License, version 3
* @link http://zwiicms.com/
*/
#site {
background-color: rgba(255, 255, 255, 1);
}
body,
.block h4,
input[type="email"],
input[type="text"],
input[type="password"],
.inputFile,
select,
textarea,
.inputFile,
.button.buttonGrey,
.button.buttonGrey:hover {
color: rgba(33, 34, 35, 1);
}

View File

@ -0,0 +1,39 @@
/**
* 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 <remi.jean@outlook.com>
* @copyright Copyright (C) 2008-2018, Rémi Jean
* @author Frédéric Tempez <frederic.tempez@outlook.com>
* @copyright Copyright (C) 2018-2020, Frédéric Tempez
* @license GNU General Public License, version 3
* @link http://zwiicms.com/
*/
#site {
background-color: rgba(255, 255, 255, 1);
}
body,
.block h4,
input[type="email"],
input[type="text"],
input[type="password"],
.inputFile,
select,
textarea,
.inputFile,
.button.buttonGrey,
.button.buttonGrey:hover {
color: rgba(33, 34, 35, 1);
}
div.preview {
border-radius: 2%;
-webkit-box-shadow: 5px 5px 5px 2px rgba(0,0,0,0.75);
-moz-box-shadow: 5px 5px 5px 2px rgba(0,0,0,0.75);
box-shadow: 5px 5px 5px 2px rgba(0,0,0,0.75);
}

View File

@ -10,6 +10,37 @@
* @link http://zwiicms.com/
*/
/*
* Chargement de l'aperçu
*/
$( document ).ready(function() {
// Import des polices de caractères
var titleFont = $("#themeTitleFont").val();
var textFont = $("#themeTextFont").val();
var css = "@import url('https://fonts.googleapis.com/css?family=" + titleFont + "|" + textFont + "');";
var colors = core.colorVariants($("#themeButtonBackgroundColor").val());
css += "h1.preview,h3.preview{color:" + $("#themeTitleTextColor").val() + ";font-family:'" + titleFont.replace(/\+/g, " ") + "',sans-serif;font-weight:" + $("#themeTitleFontWeight").val() + ";text-transform:" + $("#themeTitleTextTransform").val() + "}";
css += "p.preview{color:" + $("#themeTextTextColor").val() + "}";
css += "div.preview{background-color:" + $("#themeSiteBackgroundColor").val() + ";}";
// Couleurs des liens
colors = core.colorVariants($("#themeLinkTextColor").val());
css += "a.preview{color:" + colors.normal + "}";
css += "a.preview:hover{color:" + colors.darken + "}";
// Paramètrage du DOM
$("#themePreview").remove();
$("<style>")
.attr("type", "text/css")
.attr("id", "themePreview")
.text(css)
.appendTo("head");
});
/**
* Aperçu en direct
*/
@ -22,7 +53,7 @@ $("input, select").on("change", function() {
var colors = core.colorVariants($("#themeButtonBackgroundColor").val());
css += ".speechBubble,.button,.button:hover,button[type='submit'],.pagination a,.pagination a:hover,input[type='checkbox']:checked + label:before,.helpContent{background-color:" + colors.normal + ";color:" + colors.text + "}";
css += ".helpButton span{color:" + colors.normal + "}";
css += "input[type='text']:hover,input[type='password']:hover,.inputFile:hover,select:hover,textarea:hover{border-color:" + colors.normal + "}";
//css += "input[type='text']:hover,input[type='password']:hover,.inputFile:hover,select:hover,textarea:hover{border-color:" + colors.normal + "}";
css += ".speechBubble:before{border-color:" + colors.normal + " transparent transparent transparent}";
css += ".button:hover,button[type='submit']:hover,.pagination a:hover,input[type='checkbox']:not(:active):checked:hover + label:before,input[type='checkbox']:active + label:before{background-color:" + colors.darken + "}";
css += ".helpButton span:hover{color:" + colors.darken + "}";
@ -34,16 +65,20 @@ $("input, select").on("change", function() {
}
// Couleurs des liens
colors = core.colorVariants($("#themeLinkTextColor").val());
css += "a{color:" + colors.normal + "}";
css += "a:hover{color:" + colors.darken + "}";
//css += "a{color:" + colors.normal + "}";
//css += "a:hover{color:" + colors.darken + "}";
css += "a.preview{color:" + colors.normal + "}";
css += "a.preview:hover{color:" + colors.darken + "}";
// Couleur, polices, épaisseur et capitalisation de caractères des titres
css += "h1,h2,h3,h4,h5,h6{color:" + $("#themeTitleTextColor").val() + ";font-family:'" + titleFont.replace(/\+/g, " ") + "',sans-serif;font-weight:" + $("#themeTitleFontWeight").val() + ";text-transform:" + $("#themeTitleTextTransform").val() + "}";
//css += "h1,h2,h3,h4,h5,h6{color:" + $("#themeTitleTextColor").val() + ";font-family:'" + titleFont.replace(/\+/g, " ") + "',sans-serif;font-weight:" + $("#themeTitleFontWeight").val() + ";text-transform:" + $("#themeTitleTextTransform").val() + "}";
css += "h1.preview,h3.preview{color:" + $("#themeTitleTextColor").val() + ";font-family:'" + titleFont.replace(/\+/g, " ") + "',sans-serif;font-weight:" + $("#themeTitleFontWeight").val() + ";text-transform:" + $("#themeTitleTextTransform").val() + "}";
// Police de caractères
css += "body{font-family:'" + textFont.replace(/\+/g, " ") + "',sans-serif}";
// Taille du texte
css += "body,.row > div{font-size:" + $("#themeTextFontSize").val() + "}";
// Couleur du texte
css += "body,.block h4,input[type='email'],input[type='text'],input[type='password'],.inputFile,select,textarea,.inputFile,.button.buttonGrey,.button.buttonGrey:hover{color:" + $("#themeTextTextColor").val() + "}";
//css += "body,.block h4,input[type='email'],input[type='text'],input[type='password'],.inputFile,select,textarea,.inputFile,.button.buttonGrey,.button.buttonGrey:hover{color:" + $("#themeTextTextColor").val() + "}";
css += "p.preview{color:" + $("#themeTextTextColor").val() + "}";
// Largeur du site
css += ".container{max-width:" + $("#themeSiteWidth").val() + "}";
if ($("#themeSiteWidth").val() === "100%") {
@ -53,7 +88,9 @@ $("input, select").on("change", function() {
}
// Couleur du site, arrondi sur les coins du site et ombre sur les bords du site
css += "#site{background-color:" + $("#themeSiteBackgroundColor").val() + ";border-radius:" + $("#themeSiteRadius").val() + ";box-shadow:" + $("#themeSiteShadow").val() + " #212223}";
//css += "#site{background-color:" + $("#themeSiteBackgroundColor").val() + ";border-radius:" + $("#themeSiteRadius").val() + ";box-shadow:" + $("#themeSiteShadow").val() + " #212223}";
css += "#site{border-radius:" + $("#themeSiteRadius").val() + ";box-shadow:" + $("#themeSiteShadow").val() + " #212223}";
css += "div.preview{background-color:" + $("#themeSiteBackgroundColor").val() + ";}";
// Ajout du css au DOM
$("#themePreview").remove();
$("<style>")

View File

@ -17,7 +17,9 @@
<div class="block">
<h4>Couleurs</h4>
<div class="row">
<div class="col4">
<div class="col8">
<div class="row">
<div class="col6">
<?php echo template::text('themeSiteBackgroundColor', [
'class' => 'colorPicker',
'help' => 'Le curseur horizontal règle le niveau de transparence.',
@ -25,7 +27,7 @@
'value' => $this->getData(['theme', 'site', 'backgroundColor'])
]); ?>
</div>
<div class="col4">
<div class="col6">
<?php echo template::text('themeTextTextColor', [
'class' => 'colorPicker',
'help' => 'Le curseur horizontal règle le niveau de transparence.',
@ -33,7 +35,17 @@
'value' => $this->getData(['theme', 'text', 'textColor'])
]); ?>
</div>
<div class="col4">
</div>
<div class="row">
<div class="col6">
<?php echo template::text('themeTitleTextColor', [
'class' => 'colorPicker',
'help' => 'Le curseur horizontal règle le niveau de transparence.',
'label' => 'Titres',
'value' => $this->getData(['theme', 'title', 'textColor'])
]); ?>
</div>
<div class="col6">
<?php echo template::text('themeLinkTextColor', [
'class' => 'colorPicker',
'help' => 'Le curseur horizontal règle le niveau de transparence.',
@ -42,16 +54,7 @@
]); ?>
</div>
</div>
<div class="row">
<div class="col4">
<?php echo template::text('themeTitleTextColor', [
'class' => 'colorPicker',
'help' => 'Le curseur horizontal règle le niveau de transparence.',
'label' => 'Titres',
'value' => $this->getData(['theme', 'title', 'textColor'])
]); ?>
</div>
<div class="col4 offset4">
<div class="col6 offset3">
<?php echo template::text('themeButtonBackgroundColor', [
'class' => 'colorPicker',
'help' => 'Le curseur horizontal règle le niveau de transparence.',
@ -60,6 +63,23 @@
]); ?>
</div>
</div>
<div class="col4 preview">
<h1 class="preview">Aperçu</h1>
<div class="row">
<div class="col8">
<h3 class="preview">Titre 3 </h3>
<p class="preview">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
</div>
<div class="col4">
<p><a href="#" class="preview">Hyperlien</a></p>
<?php echo template::button('themeSiteTest', [
'class' => 'buttonPreview',
'value' => 'Test'
]); ?>
</div>
</div>
</div>
</div>
</div>
</div>
</div>

View File

@ -0,0 +1,32 @@
/**
* 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 <remi.jean@outlook.com>
* @copyright Copyright (C) 2008-2018, Rémi Jean
* @author Frédéric Tempez <frederic.tempez@outlook.com>
* @copyright Copyright (C) 2018-2020, Frédéric Tempez
* @license GNU General Public License, version 3
* @link http://zwiicms.com/
*/
#site {
background-color: rgba(255, 255, 255, 1);
}
body,
.block h4,
input[type="email"],
input[type="text"],
input[type="password"],
.inputFile,
select,
textarea,
.inputFile,
.button.buttonGrey,
.button.buttonGrey:hover {
color: rgba(33, 34, 35, 1);
}

View File

@ -0,0 +1,32 @@
/**
* 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 <remi.jean@outlook.com>
* @copyright Copyright (C) 2008-2018, Rémi Jean
* @author Frédéric Tempez <frederic.tempez@outlook.com>
* @copyright Copyright (C) 2018-2020, Frédéric Tempez
* @license GNU General Public License, version 3
* @link http://zwiicms.com/
*/
#site {
background-color: rgba(255, 255, 255, 1);
}
body,
.block h4,
input[type="email"],
input[type="text"],
input[type="password"],
.inputFile,
select,
textarea,
.inputFile,
.button.buttonGrey,
.button.buttonGrey:hover {
color: rgba(33, 34, 35, 1);
}

View File

@ -0,0 +1,32 @@
/**
* 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 <remi.jean@outlook.com>
* @copyright Copyright (C) 2008-2018, Rémi Jean
* @author Frédéric Tempez <frederic.tempez@outlook.com>
* @copyright Copyright (C) 2018-2020, Frédéric Tempez
* @license GNU General Public License, version 3
* @link http://zwiicms.com/
*/
#site {
background-color: rgba(255, 255, 255, 1);
}
body,
.block h4,
input[type="email"],
input[type="text"],
input[type="password"],
.inputFile,
select,
textarea,
.inputFile,
.button.buttonGrey,
.button.buttonGrey:hover {
color: rgba(33, 34, 35, 1);
}

View File

@ -0,0 +1,32 @@
/**
* 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 <remi.jean@outlook.com>
* @copyright Copyright (C) 2008-2018, Rémi Jean
* @author Frédéric Tempez <frederic.tempez@outlook.com>
* @copyright Copyright (C) 2018-2020, Frédéric Tempez
* @license GNU General Public License, version 3
* @link http://zwiicms.com/
*/
#site {
background-color: rgba(255, 255, 255, 1);
}
body,
.block h4,
input[type="email"],
input[type="text"],
input[type="password"],
.inputFile,
select,
textarea,
.inputFile,
.button.buttonGrey,
.button.buttonGrey:hover {
color: rgba(33, 34, 35, 1);
}

View File

@ -5,8 +5,9 @@
/* Fix les problèmes de couleurs et de taille de police */
.editorWysiwyg {
font-size: 14px !important;
background: #FFF !important;
}
/* Désactive le responsive des cols sinon les cols passent les uns en dessous des autres car la largeur de l'iframe est < au media query utilisé pour le responsive */
.col1 {
width: 8.33333333%;