ZwiiCMS-Team/ZwiiCMS
ZwiiCMS-Team
/
ZwiiCMS
3
3
Fork 2
Code Releases 143 Activity

Merge branch 'master' into dev10

This commit is contained in:
Fred Tempez 2020-03-21 18:09:59 +01:00
parent 111263ba91 d5065cde88
commit 7e6cffd19a
39 changed files with 365 additions and 496 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/core.php
View File

@ -1197,7 +1197,8 @@ class core extends common {
$css .= 'a{color:' . $colors['normal'] . '}'; $css .= 'a{color:' . $colors['normal'] . '}';
$css .= 'a:hover{color:' . $colors['darken'] . '}'; $css .= 'a:hover{color:' . $colors['darken'] . '}';
$css .= 'body,.row > div{font-size:' . $this->getData(['theme', 'text', 'fontSize']) . '}'; $css .= 'body,.row > div{font-size:' . $this->getData(['theme', 'text', 'fontSize']) . '}';
$css .= 'body,.block h4,input[type=\'email\'],input[type=\'text\'],input[type=\'password\'],.inputFile,select,textarea,.inputFile,.button.buttonGrey,.button.buttonGrey:hover{color:' . $this->getData(['theme', 'text', 'textColor']) . '}'; $css .= 'body,.block h4,input[type=\'email\'],input[type=\'text\'],input[type=\'password\'],.inputFile,select,textarea,.inputFile{color:' . $this->getData(['theme', 'text', 'textColor']) . '}';
$css .= '.button.buttonGrey,.button.buttonGrey:hover{color:' . $this->getData(['theme', 'text', 'textColor']) . '}';
$css .= '.container{max-width:' . $this->getData(['theme', 'site', 'width']) . '}'; $css .= '.container{max-width:' . $this->getData(['theme', 'site', 'width']) . '}';
$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']) === '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 .= $this->getData(['theme', 'site', 'width']) === '750px' ? '.button, button{font-size:0.8em;}' : '';
@ -1210,7 +1211,7 @@ class core extends common {
$css .= '.speechBubble:before{border-color:' . $colors['normal'] . ' transparent transparent transparent}'; $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,input[type=\'radio\']:checked:hover + label:before,input[type=\'radio\']:not(:checked):active + label:before{background-color:' . $colors['darken'] . '}'; $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,input[type=\'radio\']:checked:hover + label:before,input[type=\'radio\']:not(:checked):active + label:before{background-color:' . $colors['darken'] . '}';
$css .= '.helpButton span:hover{color:' . $colors['darken'] . '}'; $css .= '.helpButton span:hover{color:' . $colors['darken'] . '}';
$css .= '.button:active,button[type=\'submit\']:active,.pagination a:active{background-color:' . $colors['veryDarken'] . '}'; $css .= '.button:active,button[type=\'submit\']:active,.pagination a:active{background-color:' . $colors['veryDarken'] . '}';
$colors = helper::colorVariants($this->getData(['theme', 'title', 'textColor'])); $colors = helper::colorVariants($this->getData(['theme', 'title', 'textColor']));
$css .= 'h1,h2,h3,h4,h5,h6{color:' . $colors['normal'] . ';font-family:"' . str_replace('+', ' ', $this->getData(['theme', 'title', 'font'])) . '",sans-serif;font-weight:' . $this->getData(['theme', 'title', 'fontWeight']) . ';text-transform:' . $this->getData(['theme', 'title', 'textTransform']) . '}'; $css .= 'h1,h2,h3,h4,h5,h6{color:' . $colors['normal'] . ';font-family:"' . str_replace('+', ' ', $this->getData(['theme', 'title', 'font'])) . '",sans-serif;font-weight:' . $this->getData(['theme', 'title', 'fontWeight']) . ';text-transform:' . $this->getData(['theme', 'title', 'textTransform']) . '}';
// Bannière // Bannière

56
core/layout/admin.css Normal file
View File

@ -0,0 +1,56 @@
/**
* 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:not(.editorWysiwyg),
.block h4,
input[type=email],
input[type=text],
input[type=password],
.inputFile,
select,
textarea,
.inputFile,
span .zwiico-help {
color: rgba(33, 34, 35, 1);
}
.button,
button[type=submit],
.button:hover,
button[type=submit]:hover,
input[type="checkbox"]:checked + label::before,
.speechBubble {
background-color: rgba(32, 59, 82, 1);
color: white;
}
.speechBubble::before {
border-color: rgba(32, 59, 82, 1) transparent transparent transparent;
}
body, .row > div {
font: "Open+Sans", sans-serif;
font-size: 13px;
}
body h1, h2, h3, h4, h5, h6 {
font-family: "Oswald";
color: rgba(74, 105, 189, 1);
}

27
core/module/config/view/index/index.css
View File

@ -11,29 +11,4 @@
* @license GNU General Public License, version 3 * @license GNU General Public License, version 3
* @link http://zwiicms.com/ * @link http://zwiicms.com/
*/ */
@import url("core/layout/admin.css");
#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);
}
body {
font-family: "Open+Sans";
}
body h1, h2, h3, h4, h5, h6 {
font-family: "Oswald";
color: rgba(74, 105, 189, 1);
}

17
core/module/install/view/update/update.css
View File

@ -13,20 +13,5 @@
*/ */
#site {
background-color: rgba(255, 255, 255, 1);
}
body, @import url("core/layout/admin.css");
.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);
}

