menu et fil d'ariane gèrent le champ reachable dans page

5 files changed, 48 insertions, 41 deletions

diff --git a/public/css/nav.css b/public/css/nav.css
index d51c58a..bff3896 100644
--- a/public/css/nav.css
+++ b/public/css/nav.css
@@ -48,14 +48,17 @@ ul
         background-color: white;
         font-weight: bold;
 }
-.drop-down > p::after
+.drop-down > a > p::after
 {
         content: ' ▼';
         font-size: x-small;
 }
 
-.drop-down:hover > .sub-menu /* faire apparaître sub-menu */
-{
+/* faire apparaître sub-menu */
+.drop-down:hover > .sub-menu{
+        display: block;
+}
+.drop-right:hover > .sub-menu{
         display: block;
 }
 .sub-menu
@@ -71,7 +74,7 @@ ul
 {
         background-color: #ffff00;
 }
-.drop-down .sub-menu .drop-down > p:after /* bricolage? */
+.drop-right > a > p:after
 {
         content: " ▶";
         font-size: x-small;
@@ -83,11 +86,11 @@ nav > ul > li > ul
         position: absolute; /* retire du flux, positionnement par rapport à la fenêtre */
 }
 /* élément du menu survolé, le positionnement relatif en fait la référence du positionnement suivant */
-.drop-down .sub-menu .drop-down
+.drop-right
 {
         position: relative;
 }
-.drop-down .sub-menu .drop-down .sub-menu
+.drop-right .sub-menu
 {
         position: absolute; /* positionnement par rapport au précédent "position" en CSS */
         left: 100%;
diff --git a/src/model/Menu.php b/src/model/Menu.php
index 624a0fc..403accf 100644
--- a/src/model/Menu.php
+++ b/src/model/Menu.php
@@ -20,12 +20,12 @@ class Menu extends Page
             ->getResult(); // :array de Page
 
         if(count($bulk_data) === 0){
-            makeStartPage($entityManager);
+            makeStartPage($entityManager); // => installation.php
         }
 
         foreach($bulk_data as $first_level_entries){
-            // génération du menu
-            if($first_level_entries->getInMenu()){
+            // dans le menu
+            if($first_level_entries->isInMenu()){
                 $this->addChild($first_level_entries);
             }
             // autres pages
diff --git a/src/model/entities/Page.php b/src/model/entities/Page.php
index fbf0f27..c40a297 100644
--- a/src/model/entities/Page.php
+++ b/src/model/entities/Page.php
@@ -73,7 +73,11 @@ class Page
     {
         return $this->end_of_path;
     }
-    public function getInMenu(): bool
+    public function isReachable(): bool
+    {
+        return $this->reachable;
+    }
+    public function isInMenu(): bool
     {
         return $this->in_menu;
     }
@@ -112,7 +116,6 @@ class Page
         {
             for($i = 0; $i < $iteration - 1; $i++)
             {
-                //echo '<br>' . $this->children[$i]->getPosition() . ' - ' . $this->children[$i + 1]->getPosition();
                 if($this->children[$i]->getPosition() > $this->children[$i + 1]->getPosition())
                 {
                     $tmp = $this->children[$i];
diff --git a/src/view/BreadcrumbBuilder.php b/src/view/BreadcrumbBuilder.php
index f1fdddf..77f4c4c 100644
--- a/src/view/BreadcrumbBuilder.php
+++ b/src/view/BreadcrumbBuilder.php
@@ -7,10 +7,10 @@ class BreadcrumbBuilder extends AbstractBuilder
 {
     public function __construct(Node $node)
     {
-        $this->html = $this->breadcrumbHTML(false);
+        $this->html = $this->breadcrumbHTML();
     }
 
-    private function breadcrumbHTML(bool $links = false): string
+    private function breadcrumbHTML(): string
     {
         $asset = 'assets/home.svg'; // => BDD?
         $breadcrumb_array = Director::$page_path->getArray(); // tableau de Page
@@ -23,21 +23,16 @@ class BreadcrumbBuilder extends AbstractBuilder
             $html .= '<nav class="breadcrumb" aria-label="Breadcrumb">' . "\n";
             $html .= '<a href="' . new URL . '"><img src="' . $asset . '"></a><span class="arrow"> →</span>' . "\n";
 
-            // partie intermédiaire
+            // partie intermédiaire (pas de lien sur le dernier élément)
             for($i = 0; $i < ($nb_of_entries - 1); $i++)
             {
                 // liens optionnels
-                if($links)
+                if($breadcrumb_array[$i]->isReachable())
                 {
-                    $html .= '<a href="';
-                    for($j = 1; $j < $i; $j++) // chemin sans la fin
-                    {
-                        $html .= new URL(['page' => $breadcrumb_array[$i]->getPagePath()]); 
-                    }
-                    $html .= '">';
+                    $html .= '<a href="' . new URL(['page' => $breadcrumb_array[$i]->getPagePath()]) . '">';
                 }
                 $html .= '<span>' . $breadcrumb_array[$i]->getPageName() . '</span>';
-                if($links)
+                if($breadcrumb_array[$i]->isReachable())
                 {
                     $html .= '</a>';
                 }
diff --git a/src/view/NavBuilder.php b/src/view/NavBuilder.php
index e7254b1..2ef6bc8 100644
--- a/src/view/NavBuilder.php
+++ b/src/view/NavBuilder.php
@@ -22,20 +22,12 @@ class NavBuilder extends AbstractBuilder
 
         foreach($nav_data->getChildren() as $data)
         {
-            $class = '';
+            $li_class = '';
             if(isset($current[$level]) && $data->getEndOfPath() === $current[$level]->getEndOfPath()){
-                $class = ' current';
+                $li_class = 'current';
             }
-            
-            if(count($data->getChildren()) > 0) // titre de catégorie
-            {
-                $nav_html .= '<li class="drop-down'. $class . '"><p>' . $data->getPageName() . '</p><ul class="sub-menu">' . "\n";
-                $level++;
-                $nav_html .= $this->navMainHTML($data, $current);
-                $level--;
-                $nav_html .= '</ul></li>' . "\n";
-            }
-            else
+
+            if($data->isReachable())
             {
                 $target = '';
                 if(str_starts_with($data->getEndOfPath(), 'http')) // lien vers autre site
@@ -47,14 +39,28 @@ class NavBuilder extends AbstractBuilder
                 {
                     $link = new URL(['page' => $data->getPagePath()]); // $link = objet
                 }
-                /*else
-                {
-                    echo "else page d'accueil" . '<br>';
-                    $link = new URL; // page d'accueil
-                }*/
-
-                $nav_html .= '<a href="' . $link . '"' . $target . '><li class="'. $class . '"><p>' . $data->getPageName() . '</p></li></a>' . "\n";
+                $nav_html .= '<a href="' . $link . '"' . $target . '>';
+            }
+            else{
+                $nav_html .= '<a>';
             }
+            
+            if(count($data->getChildren()) > 0) // titre de catégorie
+            {
+                $li_class = $data->getParent() == null ? 'drop-down' : 'drop-right';
+                
+                $nav_html .= '<li class="'. $li_class . '"><p>' . $data->getPageName() . '</p><ul class="sub-menu">' . "\n";
+                $level++;
+                $nav_html .= $this->navMainHTML($data, $current);
+                $level--;
+                $nav_html .= '</ul></li>' . "\n";
+            }
+            else
+            {
+                $nav_html .= '<li class="'. $li_class . '"><p>' . $data->getPageName() . '</p></li>' . "\n";
+            }
+            
+            $nav_html .= "</a>\n";
         }
         return $nav_html;
     }