wip #2974 @0.5

diff --git a/src/app/Magic/Menu/Item.php b/src/app/Magic/Menu/Item.php
index 1f845d29d13a8eb78fdd44ae643224f48d6a0579..a9e090c3c46678437ac4c78bf402fa799756378e 100644 (file)
--- a/src/app/Magic/Menu/Item.php
+++ b/src/app/Magic/Menu/Item.php
@@ -455,34 +455,4 @@ class Item
     {
         $this->_urlAliases = $urlAliases;
     }
-
-    /**
-     * @param $menu Menu
-     */
-    public function makeMenu($menu)
-    {
-        foreach ($this->getChildren() as $child) {
-            $parent = $menu->add($child->getTitle(), $child->getHref());
-            // Handle items with submenus
-            if ($child->hasChildren()) {
-                // Create an empty sub-element that will serve as a wrapper for the submenu(s)
-
-
-                if ($child->getType() == 'mega') {
-                    foreach ($child->getChildren() as $submenu) {
-                        $wrapper = $parent->raw('')->attr(['class' => 'nav-submenu-wrapper']);
-                        $wrapper->raw($submenu->getTitle())->attr(['class' => 'nav-submenu-title']);
-                        foreach ($submenu->getChildren() as $subitem) {
-                            $wrapper->add($subitem->getTitle(), $subitem->getHref());
-                        }
-                    }
-                } else {
-                    $wrapper = $parent->raw('')->attr(['class' => 'nav-submenu-wrapper']);
-                    foreach ($child->getChildren() as $subitem) {
-                        $wrapper->add($subitem->getTitle(), $subitem->getHref());
-                    }
-                }
-            }
-        }
-    }
 }

diff --git a/src/app/Magic/Menu/Menu.php b/src/app/Magic/Menu/Menu.php
index 19e4872531ff2bf345fb0c17d7a4fb3d638bc6ff..eb0b0fa8e3d739143b570e841aa2a579bfdc3cb2 100644 (file)
--- a/src/app/Magic/Menu/Menu.php
+++ b/src/app/Magic/Menu/Menu.php
@@ -14,8 +14,21 @@ class Menu extends BaseMenu
      */
     protected static $_nav = null;
 
-    public function get($key)
+    protected const _STANDARD_PREFIX = 'cubist';
+
+    protected $_registeredMenuMakers = [];
+
+
+    public function registerMenuMaker($name, $callback)
     {
+        $this->_registeredMenuMakers[$name] = $callback;
+    }
+
+    public function get($key, $name = self::_STANDARD_PREFIX)
+    {
+        if ($name) {
+            $key = $name . '_' . $key;
+        }
         if (!$this->exists($key)) {
             $this->makeAllMenus();
         }
@@ -45,7 +58,7 @@ class Menu extends BaseMenu
      */
     public static function getAllNavigablePages()
     {
-        $pages = Menu::getNavigation()->findAll();
+        $pages = self::getNavigation()->findAll();
 
         $res = [];
 
@@ -101,19 +114,42 @@ class Menu extends BaseMenu
     {
         $nav = self::getNavigation();
         foreach ($nav->getChildren() as $main) {
-            $this->make($main->getName(), function ($menu) use ($main) {
-                $main->makeMenu($menu);
-            });
+            $this->makeStandardMenus($main);
         }
 
         // Also make a menu for the breadcrumbs - this one is simpler and doesn't have the submenu headings
-        $this->make('breadcrumbs', function ($menu) use ($nav) {
+        $this->make(self::_STANDARD_PREFIX . '_breadcrumbs', function ($menu) use ($nav) {
             // Start with home link
             $menu = $menu->add(__('Accueil'), '');
             $this->_addToBreadcrumbs($nav, $menu);
         });
     }
 
+    public function makeStandardMenus($item)
+    {
+        $this->make(self::_STANDARD_PREFIX . '_' . $item->getName(), function ($menu) use ($item) {
+            $this->makeStandardMenu($menu, $item);
+        });
+        foreach ($this->_registeredMenuMakers as $name => $registeredMenuMaker) {
+            $this->make($name . '_' . $item->getName(), function ($menu) use ($item, $registeredMenuMaker) {
+                call_user_func($registeredMenuMaker, $menu, $item);
+            });
+        }
+    }
+
+    public function makeStandardMenu($menu, $item)
+    {
+        foreach ($item->getChildren() as $child) {
+            $parent = $menu->add($child->getTitle(), $child->getHref());
+            // Handle items with submenus
+            if ($child->hasChildren()) {
+                foreach ($child->getChildren() as $subitem) {
+                    $parent->add($subitem->getTitle(), $subitem->getHref());
+                }
+            }
+        }
+    }
+
     /**
      * @param $nav Item
      * @param $menu \Lavary\Menu\Item
@@ -136,6 +172,14 @@ class Menu extends BaseMenu
         }
     }
 
+    public function getSearchBreadcrumbs()
+    {
+        foreach ($this->get('breadcrumbs')->crumbMenu()->all() as $item) {
+            $search_breadcrumbs[] = ['title' => $item->title, 'url' => $item->url()];
+        }
+        return $search_breadcrumbs;
+    }
+
     public function breadcrumbs()
     {
         $res = '<div class="breadcrumbs" itemscope itemtype="http://schema.org/BreadcrumbList">';

diff --git a/src/resources/config/cubist.php b/src/resources/config/cubist.php
index 086bef8d17b4bd15dbc7c1111e16653c013bcd0c..a231e8de273743257302693e29b383d3105976fc 100644 (file)
--- a/src/resources/config/cubist.php
+++ b/src/resources/config/cubist.php
@@ -1,4 +1,5 @@
 <?php
+
 return [
     'internal_search' => env('CUBIST_INTERNAL_SEARCH', false),
     'internal_search_index' => env('CUBIST_INTERNAL_SEARCH_INDEX', strtolower(env('APP_NAME', 'App_name') . '_' . env('APP_ENV', 'dev'))),