25
core/module/page/view/edit/edit.css
View File

@ -13,27 +13,4 @@
*/ */
#site { @import url("core/layout/admin.css");
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);
}
body {
font-family: "Open+Sans";
}
body h1, h2, h3, h4, h5, h6 {
font-family: "Oswald";
color: rgba(74, 105, 189, 1);
}

27
core/module/theme/view/advanced/advanced.css
View File

@ -12,28 +12,5 @@
* @link http://zwiicms.com/ * @link http://zwiicms.com/
*/ */
/* Thème administration */
#site { @import url("core/layout/admin.css");
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);
}
body {
font-family: "Open+Sans";
}
body h1, h2, h3, h4, h5, h6 {
font-family: "Oswald";
color: rgba(74, 105, 189, 1);
}

27
core/module/theme/view/body/body.css
View File

@ -11,32 +11,9 @@
* @link http://zwiicms.com/ * @link http://zwiicms.com/
*/ */
@import url("core/layout/admin.css");
#backToTop { #backToTop {
display: block; 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);
}
body {
font-family: "Open+Sans";
}
body h1, h2, h3, h4, h5, h6 {
font-family: "Oswald";
color: rgba(74, 105, 189, 1);
}

27
core/module/theme/view/footer/footer.css
View File

@ -12,28 +12,5 @@
* @link http://zwiicms.com/ * @link http://zwiicms.com/
*/ */
/* Thème administration */
#site { @import url("core/layout/admin.css");
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);
}
body {
font-family: "Open+Sans";
}
body h1, h2, h3, h4, h5, h6 {
font-family: "Oswald";
color: rgba(74, 105, 189, 1);
}

26
core/module/theme/view/header/header.css
View File

@ -12,28 +12,4 @@
* @link http://zwiicms.com/ * @link http://zwiicms.com/
*/ */
@import url("core/layout/admin.css");
#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);
}
body {
font-family: "Open+Sans";
}
body h1, h2, h3, h4, h5, h6 {
font-family: "Oswald";
color: rgba(74, 105, 189, 1);
}

32
core/module/theme/view/index/index.css
View File

