From b8e0d532883fb4aa3b60a93d64e2b6411b94d442 Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Sat, 31 Oct 2020 18:34:55 +0100 Subject: [PATCH 1/3] alignement du menu --- core/core.php | 2 +- core/layout/common.css | 6 +++--- core/module/theme/view/menu/menu.js.php | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/core.php b/core/core.php index 22fb7272..b8666d10 100644 --- a/core/core.php +++ b/core/core.php @@ -1597,7 +1597,7 @@ class core extends common { } $css .= 'nav #burgerText{color:' . $colors['text'] . '}'; $css .= 'nav .navLevel1 a.active {border-radius:' . $this->getData(['theme', 'menu', 'radius']) . '}'; - $css .= '#menu{text-align:' . $this->getData(['theme', 'menu', 'textAlign']) . '}'; + $css .= '#menuLeft{float:' . $this->getData(['theme', 'menu', 'textAlign']) . '}'; if($this->getData(['theme', 'menu', 'margin'])) { if( $this->getData(['theme', 'menu', 'position']) === 'site-first' diff --git a/core/layout/common.css b/core/layout/common.css index ef6e4d48..18ceda2e 100755 --- a/core/layout/common.css +++ b/core/layout/common.css @@ -523,11 +523,11 @@ nav a:hover { } nav #menuLeft { - display: flex; - float: left; + display: inline-flex; + /*float: left;*/ } nav #menuRight { - display: flex; + display: inline-flex; float: right; } /* fin barre de menu */ diff --git a/core/module/theme/view/menu/menu.js.php b/core/module/theme/view/menu/menu.js.php index ab3848a5..02b257fb 100644 --- a/core/module/theme/view/menu/menu.js.php +++ b/core/module/theme/view/menu/menu.js.php @@ -54,7 +54,7 @@ $("input, select").on("change", function() { // 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 - css += "#menu{text-align:" + $("#themeMenuTextAlign").val() + "}"; + css += "#menuLeft{float:" + $("#themeMenuTextAlign").val() + "}"; // Marge if($("#themeMenuMargin").is(":checked")) { if( From 813dc501a3011dd113510e4f1ee89084d4de8f45 Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Sat, 31 Oct 2020 18:35:49 +0100 Subject: [PATCH 2/3] changes --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 7efaf53c..877ee977 100755 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,6 +6,7 @@ - Thème : import d'un thème, d'administration impossible. - Thème : import d'un thème, nettoyage du dossier tmp. - Thème administration : modification de l'appel du code CSS permettant une mise à jour du thème sans vider le cache. + - Thème du menu : alignement inopérant. - Amélioration : - Mise en page du corps des mails de notification. - Mise à jour : From 53c82522aa0848bc9280bc65aee65b92bf5942ab Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Sun, 1 Nov 2020 07:56:04 +0100 Subject: [PATCH 3/3] Localisation FR --- CHANGES.md | 1 + core/core.php | 2 +- core/layout/blank.php | 6 +++--- core/layout/light.php | 2 +- core/layout/main.php | 2 +- index.php | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 877ee977..b12c1a6d 100755 --- a/CHANGES.md +++ b/CHANGES.md @@ -9,6 +9,7 @@ - Thème du menu : alignement inopérant. - Amélioration : - Mise en page du corps des mails de notification. + - Paramètres de localisation. - Mise à jour : - TinyMCE 4.9.11 diff --git a/core/core.php b/core/core.php index b8666d10..b9b031ea 100644 --- a/core/core.php +++ b/core/core.php @@ -39,7 +39,7 @@ class common { const ACCESS_TIMER = 1800; // Numéro de version - const ZWII_VERSION = '10.3.03'; + const ZWII_VERSION = '10.3.04'; const ZWII_UPDATE_CHANNEL = "v10"; public static $actions = []; diff --git a/core/layout/blank.php b/core/layout/blank.php index 3627afda..5e1266fa 100644 --- a/core/layout/blank.php +++ b/core/layout/blank.php @@ -2,12 +2,12 @@ - + showMetaTitle(); ?> showMetaDescription(); ?> - showMetaType(); ?> - showMetaImage(); ?> + showMetaType(); ?> + showMetaImage(); ?> showFavicon(); ?> showVendor(); ?> showStyle(); ?> diff --git a/core/layout/light.php b/core/layout/light.php index f45709f0..c3e3d6db 100644 --- a/core/layout/light.php +++ b/core/layout/light.php @@ -2,7 +2,7 @@ - + showMetaTitle(); ?> showMetaDescription(); ?> diff --git a/core/layout/main.php b/core/layout/main.php index 2e832ae5..4590235f 100644 --- a/core/layout/main.php +++ b/core/layout/main.php @@ -2,7 +2,7 @@ - + showMetaTitle(); ?> showMetaDescription(); ?> diff --git a/index.php b/index.php index 868c6738..89037a8e 100644 --- a/index.php +++ b/index.php @@ -25,7 +25,7 @@ if(version_compare(PHP_VERSION, '5.6.0', '<')) { *Localisation */ date_default_timezone_set('Europe/Paris'); -setlocale (LC_ALL, 'fr_FR.utf8','fra'); +setlocale (LC_ALL, 'fr_FR.utf8','fr_Fr'); /** * Initialisation de Zwii