From 9649170c9440f9499f519059127bebea53479058 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Sat, 16 Mar 2019 16:25:54 +0100
Subject: [PATCH] =?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 .= '<li><select id="barSelectPage">';
 				$leftItems .= '<option value="">Choisissez une page</option>';
+				$leftItems .= '<optgroup label="Pages orphelines">';
+				$orpheline = true ;
 				$currentPageId = $this->getData(['page', $this->getUrl(0)]) ? $this->getUrl(0) : $this->getUrl(2);			
-				foreach($this->getHierarchy(null, false) as $parentPageId => $childrenPageIds) {
+				foreach($this->getHierarchy(null,false) as $parentPageId => $childrenPageIds) {
+					if ($this->getData(['page', $parentPageId, 'position']) !== 0  &&
+						$orpheline ) {
+							$orpheline = false;
+							$leftItems .= '<optgroup label="Pages dans le menu">';
+					} 
+					// Exclure les barres
+					if ($this->getData(['page', $parentPageId, 'block']) !== 'bar') {
+						$leftItems .= '<option value="' . 
+									helper::baseUrl() . 
+									$parentPageId . '"' . 
+									($parentPageId === $currentPageId ? ' selected' : false) . 	'>' . 
+									$this->getData(['page', $parentPageId, 'title']) . 
+									'</option>';
+						foreach($childrenPageIds as $childKey) {
+							$leftItems .= '<option value="' . helper::baseUrl() . $childKey . '"' . ($childKey === $currentPageId ? ' selected' : false) . '>&nbsp;&nbsp;&nbsp;&nbsp;' . $this->getData(['page', $childKey, 'title']) . '</option>';
+						}
+					}
+				}
+				// Afficher les barres
+				$leftItems .= '<optgroup label="Barres latérales">';
+				foreach($this->getHierarchy(null, false,true) as $parentPageId => $childrenPageIds) {
 					$leftItems .= '<option value="' . helper::baseUrl() . $parentPageId . '"' . ($parentPageId === $currentPageId ? ' selected' : false) . '>' . $this->getData(['page', $parentPageId, 'title']) . '</option>';
 					foreach($childrenPageIds as $childKey) {
 						$leftItems .= '<option value="' . helper::baseUrl() . $childKey . '"' . ($childKey === $currentPageId ? ' selected' : false) . '>&nbsp;&nbsp;&nbsp;&nbsp;' . $this->getData(['page', $childKey, 'title']) . '</option>';
 					}
-				}
+				}				
 				$leftItems .= '</select></li>';
 				$leftItems .= '<li><a href="' . helper::baseUrl() . 'page/add" data-tippy-content="Créer une page ou<br>une barre latérale">' . template::ico('plus') . '</a></li>';
 				if(