@ -10,6 +10,10 @@
* @link http://zwiicms.com/ * @link http://zwiicms.com/
*/ */
/* Thème administration */
@import url("core/layout/admin.css");
#bar, #bar,
#site, #site,
header, header,
@ -54,31 +58,3 @@ nav li ul {
#themeOverlayBody { #themeOverlayBody {
position: fixed; /* Sinon l'overlay s'arrête à la hauteur de la fenêtre et non de la page*/ 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);
}
body {
font-family: "Open+Sans";
}
body h1, h2, h3, h4, h5, h6 {
font-family: "Oswald";
color: rgba(74, 105, 189, 1);
}

7
core/module/theme/view/index/index.php
View File

@ -15,6 +15,7 @@
</div> </div>
<div class="col2"> <div class="col2">
<?php echo template::button('themeManage', [ <?php echo template::button('themeManage', [
'class' => 'buttonBlue',
'ico' => 'upload', 'ico' => 'upload',
'href' => helper::baseUrl() . $this->getUrl(0) . '/manage', 'href' => helper::baseUrl() . $this->getUrl(0) . '/manage',
'value' => 'Thèmes' 'value' => 'Thèmes'
@ -22,13 +23,15 @@
</div> </div>
<div class="col2"> <div class="col2">
<?php echo template::button('themeAdvanced', [ <?php echo template::button('themeAdvanced', [
'class' => 'buttonBlue',
'ico' => 'code',
'href' => helper::baseUrl() . $this->getUrl(0) . '/advanced', 'href' => helper::baseUrl() . $this->getUrl(0) . '/advanced',
'value' => 'Éditeur CSS', 'value' => 'Éditeur CSS'
'ico' => 'code'
]); ?> ]); ?>
</div> </div>
<div class="col2"> <div class="col2">
<?php echo template::button('themeShowAll', [ <?php echo template::button('themeShowAll', [
'class' => 'buttonBlue',
'ico' => 'eye', 'ico' => 'eye',
'value' => 'Zones cachées' 'value' => 'Zones cachées'
]); ?> ]); ?>

27
core/module/theme/view/manage/manage.css
View File

@ -12,28 +12,5 @@
* @link http://zwiicms.com/ * @link http://zwiicms.com/
*/ */
/* Thème administration */
#site { @import url("core/layout/admin.css");
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);
}
body {
font-family: "Open+Sans";
}
body h1, h2, h3, h4, h5, h6 {
font-family: "Oswald";
color: rgba(74, 105, 189, 1);
}

26
core/module/theme/view/menu/menu.css
View File

@ -12,28 +12,4 @@
* @link http://zwiicms.com/ * @link http://zwiicms.com/
*/ */
@import url("core/layout/admin.css");
#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);
}
body {
font-family: "Open+Sans";
}
body h1, h2, h3, h4, h5, h6 {
font-family: "Oswald";
color: rgba(74, 105, 189, 1);
}

31
core/module/theme/view/site/site.css
View File

@ -13,33 +13,4 @@
*/ */
#site { @import url("core/layout/admin.css");
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);
}
body {
font-family: "Open+Sans",sans-serif;
}
h1, h2, h3, h4, h5, h6 {
font-family: "Oswald";
color: rgba(74, 105, 189, 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);
}

160
core/module/theme/view/site/site.js.php
View File

