From fb81fa6cf6338cb691ac6b64ca535f002c49581e Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Fri, 10 Dec 2021 15:57:51 +0100
Subject: [PATCH] sitemap

---
 CHANGES.md                               |   1 +
 core/module/sitemap/sitemap.php          | 110 +++++++++++------------
 core/module/sitemap/view/index/index.css |  21 ++---
 3 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 067c5ac6..79d87ffd 100755
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,6 +13,7 @@ Mises à jour :
         - la conversion des URL des ressources ne fonctionnait plus depuis l'externalisation du contenu des pages dans des fichiers séparés.
     - Multi-langues :
         - Bug auto détection du navigateur.
+    - Page site map, correction d'erreurs et rénovation de la présentation.
 - Modifications :
     - Gestion des cookies : 
         - Options de personnalisation du message d'acceptation des cookies, acceptation ou refus du cookie Google Analytics, affichage de la page des mentions légales.
diff --git a/core/module/sitemap/sitemap.php b/core/module/sitemap/sitemap.php
index 60f9a082..33ccf0eb 100644
--- a/core/module/sitemap/sitemap.php
+++ b/core/module/sitemap/sitemap.php
@@ -28,58 +28,21 @@ class sitemap extends common
     {
         $items = '<ul>';
         foreach ($this->getHierarchy(null, true, null) as $parentId => $childIds) {
-            $items .= '<li class="pageIcon">';
-            if ($this->getData(['page', $parentId, 'disable']) === false  && $this->getUser('group') >= $this->getData(['page', $parentId, 'group'])) {
-                $items .= '<a href="' .helper::baseUrl() . $parentId .'">'  .$this->getData(['page', $parentId, 'title']) . '</a>';
-               // $items .= '<';
-            } else {
-                // page désactivée
-                $items .= $this->getData(['page', $parentId, 'title']);
-            }
-			
-			// ou articles d'un blog
-			if ($this->getData(['page', $parentId, 'moduleId']) === 'blog'  &&
-			!empty($this->getData(['module',$parentId, 'posts' ]))) {
-				$items .= '<ul>';									
-				// Ids des articles par ordre de publication
-				$articleIdsPublishedOns = helper::arrayCollumn($this->getData(['module', $parentId,'posts']), 'publishedOn', 'SORT_DESC');
-				$articleIdsStates = helper::arrayCollumn($this->getData(['module', $parentId, 'posts']), 'state', 'SORT_DESC');
-				$articleIds = [];
-				foreach ($articleIdsPublishedOns as $articleId => $articlePublishedOn) {
-					if ($articlePublishedOn <= time() and $articleIdsStates[$articleId]) {
-						$articleIds[] = $articleId;
-					}
-				}
-				foreach ($articleIds as $articleId => $article) {
-					if ($this->getData(['module',$parentId,'posts',$article,'state']) === true) {
-						$items .= '<li class="articleIcon">';
-						$items .= '<a href="' . helper::baseUrl() . $parentId. '/' . $article . '">' . $this->getData(['module',$parentId,'posts',$article,'title']) . '</a>';
-						$items .= '</li>';
-					}
-				}
-				$items .= '</ul>';
-			} 
-            
-            foreach ($childIds as $childId) {
-				$items .= '<ul>';
-                // Sous-page
-				$items .= '<li class="pageIcon">';              
-                if ($this->getData(['page', $childId, 'disable']) === false && $this->getUser('group') >= $this->getData(['page', $parentId, 'group'])) {
-                    $items .= '<a href="' . helper::baseUrl() . $childId . '">' . $this->getData(['page', $childId, 'title']) . '</a>';
+            $items .= ' <li>';
+                if ($this->getData(['page', $parentId, 'disable']) === false  && $this->getUser('group') >= $this->getData(['page', $parentId, 'group'])) {
+                    $items .= '<a href="' .helper::baseUrl() . $parentId .'">'  .$this->getData(['page', $parentId, 'title']) . '</a>';
                 } else {
                     // page désactivée
-                    $items .=  $this->getData(['page', $childId, 'title']);
+                    $items .= $this->getData(['page', $parentId, 'title']);
                 }
-				$items .= '</li>';
-
-
-                // Articles d'une sous-page blog                
-                if ($this->getData(['page', $childId, 'moduleId']) === 'blog'  &&
-                            !empty($this->getData(['module', $childId, 'posts' ]))) {
-                    $items .= '<ul>';
+                // ou articles d'un blog
+                
+                if ($this->getData(['page', $parentId, 'moduleId']) === 'blog'  &&
+                !empty($this->getData(['module',$parentId, 'posts' ]))) {
+                    $items .= '<ul>';									
                     // Ids des articles par ordre de publication
-                    $articleIdsPublishedOns = helper::arrayCollumn($this->getData(['module', $childId,'posts']), 'publishedOn', 'SORT_DESC');
-                    $articleIdsStates = helper::arrayCollumn($this->getData(['module', $childId, 'posts']), 'state', 'SORT_DESC');
+                    $articleIdsPublishedOns = helper::arrayCollumn($this->getData(['module', $parentId,'posts']), 'publishedOn', 'SORT_DESC');
+                    $articleIdsStates = helper::arrayCollumn($this->getData(['module', $parentId, 'posts']), 'state', 'SORT_DESC');
                     $articleIds = [];
                     foreach ($articleIdsPublishedOns as $articleId => $articlePublishedOn) {
                         if ($articlePublishedOn <= time() and $articleIdsStates[$articleId]) {
@@ -87,20 +50,55 @@ class sitemap extends common
                         }
                     }
                     foreach ($articleIds as $articleId => $article) {
-                        if ($this->getData(['module',$childId,'posts',$article,'state']) === true) {
-                            $items .= '<li class="articleIcon">';
-                            $items .=  '<a href="' . helper::baseUrl() . $childId . '/' . $article . '">' . $this->getData(['module',$childId,'posts',$article,'title']) . '</a>';
+                        if ($this->getData(['module',$parentId,'posts',$article,'state']) === true) {
+                            $items .= ' <li>';
+                            $items .= '<a href="' . helper::baseUrl() . $parentId. '/' . $article . '">' . $this->getData(['module',$parentId,'posts',$article,'title']) . '</a>';
                             $items .= '</li>';
                         }
                     }
                     $items .= '</ul>';
+                } 
+                
+                foreach ($childIds as $childId) {
+                    $items .= '<ul>';
+                        // Sous-page
+                        $items .= ' <li>';              
+                        if ($this->getData(['page', $childId, 'disable']) === false && $this->getUser('group') >= $this->getData(['page', $parentId, 'group'])) {
+                            $items .= '<a href="' . helper::baseUrl() . $childId . '">' . $this->getData(['page', $childId, 'title']) . '</a>';
+                        } else {
+                            // page désactivée
+                            $items .=  $this->getData(['page', $childId, 'title']);
+                        }
+                        $items .= '</li>';
+
+                    // Articles d'une sous-page blog                
+                    if ($this->getData(['page', $childId, 'moduleId']) === 'blog'  &&
+                                !empty($this->getData(['module', $childId, 'posts' ]))) {
+                        $items .= '<ul>';
+                        // Ids des articles par ordre de publication
+                        $articleIdsPublishedOns = helper::arrayCollumn($this->getData(['module', $childId,'posts']), 'publishedOn', 'SORT_DESC');
+                        $articleIdsStates = helper::arrayCollumn($this->getData(['module', $childId, 'posts']), 'state', 'SORT_DESC');
+                        $articleIds = [];
+                        foreach ($articleIdsPublishedOns as $articleId => $articlePublishedOn) {
+                            if ($articlePublishedOn <= time() and $articleIdsStates[$articleId]) {
+                                $articleIds[] = $articleId;
+                            }
+                        }
+                        foreach ($articleIds as $articleId => $article) {
+                            if ($this->getData(['module',$childId,'posts',$article,'state']) === true) {
+                                $items .= ' <li>';
+                                $items .=  '<a href="' . helper::baseUrl() . $childId . '/' . $article . '">' . $this->getData(['module',$childId,'posts',$article,'title']) . '</a>';
+                                $items .= '</li>';
+                            }
+                        }
+                        $items .= '</ul>';
+                    }
+                    $items .= '</ul>';
                 }
-			$items .= '</li>';
-			// Fin du grand bloc
-			$items .= '</ul>';               
-            }
+            $items .= '</li>';
         }
-        
+        // Fin du grand bloc
+        $items .= '</ul>';    
 		self::$siteMap = $items;
 
         // Valeurs en sortie
diff --git a/core/module/sitemap/view/index/index.css b/core/module/sitemap/view/index/index.css
index b796d68a..598623d6 100755
--- a/core/module/sitemap/view/index/index.css
+++ b/core/module/sitemap/view/index/index.css
@@ -13,16 +13,17 @@
  */
 
  #siteMap ul {
-     list-style: none ;
-     margin-left: .5em;
-     padding-left: 1em;
-     line-height: 1.5em;
- }
-
-.pageIcon li::before {
-    content: "📄 ";
+    list-style: none ;
+    margin-left: .5em;
+    padding-left: 1em;
+    line-height: 1.5em;
+    font-size: 16px;
 }
 
-.articleIcon li::before {
-    content: "📝 ";
+#siteMap ul > li::before {
+   content: "📄 ";
+}
+
+#siteMap li > ul > li::before {
+   content: "📃 ";
 }
\ No newline at end of file