Merge branch 'dev' into blog_v3
This commit is contained in:
Fred Tempez
commit
4a599c513c
|
|
@ -16,6 +16,11 @@
|
|||
- Edition de l'article, afficher les signatures plutôt que les noms
|
||||
- Reprise de la date d'édition, bug avec Chrome
|
||||
|
||||
git ## version 10.2.04
|
||||
- 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
|
||||
- Corrections :
|
||||
- Les entrées de menu disposent d'une classe par groupe de parent en lieu et place des ids.
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
 
|
||||
|
||||
# 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.
|
||||
|
|
|
|||
|
|
@ -1462,7 +1462,7 @@ class core extends common {
|
|||
// Site
|
||||
$colors = helper::colorVariants($this->getData(['theme', 'text', 'linkColor']));
|
||||
$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{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']).';}';
|
||||
|
|
@ -1591,7 +1591,7 @@ class core extends common {
|
|||
$css = '/*' . md5(json_encode($this->getData(['admin']))) . '*/';
|
||||
$colors = helper::colorVariants($this->getData(['admin','backgroundColor']));
|
||||
$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:not(.editorWysiwyg),span .zwiico-help {color:' . $this->getData(['admin','colorText']) . ';}';
|
||||
$colors = helper::colorVariants($this->getData(['admin','backgroundColorButton']));
|
||||
|
|
|
|||
|
|
@ -455,10 +455,11 @@ header .container {
|
|||
font-size: 0.9em;
|
||||
}
|
||||
|
||||
/* Menu */
|
||||
/* Menu
|
||||
body > nav {
|
||||
/*margin: 0 -10px;*/
|
||||
margin: 0 -10px;
|
||||
}
|
||||
*/
|
||||
|
||||
/* Items du menu */
|
||||
nav a > img {
|
||||
|
|
@ -848,6 +849,11 @@ footer #footerSocials .zwiico-github:hover {
|
|||
/* background: #ECEFF1;*/
|
||||
}
|
||||
|
||||
.block h4 .openClose {
|
||||
display: inline-flex ;
|
||||
float: right;
|
||||
}
|
||||
|
||||
/* Aides */
|
||||
.helpButton {
|
||||
cursor: help;
|
||||
|
|
@ -1296,6 +1302,7 @@ th.col12 {
|
|||
width: 100%;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Classes rapides
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -168,10 +168,14 @@
|
|||
<div class="row">
|
||||
<div class="col12">
|
||||
<div class="block" id="social">
|
||||
<h4><?php
|
||||
echo template::ico('plus','right');
|
||||
echo template::ico('minus','right');
|
||||
?>Réseaux sociaux</h4>
|
||||
<h4>Réseaux sociaux
|
||||
<div class="openClose">
|
||||
<?php
|
||||
echo template::ico('plus','right');
|
||||
echo template::ico('minus','right');
|
||||
?>
|
||||
</div>
|
||||
</h4>
|
||||
<div class="blockContainer">
|
||||
<div class="row">
|
||||
<div class="col3">
|
||||
|
|
@ -240,10 +244,14 @@
|
|||
<div class="row">
|
||||
<div class="col12">
|
||||
<div class="block" id="ceo">
|
||||
<h4><?php
|
||||
echo template::ico('plus','right');
|
||||
echo template::ico('minus','right');
|
||||
?>Référencement</h4>
|
||||
<h4>Référencement
|
||||
<div class="openClose">
|
||||
<?php
|
||||
echo template::ico('plus','right');
|
||||
echo template::ico('minus','right');
|
||||
?>
|
||||
</div>
|
||||
</h4>
|
||||
<div class="blockContainer">
|
||||
<div class="row">
|
||||
<div class="col4 offset1">
|
||||
|
|
@ -283,10 +291,14 @@
|
|||
<div class="row">
|
||||
<div class="col12">
|
||||
<div class="block" id="network">
|
||||
<h4><?php
|
||||
echo template::ico('plus','right');
|
||||
echo template::ico('minus','right');
|
||||
?>Réseau</h4>
|
||||
<h4>Réseau
|
||||
<div class="openClose">
|
||||
<?php
|
||||
echo template::ico('plus','right');
|
||||
echo template::ico('minus','right');
|
||||
?>
|
||||
</div>
|
||||
</h4>
|
||||
<div class="blockContainer">
|
||||
<div class="row">
|
||||
<div class="col2">
|
||||
|
|
@ -317,10 +329,14 @@
|
|||
<div class="row">
|
||||
<div class="col12">
|
||||
<div class="block" id="smtp">
|
||||
<h4><?php
|
||||
echo template::ico('plus','right');
|
||||
echo template::ico('minus','right');
|
||||
?>Messagerie SMTP</h4>
|
||||
<h4>Messagerie SMTP
|
||||
<div class="openClose">
|
||||
<?php
|
||||
echo template::ico('plus','right');
|
||||
echo template::ico('minus','right');
|
||||
?>
|
||||
</div>
|
||||
</h4>
|
||||
<div class="blockContainer">
|
||||
<div class="row">
|
||||
<div class="col12">
|
||||
|
|
@ -384,10 +400,14 @@
|
|||
<div class="row">
|
||||
<div class="col12">
|
||||
<div class="block" id="login">
|
||||
<h4><?php
|
||||
echo template::ico('plus','right');
|
||||
echo template::ico('minus','right');
|
||||
?>Sécurité de la connexion</h4>
|
||||
<h4>Sécurité de la connexion
|
||||
<div class="openClose">
|
||||
<?php
|
||||
echo template::ico('plus','right');
|
||||
echo template::ico('minus','right');
|
||||
?>
|
||||
</div>
|
||||
</h4>
|
||||
<div class="blockContainer">
|
||||
<div class="row">
|
||||
<div class="col3">
|
||||
|
|
@ -431,10 +451,14 @@
|
|||
<div class="row">
|
||||
<div class="col12">
|
||||
<div class="block" id="logs">
|
||||
<h4><?php
|
||||
echo template::ico('plus','right');
|
||||
echo template::ico('minus','right');
|
||||
?>Journalisation</h4>
|
||||
<h4>Journalisation
|
||||
<div class="openClose">
|
||||
<?php
|
||||
echo template::ico('plus','right');
|
||||
echo template::ico('minus','right');
|
||||
?>
|
||||
</div>
|
||||
</h4>
|
||||
<div class="blockContainer">
|
||||
<div class="row">
|
||||
<div class="col4 verticalAlignBottom">
|
||||
|
|
@ -465,10 +489,14 @@
|
|||
<div class="row">
|
||||
<div class="col12">
|
||||
<div class="block" id="script">
|
||||
<h4><?php
|
||||
echo template::ico('plus','right');
|
||||
echo template::ico('minus','right');
|
||||
?>Scripts</h4>
|
||||
<h4>Scripts
|
||||
<div class="openClose">
|
||||
<?php
|
||||
echo template::ico('plus','right');
|
||||
echo template::ico('minus','right');
|
||||
?>
|
||||
</div>
|
||||
</h4>
|
||||
<div class="blockContainer">
|
||||
<div class="row">
|
||||
<div class="col3">
|
||||
|
|
@ -501,10 +529,14 @@
|
|||
<div class="row">
|
||||
<div class="col12" >
|
||||
<div class="block" id="system">
|
||||
<h4><?php
|
||||
echo template::ico('plus','right');
|
||||
echo template::ico('minus','right');
|
||||
?>Système</h4>
|
||||
<h4>Système
|
||||
<div class="openClose">
|
||||
<?php
|
||||
echo template::ico('plus','right');
|
||||
echo template::ico('minus','right');
|
||||
?>
|
||||
</div>
|
||||
</h4>
|
||||
<div class="blockContainer">
|
||||
<div class="row">
|
||||
<div class="col2">
|
||||
|
|
|
|||
|
|
@ -96,10 +96,14 @@ echo template::formOpen('pageEditForm');
|
|||
<div class="row">
|
||||
<div class="col12" id="pageEditBlockLayout">
|
||||
<div class="block" id="layout">
|
||||
<h4><?php
|
||||
echo template::ico('plus','right');
|
||||
echo template::ico('minus','right');
|
||||
?>Mise en page</h4>
|
||||
<h4>Mise en page
|
||||
<div class="openClose">
|
||||
<?php
|
||||
echo template::ico('plus','right');
|
||||
echo template::ico('minus','right');
|
||||
?>
|
||||
</div>
|
||||
</h4>
|
||||
<div class="blockContainer">
|
||||
<div class="row">
|
||||
<div class="col6">
|
||||
|
|
@ -149,10 +153,14 @@ echo template::formOpen('pageEditForm');
|
|||
<div class="row">
|
||||
<div class="col12" id="pageEditMenu">
|
||||
<div class="block" id="location">
|
||||
<h4><?php
|
||||
echo template::ico('plus','right');
|
||||
echo template::ico('minus','right');
|
||||
?>Emplacement dans le menu</h4>
|
||||
<h4>Emplacement dans le menu
|
||||
<div class="openClose">
|
||||
<?php
|
||||
echo template::ico('plus','right');
|
||||
echo template::ico('minus','right');
|
||||
?>
|
||||
</div>
|
||||
</h4>
|
||||
<div class="blockContainer">
|
||||
<div class="row">
|
||||
<div class="col6">
|
||||
|
|
@ -208,10 +216,14 @@ echo template::formOpen('pageEditForm');
|
|||
<div class='row' id="pageEditAdvancedWrapper">
|
||||
<div class="col12">
|
||||
<div class="block" id="advanced">
|
||||
<h4><?php
|
||||
echo template::ico('plus','right');
|
||||
echo template::ico('minus','right');
|
||||
?>Options avancées d'emplacement</h4>
|
||||
<h4>Options avancées d'emplacement
|
||||
<div class="openClose">
|
||||
<?php
|
||||
echo template::ico('plus','right');
|
||||
echo template::ico('minus','right');
|
||||
?>
|
||||
</div>
|
||||
</h4>
|
||||
<div class="blockContainer">
|
||||
<div class="row">
|
||||
<div class="col6">
|
||||
|
|
@ -233,10 +245,14 @@ echo template::formOpen('pageEditForm');
|
|||
<div class='row' id="pageEditSeoWrapper">
|
||||
<div class="col12">
|
||||
<div class="block" id="ceo">
|
||||
<h4><?php
|
||||
echo template::ico('plus','right');
|
||||
echo template::ico('minus','right');
|
||||
?>Permission et référencement</h4>
|
||||
<h4>Permission et référencement
|
||||
<div class="openClose">
|
||||
<?php
|
||||
echo template::ico('plus','right');
|
||||
echo template::ico('minus','right');
|
||||
?>
|
||||
</div>
|
||||
</h4>
|
||||
<div class="blockContainer">
|
||||
<div class="row">
|
||||
<div class='col6'>
|
||||
|
|
|
|||
Loading…
Reference in New Issue