@ -13,96 +13,80 @@
/* /*
* Chargement de l'aperçu * Chargement de l'aperçu
*/ */
$( document ).ready(function() { $( document).ready(function() {
updateDOM();
// 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());
// Texte
css += "p.preview {color:" + $("#themeTextTextColor").val() + ";font-family:'" + textFont.replace(/\+/g, " ") + "',sans-serif}";
// Titres
css += "h1.preview,h3.preview{color:" + $("#themeTitleTextColor").val() + ";font-family:'" + titleFont.replace(/\+/g, " ") + "',sans-serif;font-weight:" + $("#themeTitleFontWeight").val() + ";text-transform:" + $("#themeTitleTextTransform").val() + "}";
// Fond
css += "div.preview{background-color:" + $("#themeSiteBackgroundColor").val() + ";}";
// Couleurs des liens
colors = core.colorVariants($("#themeLinkTextColor").val());
css += "a.preview,.buttonPreview{color:" + colors.normal + "}";
css += "a.preview:hover,.buttonPreview{color:" + colors.darken + "}";
css += "a.preview,.buttonPreview {font-family:'" + textFont.replace(/\+/g, " ") + "',sans-serif}";
// Paramètrage du DOM
$("#themePreview").remove();
$("<style>")
.attr("type", "text/css")
.attr("id", "themePreview")
.text(css)
.appendTo("head");
}); });
/** /**
* Aperçu en direct * Aperçu en direct
*/ */
$("input, select").on("change", function() { $("input, select").on("change",function() {
// Import des polices de caractères updateDOM();
var titleFont = $("#themeTitleFont").val(); });
var textFont = $("#themeTextFont").val();
var css = "@import url('https://fonts.googleapis.com/css?family=" + titleFont + "|" + textFont + "');";
// Couleurs des boutons function updateDOM() {
var colors = core.colorVariants($("#themeButtonBackgroundColor").val());
css += ".speechBubble,.button,.button:hover,.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 + "}"; * Aperçu dans la boîte
//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 + "}"; // Import des polices de caractères
//css += ".helpButton span:hover{color:" + colors.darken + "}"; var titleFont = $("#themeTitleFont").val();
//css += ".button:active,button[type='submit']:active,.pagination a:active{background-color:" + colors.veryDarken + "}"; var textFont = $("#themeTextFont").val();
if ($("#themeSiteWidth").val() === "750px") { var css = "@import url('https://fonts.googleapis.com/css?family=" + titleFont + "|" + textFont + "');";
css += ".button, button{font-size:0.8em;}"; // Couleurs des boutons
} else { var colors = core.colorVariants($("#themeButtonBackgroundColor").val());
css += ".button, button{font-size:1em;}"; css += ".button.buttonSubmitPreview{background-color:" + colors.normal + ";}";
} css += ".button.buttonSubmitPreview:hover{background-color:" + colors.darken + "}";
// Couleurs des liens // Couleurs des liens
colors = core.colorVariants($("#themeLinkTextColor").val()); colors = core.colorVariants($("#themeLinkTextColor").val());
//css += "a{color:" + colors.normal + "}"; css += "a.urlPreview{color:" + colors.normal + "}";
//css += "a:hover{color:" + colors.darken + "}"; css += "a.urlPreview:hover{color:" + colors.darken + "}";
css += "a.preview,.buttonPreview{color:" + colors.normal + "}"; // Couleur, polices, épaisseur et capitalisation de caractères des titres
css += "a.preview:hover,.buttonPreview{color:" + colors.darken + "}"; css += ".headerPreview,.headerPreview{color:" + $("#themeTitleTextColor").val() + ";font-family:'" + titleFont.replace(/\+/g, " ") + "',sans-serif;font-weight:" + $("#themeTitleFontWeight").val() + ";text-transform:" + $("#themeTitleTextTransform").val() + "}";
// Couleur, polices, épaisseur et capitalisation de caractères des titres // Police de caractères
//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() + "}"; // Police + couleur
css += "h1.preview,h3.preview{color:" + $("#themeTitleTextColor").val() + ";font-family:'" + titleFont.replace(/\+/g, " ") + "',sans-serif;font-weight:" + $("#themeTitleFontWeight").val() + ";text-transform:" + $("#themeTitleTextTransform").val() + "}"; css += ".textPreview,.urlPreview{color:" + $("#themeTextTextColor").val() + ";font-family:'" + textFont.replace(/\+/g, " ") + "',sans-serif; font-size:" + $("#themeTextFontSize").val() + ";}";
// Police de caractères // Couleur des liens
//css += "body{font-family:'" + textFont.replace(/\+/g, " ") + "',sans-serif}"; //css += "a.preview,.buttonSubmitPreview{font-family:'" + textFont.replace(/\+/g, " ") + "',sans-serif}";
// Police + couleur
css += "p.preview{color:" + $("#themeTextTextColor").val() + ";font-family:'" + textFont.replace(/\+/g, " ") + "',sans-serif}"; // Taille du texte
css += "a.preview,.buttonPreview{font-family:'" + textFont.replace(/\+/g, " ") + "',sans-serif}"; // Couleur du texte
// Taille du texte css += "p.preview,.buttonSubmitPreview{color:" + $("#themeTextTextColor").val() + "}";
//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() + "}"; * Aperçu réel
css += "p.preview,.buttonPreview{color:" + $("#themeTextTextColor").val() + "}"; */
// Largeur du site
css += ".container{max-width:" + $("#themeSiteWidth").val() + "}"; // Taille du site
if ($("#themeSiteWidth").val() === "100%") { if ($("#themeSiteWidth").val() === "750px") {
css += "#site{margin:0 auto;} body{margin:0 auto;} #bar{margin:0 auto;} body > header{margin:0 auto;} body > nav {margin: 0 auto;} body > footer {margin:0 auto;}"; css += ".button, button{font-size:0.8em;}";
} else { } else {
css += "#site{margin:20px auto !important;} body{margin:0px 10px;} #bar{margin: 0 -10px;} body > header{margin: 0 -10px;} body > nav {margin: 0 -10px;} body > footer {margin: 0 -10px;} "; css += ".button, button{font-size:1em;}";
}
} // Largeur du site
// Couleur du site, arrondi sur les coins du site et ombre sur les bords du site css += ".container{max-width:" + $("#themeSiteWidth").val() + "}";
//css += "#site{background-color:" + $("#themeSiteBackgroundColor").val() + ";border-radius:" + $("#themeSiteRadius").val() + ";box-shadow:" + $("#themeSiteShadow").val() + " #212223}"; if ($("#themeSiteWidth").val() === "100%") {
css += "#site{border-radius:" + $("#themeSiteRadius").val() + ";box-shadow:" + $("#themeSiteShadow").val() + " #212223}"; css += "#site{margin:0 auto;} body{margin:0 auto;} #bar{margin:0 auto;} body > header{margin:0 auto;} body > nav {margin: 0 auto;} body > footer {margin:0 auto;}";
css += "div.preview{background-color:" + $("#themeSiteBackgroundColor").val() + ";}"; } else {
// Ajout du css au DOM css += "#site{margin:20px auto !important;} body{margin:0px 10px;} #bar{margin: 0 -10px;} body > header{margin: 0 -10px;} body > nav {margin: 0 -10px;} body > footer {margin: 0 -10px;} ";
$("#themePreview").remove();
$("<style>") }
.attr("type", "text/css") // Couleur du site, arrondi sur les coins du site et ombre sur les bords du site
.attr("id", "themePreview") //css += "#site{background-color:" + $("#themeSiteBackgroundColor").val() + ";border-radius:" + $("#themeSiteRadius").val() + ";box-shadow:" + $("#themeSiteShadow").val() + " #212223}";
.text(css) css += "#site{border-radius:" + $("#themeSiteRadius").val() + ";box-shadow:" + $("#themeSiteShadow").val() + " #212223}";
.appendTo("head"); css += "div.bgPreview{background-color:" + $("#themeSiteBackgroundColor").val() + ";}";
});
/**
* Injection dans le DOM
*/
// Ajout du css au DOM
$("#themePreview").remove();
$("<style>")
.attr("type", "text/css")
.attr("id", "themePreview")
.text(css)
.appendTo("head");
}

