lapervenche/ZwiiCMS
1
0
Fork 0
forked from ZwiiCMS-Team/ZwiiCMS
Code Issues Pull Requests Projects Releases Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
Fred Tempez 2020-07-17 21:16:03 +02:00
commit fac102b038
10 changed files with 183 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGES.md
View File

@ -1,5 +1,14 @@
# Changelog # Changelog
## version 10.2.04
- Mise à jour :
- Flatpickr 4.6.3
- Correction :
- Connexion avec un compte inexistant, notification incorrecte.
- Modifications :
- Position de l'icône d'ouverture et de fermeture des blocs.
- Thème administration, bouton standard couleur du texte au survol.
## version 10.2.03 ## version 10.2.03
- Corrections : - Corrections :
- Les entrées de menu disposent d'une classe par groupe de parent en lieu et place des ids. - Les entrées de menu disposent d'une classe par groupe de parent en lieu et place des ids.

2
README.md
View File

@ -1,6 +1,6 @@
![](https://img.shields.io/github/last-commit/fredtempez/ZwiiCMS/master) ![](https://img.shields.io/github/release-date/fredtempez/ZwiiCMS) ![](https://img.shields.io/github/last-commit/fredtempez/ZwiiCMS/master) ![](https://img.shields.io/github/release-date/fredtempez/ZwiiCMS)
# ZwiiCMS 10.2.03 # ZwiiCMS 10.2.04
Zwii est un CMS sans base de données (flat-file) qui permet de créer et gérer facilement un site web sans aucune connaissance en programmation. Zwii est un CMS sans base de données (flat-file) qui permet de créer et gérer facilement un site web sans aucune connaissance en programmation.

6
core/core.php
View File

@ -39,7 +39,7 @@ class common {
const ACCESS_TIMER = 1800; const ACCESS_TIMER = 1800;
// Numéro de version // Numéro de version
const ZWII_VERSION = '10.2.03'; const ZWII_VERSION = '10.2.04';
const ZWII_UPDATE_CHANNEL = "v10"; const ZWII_UPDATE_CHANNEL = "v10";
public static $actions = []; public static $actions = [];
@ -1449,7 +1449,7 @@ class core extends common {
// Site // Site
$colors = helper::colorVariants($this->getData(['theme', 'text', 'linkColor'])); $colors = helper::colorVariants($this->getData(['theme', 'text', 'linkColor']));
$css .= 'a{color:' . $colors['normal'] . '}'; $css .= 'a{color:' . $colors['normal'] . '}';
$css .= 'a:hover:not(.inputFile){color:' . $colors['darken'] . '}'; $css .= 'a:hover:not(.inputFile, button){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{color:' . $this->getData(['theme', 'text', 'textColor']) . '}'; $css .= 'body{color:' . $this->getData(['theme', 'text', 'textColor']) . '}';
$css .= 'select,input[type=\'password\'],input[type=\'email\'],input[type=\'text\'],.inputFile,select,textarea{color:' . $this->getData(['theme', 'text', 'textColor']) .';background-color:'.$this->getData(['theme', 'site', 'backgroundColor']).';}'; $css .= 'select,input[type=\'password\'],input[type=\'email\'],input[type=\'text\'],.inputFile,select,textarea{color:' . $this->getData(['theme', 'text', 'textColor']) .';background-color:'.$this->getData(['theme', 'site', 'backgroundColor']).';}';
@ -1578,7 +1578,7 @@ class core extends common {
$css = '/*' . md5(json_encode($this->getData(['admin']))) . '*/'; $css = '/*' . md5(json_encode($this->getData(['admin']))) . '*/';
$colors = helper::colorVariants($this->getData(['admin','backgroundColor'])); $colors = helper::colorVariants($this->getData(['admin','backgroundColor']));
$css .= '#site{background-color:' . $colors['normal']. ';}'; $css .= '#site{background-color:' . $colors['normal']. ';}';
$css .= 'body, .row > div {font:' . $this->getData(['admin','fontSize']) . ' "' . $this->getData(['admin','fontText']) . '", sans-serif;}'; $css .= '.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 h1, h2, h3, h4, h5, h6 {font-family:' . $this->getData(['admin','fontTitle' ]) . ', sans-serif;color:' . $this->getData(['admin','colorTitle' ]) . ';}';
$css .= 'body:not(.editorWysiwyg),span .zwiico-help {color:' . $this->getData(['admin','colorText']) . ';}'; $css .= 'body:not(.editorWysiwyg),span .zwiico-help {color:' . $this->getData(['admin','colorText']) . ';}';
$colors = helper::colorVariants($this->getData(['admin','backgroundColorButton'])); $colors = helper::colorVariants($this->getData(['admin','backgroundColorButton']));

11
core/layout/common.css
View File

@ -455,10 +455,11 @@ header .container {
font-size: 0.9em; font-size: 0.9em;
} }
/* Menu */ /* Menu
body > nav { body > nav {
/*margin: 0 -10px;*/ margin: 0 -10px;
} }
*/
/* Items du menu */ /* Items du menu */
nav a > img { nav a > img {
@ -848,6 +849,11 @@ footer #footerSocials .zwiico-github:hover {
/* background: #ECEFF1;*/ /* background: #ECEFF1;*/
} }
.block h4 .openClose {
display: inline-flex ;
float: right;
}
/* Aides */ /* Aides */
.helpButton { .helpButton {
cursor: help; cursor: help;
@ -1296,6 +1302,7 @@ th.col12 {
width: 100%; width: 100%;
} }
/** /**
* Classes rapides * Classes rapides
*/ */

96
core/module/config/view/index/index.php
View File

@ -168,10 +168,14 @@
<div class="row"> <div class="row">
<div class="col12"> <div class="col12">
<div class="block" id="social"> <div class="block" id="social">
<h4><?php <h4>Réseaux sociaux
echo template::ico('plus','right'); <div class="openClose">
echo template::ico('minus','right'); <?php
?>Réseaux sociaux</h4> echo template::ico('plus','right');
echo template::ico('minus','right');
?>
</div>
</h4>
<div class="blockContainer"> <div class="blockContainer">
<div class="row"> <div class="row">
<div class="col3"> <div class="col3">
@ -240,10 +244,14 @@
<div class="row"> <div class="row">
<div class="col12"> <div class="col12">
<div class="block" id="ceo"> <div class="block" id="ceo">
<h4><?php <h4>Référencement
echo template::ico('plus','right'); <div class="openClose">
echo template::ico('minus','right'); <?php
?>Référencement</h4> echo template::ico('plus','right');
echo template::ico('minus','right');
?>
</div>
</h4>
<div class="blockContainer"> <div class="blockContainer">
<div class="row"> <div class="row">
<div class="col4 offset1"> <div class="col4 offset1">
@ -283,10 +291,14 @@
<div class="row"> <div class="row">
<div class="col12"> <div class="col12">
<div class="block" id="network"> <div class="block" id="network">
<h4><?php <h4>Réseau
echo template::ico('plus','right'); <div class="openClose">
echo template::ico('minus','right'); <?php
?>Réseau</h4> echo template::ico('plus','right');
echo template::ico('minus','right');
?>
</div>
</h4>
<div class="blockContainer"> <div class="blockContainer">
<div class="row"> <div class="row">
<div class="col2"> <div class="col2">
@ -317,10 +329,14 @@
<div class="row"> <div class="row">
<div class="col12"> <div class="col12">
<div class="block" id="smtp"> <div class="block" id="smtp">
<h4><?php <h4>Messagerie SMTP
echo template::ico('plus','right'); <div class="openClose">
echo template::ico('minus','right'); <?php
?>Messagerie SMTP</h4> echo template::ico('plus','right');
echo template::ico('minus','right');
?>
</div>
</h4>
<div class="blockContainer"> <div class="blockContainer">
<div class="row"> <div class="row">
<div class="col12"> <div class="col12">
@ -384,10 +400,14 @@
<div class="row"> <div class="row">
<div class="col12"> <div class="col12">
<div class="block" id="login"> <div class="block" id="login">
<h4><?php <h4>Sécurité de la connexion
echo template::ico('plus','right'); <div class="openClose">
echo template::ico('minus','right'); <?php
?>Sécurité de la connexion</h4> echo template::ico('plus','right');
echo template::ico('minus','right');
?>
</div>
</h4>
<div class="blockContainer"> <div class="blockContainer">
<div class="row"> <div class="row">
<div class="col3"> <div class="col3">
@ -431,10 +451,14 @@
<div class="row"> <div class="row">
<div class="col12"> <div class="col12">
<div class="block" id="logs"> <div class="block" id="logs">
<h4><?php <h4>Journalisation
echo template::ico('plus','right'); <div class="openClose">
echo template::ico('minus','right'); <?php
?>Journalisation</h4> echo template::ico('plus','right');
echo template::ico('minus','right');
?>
</div>
</h4>
<div class="blockContainer"> <div class="blockContainer">
<div class="row"> <div class="row">
<div class="col4 verticalAlignBottom"> <div class="col4 verticalAlignBottom">
@ -465,10 +489,14 @@
<div class="row"> <div class="row">
<div class="col12"> <div class="col12">
<div class="block" id="script"> <div class="block" id="script">
<h4><?php <h4>Scripts
echo template::ico('plus','right'); <div class="openClose">
echo template::ico('minus','right'); <?php
?>Scripts</h4> echo template::ico('plus','right');
echo template::ico('minus','right');
?>
</div>
</h4>
<div class="blockContainer"> <div class="blockContainer">
<div class="row"> <div class="row">
<div class="col3"> <div class="col3">
@ -501,10 +529,14 @@
<div class="row"> <div class="row">
<div class="col12" > <div class="col12" >
<div class="block" id="system"> <div class="block" id="system">
<h4><?php <h4>Système
echo template::ico('plus','right'); <div class="openClose">
echo template::ico('minus','right'); <?php
?>Système</h4> echo template::ico('plus','right');
echo template::ico('minus','right');
?>
</div>
</h4>
<div class="blockContainer"> <div class="blockContainer">
<div class="row"> <div class="row">
<div class="col2"> <div class="col2">

48
core/module/page/view/edit/edit.php
View File

@ -96,10 +96,14 @@ echo template::formOpen('pageEditForm');
<div class="row"> <div class="row">
<div class="col12" id="pageEditBlockLayout"> <div class="col12" id="pageEditBlockLayout">
<div class="block" id="layout"> <div class="block" id="layout">
<h4><?php <h4>Mise en page
echo template::ico('plus','right'); <div class="openClose">
echo template::ico('minus','right'); <?php
?>Mise en page</h4> echo template::ico('plus','right');
echo template::ico('minus','right');
?>
</div>
</h4>
<div class="blockContainer"> <div class="blockContainer">
<div class="row"> <div class="row">
<div class="col6"> <div class="col6">
@ -149,10 +153,14 @@ echo template::formOpen('pageEditForm');
<div class="row"> <div class="row">
<div class="col12" id="pageEditMenu"> <div class="col12" id="pageEditMenu">
<div class="block" id="location"> <div class="block" id="location">
<h4><?php <h4>Emplacement dans le menu
echo template::ico('plus','right'); <div class="openClose">
echo template::ico('minus','right'); <?php
?>Emplacement dans le menu</h4> echo template::ico('plus','right');
echo template::ico('minus','right');
?>
</div>
</h4>
<div class="blockContainer"> <div class="blockContainer">
<div class="row"> <div class="row">
<div class="col6"> <div class="col6">
@ -208,10 +216,14 @@ echo template::formOpen('pageEditForm');
<div class='row' id="pageEditAdvancedWrapper"> <div class='row' id="pageEditAdvancedWrapper">
<div class="col12"> <div class="col12">
<div class="block" id="advanced"> <div class="block" id="advanced">
<h4><?php <h4>Options avancées d'emplacement
echo template::ico('plus','right'); <div class="openClose">
echo template::ico('minus','right'); <?php
?>Options avancées d'emplacement</h4> echo template::ico('plus','right');
echo template::ico('minus','right');
?>
</div>
</h4>
<div class="blockContainer"> <div class="blockContainer">
<div class="row"> <div class="row">
<div class="col6"> <div class="col6">
@ -233,10 +245,14 @@ echo template::formOpen('pageEditForm');
<div class='row' id="pageEditSeoWrapper"> <div class='row' id="pageEditSeoWrapper">
<div class="col12"> <div class="col12">
<div class="block" id="ceo"> <div class="block" id="ceo">
<h4><?php <h4>Permission et référencement
echo template::ico('plus','right'); <div class="openClose">
echo template::ico('minus','right'); <?php
?>Permission et référencement</h4> echo template::ico('plus','right');
echo template::ico('minus','right');
?>
</div>
</h4>
<div class="blockContainer"> <div class="blockContainer">
<div class="row"> <div class="row">
<div class='col6'> <div class='col6'>

2
core/module/user/user.php
View File

@ -355,7 +355,7 @@ class user extends common {
// Verrouillage des IP // Verrouillage des IP
$ipBlackList = helper::arrayCollumn($this->getData(['blacklist']), 'ip'); $ipBlackList = helper::arrayCollumn($this->getData(['blacklist']), 'ip');
if ( $this->getData(['blacklist',$userId,'connectFail']) >= $this->getData(['config', 'connect', 'attempt']) if ( $this->getData(['blacklist',$userId,'connectFail']) >= $this->getData(['config', 'connect', 'attempt'])
OR in_array($this->getData(['blacklist',$userId,'ip']),$ipBlackList) ) { AND in_array($this->getData(['blacklist',$userId,'ip']),$ipBlackList) ) {
// Valeurs en sortie // Valeurs en sortie
$this->addOutput([ $this->addOutput([
'notification' => 'Trop de tentatives, compte verrouillé', 'notification' => 'Trop de tentatives, compte verrouillé',

14
core/vendor/flatpickr/flatpickr.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
core/vendor/flatpickr/flatpickr.min.js vendored
View File

File diff suppressed because one or more lines are too long

85
core/vendor/flatpickr/l10n/fr.js vendored
View File

@ -1,38 +1,75 @@
/* flatpickr v4.5.2, @license MIT */
(function (global, factory) { (function (global, factory) {
typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) : typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
typeof define === 'function' && define.amd ? define(['exports'], factory) : typeof define === 'function' && define.amd ? define(['exports'], factory) :
(factory((global.fr = {}))); (global = global || self, factory(global.fr = {}));
}(this, (function (exports) { 'use strict'; }(this, function (exports) { 'use strict';
var fp = typeof window !== "undefined" && window.flatpickr !== undefined ? window.flatpickr : { var fp = typeof window !== "undefined" && window.flatpickr !== undefined
l10ns: {} ? window.flatpickr
}; : {
var French = { l10ns: {}
};
var French = {
firstDayOfWeek: 1, firstDayOfWeek: 1,
weekdays: { weekdays: {
shorthand: ["dim", "lun", "mar", "mer", "jeu", "ven", "sam"], shorthand: ["dim", "lun", "mar", "mer", "jeu", "ven", "sam"],
longhand: ["dimanche", "lundi", "mardi", "mercredi", "jeudi", "vendredi", "samedi"] longhand: [
"dimanche",
"lundi",
"mardi",
"mercredi",
"jeudi",
"vendredi",
"samedi",
]
}, },
months: { months: {
shorthand: ["janv", "févr", "mars", "avr", "mai", "juin", "juil", "août", "sept", "oct", "nov", "déc"], shorthand: [
longhand: ["janvier", "février", "mars", "avril", "mai", "juin", "juillet", "août", "septembre", "octobre", "novembre", "décembre"] "janv",
"févr",
"mars",
"avr",
"mai",
"juin",
"juil",
"août",
"sept",
"oct",
"nov",
"déc",
],
longhand: [
"janvier",
"février",
"mars",
"avril",
"mai",
"juin",
"juillet",
"août",
"septembre",
"octobre",
"novembre",
"décembre",
]
}, },
ordinal: function ordinal(nth) { ordinal: function (nth) {
if (nth > 1) return "ème"; if (nth > 1)
return "er"; return "";
return "er";
}, },
rangeSeparator: " au ", rangeSeparator: " au ",
weekAbbreviation: "Sem", weekAbbreviation: "Sem",
scrollTitle: "Défiler pour augmenter la valeur", scrollTitle: "Défiler pour augmenter la valeur",
toggleTitle: "Cliquer pour basculer" toggleTitle: "Cliquer pour basculer",
}; time_24hr: true
fp.l10ns.fr = French; };
var fr = fp.l10ns; fp.l10ns.fr = French;
var fr = fp.l10ns;
exports.French = French; exports.French = French;
exports.default = fr; exports.default = fr;
Object.defineProperty(exports, '__esModule', { value: true }); Object.defineProperty(exports, '__esModule', { value: true });
}))); }));