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

[10.0.004.dev] Merge branch 'master' into dev10

This commit is contained in:
fredtempez 2019-12-10 17:39:36 +01:00
parent 26e219af00 7a02b8524d
commit 791a7e649d
5 changed files with 50 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/core.php
View File

@ -34,7 +34,7 @@ class common {
const TEMP_DIR = 'site/tmp/'; const TEMP_DIR = 'site/tmp/';
// Numéro de version // Numéro de version
const ZWII_VERSION = '10.0.003.dev'; const ZWII_VERSION = '10.0.004.dev';
public static $actions = []; public static $actions = [];
public static $coreModuleIds = [ public static $coreModuleIds = [
@ -1111,6 +1111,12 @@ class common {
$this->setData(['theme','menu','burgerTitle',true]); $this->setData(['theme','menu','burgerTitle',true]);
$this->setData(['core', 'dataVersion', 10000]); $this->setData(['core', 'dataVersion', 10000]);
} }
// Version 9.2.15
if($this->getData(['core', 'dataVersion']) < 9215) {
// Données de la barre de langue dans le menu
$this->setData(['theme','menu','burgerTitle',true]);
$this->setData(['core', 'dataVersion', 9215]);
}
} }
} }

7
core/layout/common.css
View File

@ -434,10 +434,17 @@ nav #toggle {
display: none; display: none;
font-weight: bold; font-weight: bold;
} }
nav #toggle span { nav #toggle span {
display: block; display: block;
} }
nav #burgerText {
float: left;
font-size: 1.4em;
margin: 15px 0 0 10px;
}
nav ul { nav ul {
padding: 0; padding: 0;
margin: 0; margin: 0;

24
core/layout/main.php
View File

@ -37,7 +37,11 @@
} }
?> ?>
> >
<div id="toggle"><?php echo template::ico('menu',null,null,'2em'); ?></div> <div id="toggle">
<?php if ($this->getData(['theme','menu','burgerTitle']) === true ): ?>
<div id="burgerText"><?php echo $this->getData(['config','title']);?></div>
<?php endif; ?>
<?php echo template::ico('menu',null,null,'2em'); ?></div>
<div id="menu" class=" <div id="menu" class="
<?php if($this->getData(['theme', 'menu', 'position']) === 'top'){echo 'container-large';}else{echo'container';} <?php if($this->getData(['theme', 'menu', 'position']) === 'top'){echo 'container-large';}else{echo'container';}
?>"> ?>">
@ -72,7 +76,11 @@
<?php if($this->getData(['theme', 'menu', 'position']) === 'body-second'): ?> <?php if($this->getData(['theme', 'menu', 'position']) === 'body-second'): ?>
<!-- Menu dans le fond du site après la bannière --> <!-- Menu dans le fond du site après la bannière -->
<nav> <nav>
<div id="toggle"><?php echo template::ico('menu',null,null,'2em'); ?></div> <div id="toggle">
<?php if ($this->getData(['theme','menu','burgerTitle']) === true ): ?>
<div id="burgerText"><?php echo $this->getData(['config','title']);?></div>
<?php endif; ?>
<?php echo template::ico('menu',null,null,'2em'); ?></div>
<div id="menu" class="container"><?php $layout->showMenu(); ?></div> <div id="menu" class="container"><?php $layout->showMenu(); ?></div>
</nav> </nav>
<?php endif; ?> <?php endif; ?>
@ -81,7 +89,11 @@
<?php if($this->getData(['theme', 'menu', 'position']) === 'site-first'): ?> <?php if($this->getData(['theme', 'menu', 'position']) === 'site-first'): ?>
<!-- Menu dans le site avant la bannière --> <!-- Menu dans le site avant la bannière -->
<nav> <nav>
<div id="toggle"><?php echo template::ico('menu',null,null,'2em'); ?></div> <div id="toggle">
<?php if ($this->getData(['theme','menu','burgerTitle']) === true ): ?>
<div id="burgerText"><?php echo $this->getData(['config','title']);?></div>
<?php endif; ?>
<?php echo template::ico('menu',null,null,'2em'); ?></div>
<div id="menu" class="container"><?php $layout->showMenu(); ?></div> <div id="menu" class="container"><?php $layout->showMenu(); ?></div>
</nav> </nav>
<?php endif; ?> <?php endif; ?>
@ -124,7 +136,11 @@
): ?> ): ?>
<!-- Menu dans le site après la bannière --> <!-- Menu dans le site après la bannière -->
<nav <?php if($this->getData(['theme', 'menu', 'position']) === 'hide'): ?>class="displayNone"<?php endif; ?>> <nav <?php if($this->getData(['theme', 'menu', 'position']) === 'hide'): ?>class="displayNone"<?php endif; ?>>
<div id="toggle"><?php echo template::ico('menu',null,null,'2em'); ?></div> <div id="toggle">
<?php if ($this->getData(['theme','menu','burgerTitle']) === true ): ?>
<div id="burgerText"><?php echo $this->getData(['config','title']);?></div>
<?php endif; ?>
<?php echo template::ico('menu',null,null,'2em'); ?></div>
<div id="menu" class="container"><?php $layout->showMenu(); ?></div> <div id="menu" class="container"><?php $layout->showMenu(); ?></div>
</nav> </nav>
<?php endif; ?> <?php endif; ?>

3
core/module/theme/theme.php
View File

@ -453,7 +453,8 @@ class theme extends common {
'fixed' => $this->getInput('themeMenuFixed', helper::FILTER_BOOLEAN), 'fixed' => $this->getInput('themeMenuFixed', helper::FILTER_BOOLEAN),
'activeColorAuto' => $this->getInput('themeMenuActiveColorAuto', helper::FILTER_BOOLEAN), 'activeColorAuto' => $this->getInput('themeMenuActiveColorAuto', helper::FILTER_BOOLEAN),
'activeColor' => $this->getInput('themeMenuActiveColor'), 'activeColor' => $this->getInput('themeMenuActiveColor'),
'radius' => $this->getInput('themeMenuRadius') 'radius' => $this->getInput('themeMenuRadius'),
'burgerTitle' => $this->getInput('themeMenuBurgerTitle', helper::FILTER_BOOLEAN)
]]); ]]);
// Valeurs en sortie // Valeurs en sortie
$this->addOutput([ $this->addOutput([

18
core/module/theme/view/menu/menu.php
View File

@ -57,10 +57,20 @@
<div class="row"> <div class="row">
<div class="col12"> <div class="col12">
<div class="block"> <div class="block">
<h4>Contenu</h4> <h4>Contenus</h4>
<?php echo template::checkbox('themeMenuLoginLink', true, 'Lien de connexion', [ <div class="row">
'checked' => $this->getData(['theme', 'menu', 'loginLink']) <div class="col6">
]); ?> <?php echo template::checkbox('themeMenuLoginLink', true, 'Lien de connexion', [
'checked' => $this->getData(['theme', 'menu', 'loginLink'])
]); ?>
</div>
<div class="col6">
<?php echo template::checkbox('themeMenuBurgerTitle', true, 'Titre du site dans le menu réduit', [
'checked' => $this->getData(['theme', 'menu', 'burgerTitle']),
'help' => 'Le menu burger remplace le menu complet lorsque la largeur de l\'écran n\'est pas suffisante.'
]); ?>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>