38
core/module/theme/view/site/site.php
View File

@ -54,27 +54,31 @@
]); ?> ]); ?>
</div> </div>
</div> </div>
<div class="col6 offset3"> <div class="row">
<?php echo template::text('themeButtonBackgroundColor', [ <div class="col6 offset3">
'class' => 'colorPicker', <?php echo template::text('themeButtonBackgroundColor', [
'help' => 'Le curseur horizontal règle le niveau de transparence.', 'class' => 'colorPicker',
'label' => 'Boutons', 'help' => 'Le curseur horizontal règle le niveau de transparence.',
'value' => $this->getData(['theme', 'button', 'backgroundColor']) 'label' => 'Boutons',
]); ?> 'value' => $this->getData(['theme', 'button', 'backgroundColor'])
]); ?>
</div>
</div> </div>
</div> </div>
<div class="col4 preview"> <div class="col4 bgPreview">
<h1>Aperçu</h1>
<div class="row"> <div class="row">
<div class="col8"> <div class="col12">
<h3 class="preview">Titre 3 </h3> <h1 class="headerPreview">Titre </h1>
<p class="preview">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p> <h3 class="headerPreview">Sous-Titre </h3>
<p class="textPreview">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
<p><a href="#" class="urlPreview">Lorem ipsum dolor sit amet.</a></p>
</div> </div>
<div class="col4"> </div>
<p><a href="#" class="preview">Hyperlien</a></p> <div class="row">
<?php echo template::button('themeSiteTest', [ <div class="col4 offset8">
'class' => 'buttonPreview', <?php echo template::button('themeSiteSubmitButtonPreview', [
'value' => 'Test' 'class' => 'buttonSubmitPreview',
'value' => 'Valider'
]); ?> ]); ?>
</div> </div>
</div> </div>

