From 23fd7dcb41948c3a470ae5a0b906d38d24fde943 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Sat, 16 Mar 2019 15:14:04 +0100 Subject: [PATCH 1/7] [9.0.07] nav disappear when header is hidden --- CHANGES.md | 5 +++++ core/module/theme/theme.php | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index c197ce44..efa1df9b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,10 @@ # ChangeLog +## Version 9.0.07 +- Correction : + - Disparition du menu quand la bannière est masquée + + ## Version 9.0.06 - Correction : - Configuration des modes de codemirror diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php index 15627c28..bf6b2fba 100755 --- a/core/module/theme/theme.php +++ b/core/module/theme/theme.php @@ -323,8 +323,10 @@ class theme extends common { $position = str_replace ('body','site',$this->getData(['theme','menu','position'])); break; case 'body' : - $position = str_replace ('site','body',$this->getData(['theme','menu','position'])); + $position = str_replace ('site','body',$this->getData(['theme','menu','position'])); break; + default: + $position = $this->getData(['theme','menu','position']); } $this->setData(['theme', 'menu', [ 'backgroundColor' => $this->getData(['theme', 'menu', 'backgroundColor']), From 9649170c9440f9499f519059127bebea53479058 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Sat, 16 Mar 2019 16:25:54 +0100 Subject: [PATCH 2/7] =?UTF-8?q?[9.0.07]=20menu=20organis=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 3 ++- core/core.php | 28 +++++++++++++++++++++++++--- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index efa1df9b..08a981f7 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -3,7 +3,8 @@ ## Version 9.0.07 - Correction : - Disparition du menu quand la bannière est masquée - +- Modifications : + - Barre d'administration, pages organisées ## Version 9.0.06 - Correction : diff --git a/core/core.php b/core/core.php index abcaad0a..2ed62089 100644 --- a/core/core.php +++ b/core/core.php @@ -1076,7 +1076,6 @@ class common { * Mises à jour */ private function update() { - echo "pop"; // Version 8.1.0 if($this->getData(['core', 'dataVersion']) < 810) { $this->setData(['config', 'timezone', 'Europe/Paris']); @@ -2338,13 +2337,36 @@ class layout extends common { if($this->getUser('group') >= self::GROUP_MODERATOR) { $leftItems .= '
    • '; $leftItems .= '
  • ' . template::ico('plus') . '
    • '; if( From 383431dddf12fd882292861774329dc99f3518dd Mon Sep 17 00:00:00 2001 From: fredtempez Date: Sat, 16 Mar 2019 21:31:46 +0100 Subject: [PATCH 3/7] =?UTF-8?q?[9.0.07]=20default=20data=20cach=C3=A9e=20-?= =?UTF-8?q?>=20priv=C3=A9e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/core.php b/core/core.php index 2ed62089..eb345596 100644 --- a/core/core.php +++ b/core/core.php @@ -118,7 +118,7 @@ class common { 'barLeft' => '', 'barRight' => '' ], - 'cachee' => [ + 'privee' => [ 'typeMenu' => 'text', 'iconUrl' => '', 'disable' => false, @@ -137,7 +137,7 @@ class common { 'position' => 2, 'group' => self::GROUP_MEMBER, 'targetBlank' => false, - 'title' => 'Cachée', + 'title' => 'Privée', 'block' => '12', 'barLeft' => '', 'barRight' => '' From faf4130e38f9a4d560802a2a142f5e6f0935f780 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Sat, 16 Mar 2019 22:23:59 +0100 Subject: [PATCH 4/7] [9.0.07] Version --- core/core.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/core.php b/core/core.php index eb345596..19adf54a 100644 --- a/core/core.php +++ b/core/core.php @@ -30,7 +30,7 @@ class common { // Désactive l'update auto // const ZWII_VERSION = '9.0.05.dev.d'; // Numéro de version stable - const ZWII_VERSION = '9.0.06'; + const ZWII_VERSION = '9.0.07'; public static $actions = []; From 0ce8bd5d020e5b5e84a81497190dde99fd4982f0 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Sat, 16 Mar 2019 22:31:27 +0100 Subject: [PATCH 5/7] =?UTF-8?q?[9.0.07]=20libell=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/core.php b/core/core.php index 19adf54a..8010fc71 100644 --- a/core/core.php +++ b/core/core.php @@ -2344,7 +2344,7 @@ class layout extends common { if ($this->getData(['page', $parentPageId, 'position']) !== 0 && $orpheline ) { $orpheline = false; - $leftItems .= ''; + $leftItems .= ''; } // Exclure les barres if ($this->getData(['page', $parentPageId, 'block']) !== 'bar') { From 0656f50b3f38cda9a90b2356c42108572e9da2d2 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Sun, 17 Mar 2019 12:47:58 +0100 Subject: [PATCH 6/7] [9.0.07] Disable page color red in menu list --- core/core.php | 4 +++- core/layout/common.css | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/core/core.php b/core/core.php index 8010fc71..d395077a 100644 --- a/core/core.php +++ b/core/core.php @@ -2351,7 +2351,9 @@ class layout extends common { $leftItems .= ''; foreach($childrenPageIds as $childKey) { diff --git a/core/layout/common.css b/core/layout/common.css index 2a69ece0..73a45abc 100755 --- a/core/layout/common.css +++ b/core/layout/common.css @@ -63,6 +63,10 @@ li ul { margin: 0; } +option.inactive { + color: darkred; +} + /* Séparateur */ hr { border: 0; From 8bb0276561101d9e9c3f68ad59f4fb131275f891 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Sun, 17 Mar 2019 15:33:24 +0100 Subject: [PATCH 7/7] [9.0.07] bad selected position orphan page with child --- core/module/page/view/edit/edit.js.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/core/module/page/view/edit/edit.js.php b/core/module/page/view/edit/edit.js.php index f60ddd4e..4eb3ed0b 100755 --- a/core/module/page/view/edit/edit.js.php +++ b/core/module/page/view/edit/edit.js.php @@ -414,6 +414,9 @@ $("#pageEditModuleConfig").on("click", function() { */ var hierarchy = getHierarchy()); ?>; var pages = getData(['page'])); ?>; +// 9.0.07 corrige une mauvaise sélection d'une page orpheline avec enfant +var positionInitial = getData(['page',$this->getUrl(2),"position"]); ?>; +// 9.0.07 $("#pageEditParentPageId").on("change", function() { var positionDOM = $("#pageEditPosition"); positionDOM.empty().append( @@ -428,7 +431,7 @@ $("#pageEditParentPageId").on("change", function() { // Liste des pages sans parents for(var key in hierarchy) { if(hierarchy.hasOwnProperty(key)) { - // Sélectionne la page avant si il s'agit de la page courante + // Sélectionne la page avant s'il s'agit de la page courante if(key === "getUrl(2); ?>") { positionSelected = positionPrevious; } @@ -443,6 +446,11 @@ $("#pageEditParentPageId").on("change", function() { } } } + // 9.0.07 corrige une mauvaise sélection d'une page orpheline avec enfant + if (positionInitial === 0) { + positionSelected = 0; + } + // 9.0.07 } // Un page parent est selectionnée else {