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

[10.0.23.dev] Position de la barre de langue dans le menu

This commit is contained in:
fredtempez 2019-10-06 19:39:21 +02:00
parent 68aff93b70
commit eb47c9a509
3 changed files with 83 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/core.php
View File

@ -31,7 +31,7 @@ class common {
const TEMP_DIR = 'site/tmp/';
// Numéro de version
const ZWII_VERSION = '10.0.22.dev';
const ZWII_VERSION = '10.0.23.dev';
public static $actions = [];
public static $coreModuleIds = [
@ -2348,7 +2348,6 @@ class layout extends common {
$items .= '</ul>';
}
// Lien de connexion
if(
(
@ -2364,6 +2363,12 @@ class layout extends common {
'">Connexion</a></li>';
}
// Retourne les items du menu
echo '<ul class="navLevel1">' . $items . '</ul>';
}
public function showi18nUserSelect() {
$items = '';
// Menu de langues
if (sizeof($this->i18nInstalled()) > 1) {
foreach ($this->i18nInstalled() as $itemKey => $item) {
@ -2374,10 +2379,7 @@ class layout extends common {
$items .= '</form></li>';
}
}
// Retourne les items du menu
echo '<ul class="navLevel1">' . $items . '</ul>';
echo '<ul>' . $items . '</ul>';
}
/**

32
core/layout/common.css
View File

@ -457,6 +457,26 @@ nav li ul {
padding-left: 10px;
}
nav #i18nUserSelect {
text-align: right;
}
nav .col1,
nav .col2,
nav .col3,
nav .col4,
nav .col5,
nav .col6,
nav .col7,
nav .col8,
nav .col9,
nav .col10,
nav .col11,
nav .col12 {
padding-top: 0px;
padding-bottom: 0px ;
}
nav li ul li {
display: block;
text-align: left;
@ -493,7 +513,7 @@ nav a:hover {
display: none;
text-align: left;
}
nav li {
nav li, .flag {
display: block;
}
nav li ul {
@ -503,6 +523,7 @@ nav a:hover {
min-width: inherit;
width: auto;
}
/* Taille du menu hamburger */
nav .zwiico-menu {
font-size:1.5em;
@ -544,12 +565,15 @@ ul .menuSideChild, li .menuSideChild {
/* Icones de langues du menu */
nav .flag {
height: 30px;
padding: 5px;
height: 20px;
vertical-align: middle;
padding: 3px;
margin-top:12px;
}
nav .flagSelected {
padding: 0px;
height: 25px;
}

41
core/layout/main.php
View File

@ -42,7 +42,15 @@
<?php if($this->getData(['theme', 'menu', 'position']) === 'top'){echo 'container-large';}else{echo'container';}
?>">
<div class="row">
<div class="col<?php echo floor((12 - sizeof($this->i18nInstalled()) /2)); ?>">
<?php $layout->showMenu(); ?>
</div>
<div class="col<?php echo ceil((sizeof($this->i18nInstalled()) /2)); ?>" id="i18nUserSelect">
<?php $layout->showi18nUserSelect(); ?>
</div>
</div>
</div> <!--fin menu -->
</nav>
<?php endif; ?>
@ -71,7 +79,16 @@
<!-- Menu dans le fond du site après la bannière -->
<nav>
<div id="toggle"><?php echo template::ico('menu',null,null,'2em'); ?></div>
<div id="menu" class="container"><?php $layout->showMenu(); ?></div>
<div id="menu" class="container">
<div class="row">
<div class="col<?php echo floor((12 - sizeof($this->i18nInstalled()) /2)); ?>">
<?php $layout->showMenu(); ?>
</div>
<div class="col<?php echo ceil((sizeof($this->i18nInstalled()) /2)); ?>" id="i18nUserSelect">
<?php $layout->showi18nUserSelect(); ?>
</div>
</div>
</div>
</nav>
<?php endif; ?>
<!-- Site -->
@ -80,7 +97,16 @@
<!-- Menu dans le site avant la bannière -->
<nav>
<div id="toggle"><?php echo template::ico('menu',null,null,'2em'); ?></div>
<div id="menu" class="container"><?php $layout->showMenu(); ?></div>
<div id="menu" class="container">
<div class="row">
<div class="col<?php echo floor((12 - sizeof($this->i18nInstalled()) /2)); ?>">
<?php $layout->showMenu(); ?>
</div>
<div class="col<?php echo ceil((sizeof($this->i18nInstalled()) /2)); ?>" id="i18nUserSelect">
<?php $layout->showi18nUserSelect(); ?>
</div>
</div>
</div>
</nav>
<?php endif; ?>
<?php if(
@ -119,7 +145,16 @@
<!-- Menu dans le site après la bannière -->
<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="menu" class="container"><?php $layout->showMenu(); ?></div>
<div id="menu" class="container">
<div class="row">
<div class="col<?php echo floor((12 - sizeof($this->i18nInstalled()) /2)); ?>">
<?php $layout->showMenu(); ?>
</div>
<div class="col<?php echo ceil((sizeof($this->i18nInstalled()) /2)); ?>" id="i18nUserSelect">
<?php $layout->showi18nUserSelect(); ?>
</div>
</div>
</div>
</nav>
<?php endif; ?>
<!-- Corps de page -->