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

[10.0.64.dev] Position de la barre de drapeaux dans le menu

This commit is contained in:
fredtempez 2019-11-03 16:37:38 +01:00
parent 987eff3bd5
commit 5330e1bd5f
6 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
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.63.dev';
const ZWII_VERSION = '10.0.64.dev';
public static $actions = [];
public static $coreModuleIds = [
@ -1102,6 +1102,7 @@ class common {
$this->setData(['page',$this->getData(['config','homePageId']),'homePageId', true]);
$this->deleteData(['config','homePageId']);
$this->setData(['theme','menu','burgerTitle',true]);
$this->setData(['theme','menu','i18nPosition', 'right']);
$this->setData(['core', 'dataVersion', 10000]);
}
@ -1261,8 +1262,8 @@ class core extends common {
$css .= 'nav{margin:0 20px 0}';
}
}
$css .= '#i18nBar {padding:' . $this->getData(['theme', 'menu', 'height']) . ';}';
$css .= '.flag {height: ' . $this->getData(['theme', 'menu', 'fontSize']) . ';}';
$css .= '#i18nBar {padding:' . $this->getData(['theme', 'menu', 'height']) . '; float:' . $this->getData(['theme', 'menu', 'i18nPosition']) . ';}';
$css .= '.flag {height:' . $this->getData(['theme', 'menu', 'fontSize']) . ';}';
$colors = helper::colorVariants($this->getData(['theme', 'menu', 'backgroundColor']));
$css .= 'nav #burgerText {color:' . $colors['text'] . ';font-family:"' . str_replace('+', ' ', $this->getData(['theme', 'menu', 'font'])) . '",sans-serif;' . 'font-weight:' . $this->getData(['theme', 'menu', 'fontWeight']) . ';text-transform:' . $this->getData(['theme', 'menu', 'textTransform']) . '}';
$css .= '#toggle span,#menu a{padding:' . $this->getData(['theme', 'menu', 'height']) .';font-family:"' . str_replace('+', ' ', $this->getData(['theme', 'menu', 'font'])) . '",sans-serif;font-weight:' . $this->getData(['theme', 'menu', 'fontWeight']) . ';font-size:' . $this->getData(['theme', 'menu', 'fontSize']) . ';text-transform:' . $this->getData(['theme', 'menu', 'textTransform']) . '}';

9
core/layout/common.css
View File

@ -599,7 +599,7 @@ ul .menuSideChild, li .menuSideChild {
#i18nBar {
display: inline-flex ;
float: right;
/*float: right; Dans le thème*/
}
/* fin barre de menu */
nav:after {
@ -608,6 +608,13 @@ nav:after {
display: flex;
}
nav:before {
content: " ";
clear: left;
display: flex;
}
/* Corps */
@media (min-width:769px) {
section {

3
core/module/install/ressource/defaultdata.php
View File

@ -130,7 +130,8 @@ class init extends common {
'textAlign' => 'left',
'textColor' => 'rgba(255, 255, 255, 1)',
'textTransform' => 'none',
'fixed' => false
'fixed' => false,
'i18nPosition' => 'right'
],
'site' => [
'backgroundColor' => 'rgba(255, 255, 255, 1)',

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

@ -169,6 +169,11 @@ class theme extends common {
'site' => 'Dans le site',
'hide' => 'Caché'
];
public static $menui18nPosition = [
'right' => 'À droite de la barre de menu',
'left' => 'Après le menu',
'none' => 'À droite de la barre de menu'
];
public static $radius = [
'0px' => 'Aucun',
'5px' => 'Très léger',
@ -442,7 +447,8 @@ class theme extends common {
'textAlign' => $this->getInput('themeMenuTextAlign'),
'textColor' => $this->getInput('themeMenuTextColor'),
'textTransform' => $this->getInput('themeMenuTextTransform'),
'fixed' => $this->getInput('themeMenuFixed', helper::FILTER_BOOLEAN)
'fixed' => $this->getInput('themeMenuFixed', helper::FILTER_BOOLEAN),
'i18nPosition' => $this->getInput('themeMenui18nPosition')
]]);
// Valeurs en sortie
$this->addOutput([

1
core/module/theme/view/menu/menu.js.php
View File

@ -25,6 +25,7 @@ $("input, select").on("change", function() {
css += "nav a.active{background-color:" + colors.veryDarken + "}";
css += "#i18nBar {padding:" + $("#themeMenuHeight").val() + "}";
css += ".flag {height: " + $("#themeMenuFontSize").val() + "}";
css += "#i18nBar {float: " + $("#themeMenui18nPosition").val() + "}";
// Taille, hauteur, épaisseur et capitalisation de caractères du menu
css += "#toggle span,#menu a{padding:" + $("#themeMenuHeight").val() + ";font-family:'" + menuFont.replace(/\+/g, " ") + "',sans-serif;font-weight:" + $("#themeMenuFontWeight").val() + ";font-size:" + $("#themeMenuFontSize").val() + ";text-transform:" + $("#themeMenuTextTransform").val() + "}";
// Alignement du menu

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

@ -13,9 +13,9 @@
</div>
</div>
<div class="row">
<div class="col8">
<div class="col7">
<div class="block">
<h4>Couleur</h4>
<h4>Couleurs</h4>
<div class="row">
<div class="col6">
<?php echo template::text('themeMenuBackgroundColor', [
@ -36,16 +36,21 @@
</div>
</div>
</div>
<div class="col4">
<div class="col5">
<div class="block">
<h4>Contenu</h4>
<h4>Contenus</h4>
<?php echo template::checkbox('themeMenuLoginLink', true, 'Lien de connexion', [
'checked' => $this->getData(['theme', 'menu', 'loginLink'])
]); ?>
<?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.'
]); ?>
]); ?>
<?php echo template::select('themeMenui18nPosition', $module::$menui18nPosition, [
'label' => 'Position de la barre de langues',
'selected' => $this->getData(['theme', 'menu', 'i18nPosition'])
]); ?>
</div>
</div>
</div>