wip #2922 @0.25

diff --git a/app/Http/Middleware/Menu.php b/app/Http/Middleware/Menu.php
index 93ad10092cee86d7b875a2c74302644597ff6c7c..b86e902b185871d9673d4f5fdaae5377e6fd0cb6 100644 (file)
--- a/app/Http/Middleware/Menu.php
+++ b/app/Http/Middleware/Menu.php
@@ -19,9 +19,13 @@ class Menu
     public function makePMIMenu($menu, $item)
     {
         foreach ($item->getChildren() as $child) {
+            if (!$child->isMenuDesktop()) {
+                continue;
+            }
             $parent = $menu->add($child->getTitle(), $child->getHref());
+
             // Handle items with submenus
-            if ($child->hasChildren()) {
+            if ($child->isMenuDesktopChildren() && $child->hasChildren()) {
                 // Create an empty sub-element that will serve as a wrapper for the submenu(s)
 
                 if ($child->getType() == 'mega') {

diff --git a/app/Templates/Catalog.php b/app/Templates/Catalog.php
index 66b34ff065f34a493fd21264cfd16220216db8e1..044e237f52ce334c48730c2a9b09a86140acaace 100644 (file)
--- a/app/Templates/Catalog.php
+++ b/app/Templates/Catalog.php
@@ -53,6 +53,7 @@ class Catalog extends TemplateAbstract
                 $category->setHref($productType->getSlugOrTitleAttribute());
                 $category->setId('product_type/' . $productType->id);
                 $category->setController(['controller' => 'ProductController', 'action' => 'productList', 'params' => ['id' => $productType->id]]);
+                $category->showInAllMenus();
 
                 $count = 0;
                 foreach ($products as $product) {
@@ -68,6 +69,7 @@ class Catalog extends TemplateAbstract
                     $detail->setHref($product->getSlugOrTitleAttribute());
                     $detail->setId('product/' . $product->id);
                     $detail->setController(['controller' => 'ProductController', 'action' => 'productDetails', 'params' => ['id' => $product->id]]);
+                    $detail->hideInAllMenus();
                     $category->addChild($detail);
                     $count++;
                 }

diff --git a/app/Templates/News.php b/app/Templates/News.php
index 132ba079a8ccedacc7d3de7514570b08b7f1dc33..9cd43b7f4210cba072aa7d7fd67df851836419f8 100644 (file)
--- a/app/Templates/News.php
+++ b/app/Templates/News.php
@@ -36,6 +36,7 @@ class News extends Base
             $item->setHref($newsItem->slug); // Todo: consider having a configurable / translatable prefix for news URLs
             $item->setId('news/' . $newsItem->id);
             $item->setController(['controller' => 'NewsController', 'action' => 'view', 'params' => ['id' => $newsItem->id]]);
+            $item->hideInAllMenus();
             $menu->addChild($item);
         }
 

diff --git a/app/Templates/Solution.php b/app/Templates/Solution.php
index 7ca91805ac009eaaf9c9382874743b00e5a6549b..d565b97627d10294845cdd8da5e6af36ac496c9a 100644 (file)
--- a/app/Templates/Solution.php
+++ b/app/Templates/Solution.php
@@ -51,6 +51,7 @@ class Solution extends Base
             $item->setHref($application->getSlugOrTitleAttribute());
             $item->setId('application/' . $application->id);
             $item->setController(['controller' => 'ApplicationController', 'action' => 'view', 'params' => ['id' => $application->id]]);
+            $item->hideInAllMenus();
             $menu->addChild($item);
         }
 

diff --git a/resources/js/menu.js b/resources/js/menu.js
index 90595f9640acb54fe03a99a919e07e6b2fdd75a8..c22d929eca6769a9f942c40be53067cf995dfa98 100644 (file)
--- a/resources/js/menu.js
+++ b/resources/js/menu.js
@@ -21,7 +21,6 @@ document.addEventListener(
                     event.stopPropagation();
 
                     if (null === document.querySelector('.mm--close')) {
-                        console.log(':)');
                         nav.innerHTML = '<a class="mm--close"></a>' + nav.innerHTML;
 
                         document.querySelector('.mm--close').addEventListener('click', (event) => {
@@ -38,7 +37,6 @@ document.addEventListener(
 );
 
 function checkOpenSubmenu() {
-    console.log(document.querySelector('#mobile-nav.mm--open.mm--main'));
     if (null === document.querySelector('#mobile-nav.mm--open.mm--main')) {
         document.body.classList.add('mm--subopen');
     } else {