diff --git a/core/core.php b/core/core.php index 6f54b76e..2035907c 100644 --- a/core/core.php +++ b/core/core.php @@ -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']) . '}'; diff --git a/core/layout/common.css b/core/layout/common.css index b893514a..8ce3bcb1 100755 --- a/core/layout/common.css +++ b/core/layout/common.css @@ -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 { diff --git a/core/module/install/ressource/defaultdata.php b/core/module/install/ressource/defaultdata.php index 1dfbacde..a8c5d543 100644 --- a/core/module/install/ressource/defaultdata.php +++ b/core/module/install/ressource/defaultdata.php @@ -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)', diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php index 21c22a77..cc3e4e74 100755 --- a/core/module/theme/theme.php +++ b/core/module/theme/theme.php @@ -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([ diff --git a/core/module/theme/view/menu/menu.js.php b/core/module/theme/view/menu/menu.js.php index 981a469b..fb59ef08 100755 --- a/core/module/theme/view/menu/menu.js.php +++ b/core/module/theme/view/menu/menu.js.php @@ -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 diff --git a/core/module/theme/view/menu/menu.php b/core/module/theme/view/menu/menu.php index b111e3b5..5a92e562 100755 --- a/core/module/theme/view/menu/menu.php +++ b/core/module/theme/view/menu/menu.php @@ -13,9 +13,9 @@
-
+
-

Couleur

+

Couleurs

-
+
-

Contenu

+

Contenus

$this->getData(['theme', 'menu', 'loginLink']) ]); ?> $this->getData(['theme', 'menu', 'burgerTitle']), 'help' => 'Le menu burger remplace le menu complet lorsque la largeur de l\'écran n\'est pas suffisante.' - ]); ?> + ]); ?> + 'Position de la barre de langues', + 'selected' => $this->getData(['theme', 'menu', 'i18nPosition']) + ]); ?> +