26
core/module/user/view/add/add.css
View File

@ -12,28 +12,4 @@
* @link http://zwiicms.com/ * @link http://zwiicms.com/
*/ */
@import url("core/layout/admin.css");
#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);
}
body {
font-family: "Open+Sans";
}
body h1, h2, h3, h4, h5, h6 {
font-family: "Oswald";
color: rgba(74, 105, 189, 1);
}

25
core/module/user/view/edit/edit.css
View File

@ -13,27 +13,4 @@
*/ */
#site { @import url("core/layout/admin.css");
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);
}
body {
font-family: "Open+Sans";
}
body h1, h2, h3, h4, h5, h6 {
font-family: "Oswald";
color: rgba(74, 105, 189, 1);
}

25
core/module/user/view/index/index.css
View File

@ -13,27 +13,4 @@
*/ */
#site { @import url("core/layout/admin.css");
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);
}
body {
font-family: "Open+Sans";
}
body h1, h2, h3, h4, h5, h6 {
font-family: "Oswald";
color: rgba(74, 105, 189, 1);
}

26
core/module/user/view/reset/reset.css
View File

@ -12,28 +12,4 @@
* @link http://zwiicms.com/ * @link http://zwiicms.com/
*/ */
@import url("core/layout/admin.css");
#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);
}
body {
font-family: "Open+Sans";
}
body h1, h2, h3, h4, h5, h6 {
font-family: "Oswald";
color: rgba(74, 105, 189, 1);
}

4
core/vendor/filemanager/config/config.php vendored
View File

