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

[10.0.26.dev] Barre de langue dans le menu ok

This commit is contained in:
Fred 2019-10-08 09:19:33 +02:00 committed by GitHub
parent e78752b764
commit ff245af7c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/layout/common.css
View File

@ -338,7 +338,7 @@ td > .col12 {
width: 200px;
}
#bar #barSelectLanguage {
width: 170px;
width: 140px;
margin-right: 10px;
}
@media (min-width: 769px) {
@ -576,7 +576,15 @@ nav .flagSelected {
height: 27px;
}
/* Paramètres du menu et de la barre de langue */
#menuBar {
display: inline-flex ;
}
#i18nBar {
display: inline-flex ;
float: right;
}
/* Corps */
@media (min-width:769px) {

54
core/layout/main.php
View File

@ -27,7 +27,6 @@
<nav
<?php
// Détermine si le menu est fixe en haut de page lorsque l'utilisateur n'est pas connecté
//
if($this->getData(['theme', 'menu', 'position']) === 'top' &&
$this->getData(['theme', 'menu', 'fixed']) === true) {
if ($this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD'))
@ -35,22 +34,15 @@
elseif ($this->getUrl(0) !== 'theme')
{echo 'id="navfixedconnected"';}
}
?>
>
?>>
<div id="toggle"><?php echo template::ico('menu',null,null,'2em'); ?></div>
<div id="menu" class="
<?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 id="menu" class="<?php if($this->getData(['theme', 'menu', 'position']) === 'top'){echo 'container-large';}else{echo'container';}?>">
<div id="menuBar">
<?php $layout->showMenu(); ?>
</div>
<div id="i18nBar">
<?php $layout->showi18nUserSelect(); ?>
</div>
</div> <!--fin menu -->
</nav>
<?php endif; ?>
@ -80,13 +72,11 @@
<nav>
<div id="toggle"><?php echo template::ico('menu',null,null,'2em'); ?></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 id="menuBar">
<?php $layout->showMenu(); ?>
</div>
<div id="i18nBar">
<?php $layout->showi18nUserSelect(); ?>
</div>
</div>
</nav>
@ -98,15 +88,13 @@
<nav>
<div id="toggle"><?php echo template::ico('menu',null,null,'2em'); ?></div>
<div id="menu" class="container">
<div class="row">
<div class="col<?php echo floor((12 - sizeof($this->i18nInstalled()) /2)); ?>">
<div id="menuBar">
<?php $layout->showMenu(); ?>
</div>
<div class="col<?php echo ceil((sizeof($this->i18nInstalled()) /2)); ?>" id="i18nUserSelect">
</div>
<div id="i18nBar">
<?php $layout->showi18nUserSelect(); ?>
</div>
</div>
</div>
</nav>
<?php endif; ?>
<?php if(
@ -146,13 +134,11 @@
<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">
<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 id="menuBar">
<?php $layout->showMenu(); ?>
</div>
<div id="i18nBar">
<?php $layout->showi18nUserSelect(); ?>
</div>
</div>
</nav>