@ -341,7 +341,7 @@ $config = array(
'download_files' => true, // allow download files or just preview 'download_files' => true, // allow download files or just preview
// you can preview these type of files if $preview_text_files is true // you can preview these type of files if $preview_text_files is true
'previewable_text_file_exts' => array( "bsh", "c","css", "cc", "cpp", "cs", "csh", "cyc", "cv", "htm", "html", "java", "js", "m", "mxml", "perl", "pl", "pm", "py", "rb", "sh", "xhtml", "xml","xsl",'txt', 'log','' ), 'previewable_text_file_exts' => array( "bsh", "c","css", "cc", "cpp", "cs", "csh", "cyc", "cv", "htm", "html", "java", "js", "m", "mxml", "perl", "pl", "pm", "py", "rb", "sh", "xhtml", "xml","xsl",'txt', 'log', 'gpx', 'kml', '' ),
// you can edit these type of files if $edit_text_files is true (only text based files) // you can edit these type of files if $edit_text_files is true (only text based files)
// you can create these type of files if $config['create_text_files'] is true (only text based files) // you can create these type of files if $config['create_text_files'] is true (only text based files)
@ -369,7 +369,7 @@ $config = array(
//Allowed extensions (lowercase insert) //Allowed extensions (lowercase insert)
//********************** //**********************
'ext_img' => array( 'jpg', 'jpeg', 'png', 'gif', 'bmp', 'tiff','svg', 'ico' ), //Images 'ext_img' => array( 'jpg', 'jpeg', 'png', 'gif', 'bmp', 'tiff','svg', 'ico' ), //Images
'ext_file' => array( 'doc', 'docx', 'rtf', 'pdf', 'xls', 'xlsx', 'txt', 'csv', 'html', 'xhtml', 'psd', 'sql', 'log', 'fla', 'xml', 'ade', 'adp', 'mdb', 'accdb', 'ppt', 'pptx', 'odt', 'ots', 'ott', 'odb', 'odg', 'otp', 'otg', 'odf', 'ods', 'odp', 'css', 'ai', 'kmz','dwg', 'dxf', 'hpgl', 'plt', 'spl', 'step', 'stp', 'iges', 'igs', 'sat', 'cgm', 'ics', ''), //Files 'ext_file' => array( 'doc', 'docx', 'rtf', 'pdf', 'xls', 'xlsx', 'txt', 'csv', 'html', 'xhtml', 'psd', 'sql', 'log', 'fla', 'xml', 'ade', 'adp', 'mdb', 'accdb', 'ppt', 'pptx', 'odt', 'ots', 'ott', 'odb', 'odg', 'otp', 'otg', 'odf', 'ods', 'odp', 'css', 'ai', 'kmz','dwg', 'dxf', 'hpgl', 'plt', 'spl', 'step', 'stp', 'iges', 'igs', 'sat', 'cgm', 'ics', 'gpx', 'kml', ''), //Files
'ext_video' => array( 'mov', 'mpeg', 'm4v', 'mp4', 'avi', 'mpg', 'wma', "flv", "webm" ), //Video 'ext_video' => array( 'mov', 'mpeg', 'm4v', 'mp4', 'avi', 'mpg', 'wma', "flv", "webm" ), //Video
'ext_music' => array( 'mp3', 'mpga', 'm4a', 'ac3', 'aiff', 'mid', 'ogg', 'wav' ), //Audio 'ext_music' => array( 'mp3', 'mpga', 'm4a', 'ac3', 'aiff', 'mid', 'ogg', 'wav' ), //Audio
'ext_misc' => array( 'zip', 'rar', 'gz', 'tar', 'iso', 'dmg' ), //Archives 'ext_misc' => array( 'zip', 'rar', 'gz', 'tar', 'iso', 'dmg' ), //Archives

1
core/vendor/tinymce/content.css vendored
View File

@ -5,6 +5,7 @@
/* Fix les problèmes de couleurs et de taille de police */ /* Fix les problèmes de couleurs et de taille de police */
.editorWysiwyg { .editorWysiwyg {
font-size: 14px !important; font-size: 14px !important;
background-image: none;
} }

7
core/vendor/tinymce/init.js vendored
View File

@ -191,13 +191,6 @@ tinymce.init({
] ]
}); });
/**
* Suppression du back ground TinyMCE
*
*/
$(body).removeAttr("background-image");
tinymce.PluginManager.add('stickytoolbar', function(editor, url) { tinymce.PluginManager.add('stickytoolbar', function(editor, url) {
editor.on('init', function() { editor.on('init', function() {
setSticky(); setSticky();

16
module/blog/view/add/add.css Normal file
View File

@ -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 <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/
*/
@import url("core/layout/admin.css");

2
module/blog/view/article/article.php
View File

@ -19,7 +19,6 @@
<div class="row"> <div class="row">
<div class="col3"> <div class="col3">
<?php echo template::button('blogBack', [ <?php echo template::button('blogBack', [
'class' => 'buttonGrey',
'href' => helper::baseUrl() . $this->getUrl(0), 'href' => helper::baseUrl() . $this->getUrl(0),
'ico' => 'left', 'ico' => 'left',
'value' => 'Retour' 'value' => 'Retour'
@ -27,7 +26,6 @@
</div> </div>
<div class="col3 offset6"> <div class="col3 offset6">
<?php echo template::button('blogEdit', [ <?php echo template::button('blogEdit', [
'class' => 'buttonBlue',
'href' => helper::baseUrl() . $this->getUrl(0) . '/edit/' . $this->getUrl(1) . '/' . $_SESSION['csrf'], 'href' => helper::baseUrl() . $this->getUrl(0) . '/edit/' . $this->getUrl(1) . '/' . $_SESSION['csrf'],
'value' => 'Editer' 'value' => 'Editer'
]); ?> ]); ?>

16
module/blog/view/comment/comment.css Normal file
View File

@ -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 <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/
*/
@import url("core/layout/admin.css");

16
module/blog/view/config/config.css Normal file
View File

@ -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 <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/
*/
@import url("core/layout/admin.css");

16
module/blog/view/edit/edit.css Normal file
View File

@ -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 <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/
*/
@import url("core/layout/admin.css");

2
module/blog/view/index/index.css
View File

@ -18,7 +18,7 @@
float: right; float: right;
} }
.blogTitle { .blogTitle {
background-color: #ECEFF1; /*background-color: #ECEFF1;*/
padding: 5px; padding: 5px;
} }
.blogContent { .blogContent {

6
module/form/view/config/config.css
View File

@ -1,3 +1,7 @@
@import url("core/layout/admin.css");
/*
.formConfigInput { .formConfigInput {
background: #FFF; background: #FFF;
} }
*/

16
module/form/view/data/data.css Normal file
View File

@ -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 <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/
*/
@import url("core/layout/admin.css");

1
module/form/view/data/data.php
View File

@ -17,7 +17,6 @@
</div> </div>
<div class="col2"> <div class="col2">
<?php echo template::button('formDataBack', [ <?php echo template::button('formDataBack', [
'class' => 'buttonBlue',
'href' => helper::baseUrl() . $this->getUrl(0) . '/export2csv' . '/' . $_SESSION['csrf'], 'href' => helper::baseUrl() . $this->getUrl(0) . '/export2csv' . '/' . $_SESSION['csrf'],
'ico' => 'download', 'ico' => 'download',
'value' => 'Export CSV' 'value' => 'Export CSV'

17
module/gallery/view/config/config.css
View File

@ -1,3 +1,20 @@
/**
* 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/
*/
@import url("core/layout/admin.css");
.galleryConfigError { .galleryConfigError {
color: #F3674A; color: #F3674A;
font-weight: bold; font-weight: bold;

16
module/gallery/view/edit/edit.css Normal file
View File

@ -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 <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/
*/
@import url("core/layout/admin.css");

16
module/news/view/add/add.css Normal file
View File

@ -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 <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/
*/
@import url("core/layout/admin.css");

16
module/news/view/config/config.css Normal file
View File

@ -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 <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/
*/
@import url("core/layout/admin.css");

1
module/news/view/index/index.css
View File

@ -1 +0,0 @@
/* Volontairement vide */

16
module/redirection/view/config/config.css Normal file
View File

@ -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 <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/
*/
@import url("core/layout/admin.css");

16
module/redirection/view/index/index.css Normal file
View File

@ -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 <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/
*/
@import url("core/layout/admin.css");