fix: alfred icons only shown on pagebuilder blocks

baumrock · Jan 12, 2023 · 811a296 · 811a296
1 parent 9360b10
commit 811a296
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/RockFrontend.module.php b/RockFrontend.module.php
@@ -106,7 +106,7 @@ public static function getModuleInfo()
   {
     return [
       'title' => 'RockFrontend',
-      'version' => '2.13.0',
+      'version' => '2.13.1',
       'summary' => 'Module for easy frontend development',
       'autoload' => true,
       'singular' => true,
@@ -718,6 +718,7 @@ public function ___getIcons($page, $opt)
       }
     }
 
+    // icon to edit page
     if ($page and $page->editable() and $opt->edit) {
       $icons[] = (object)[
         'icon' => 'edit',
@@ -738,7 +739,7 @@ public function ___getIcons($page, $opt)
       }
     }
 
-    if ($this->wire->user->isSuperuser() and $page instanceof Block) {
+    if ($this->wire->user->isSuperuser()) {
       $tracy = $this->wire->config->tracy;
       if (is_array($tracy) and array_key_exists('localRootPath', $tracy))
         $root = $tracy['localRootPath'];
@@ -755,7 +756,7 @@ public function ___getIcons($page, $opt)
 
       $ext = pathinfo($link, PATHINFO_EXTENSION);
 
-      // controller edit link
+      // php file edit link
       $php = substr($opt->path, 0, strlen($ext) * -1 - 1) . ".php";
       if (is_file($php)) {
         $php = str_replace($this->wire->config->paths->root, $root, $php);

diff --git a/profiles/rock/files/site/templates/sections/header.latte b/profiles/rock/files/site/templates/sections/header.latte
@@ -27,11 +27,12 @@
             {define mainmenu, $items, $first}
               {foreach $items as $item}{* loop all items*}
                 {* define variables for inside the loop *}
+                {var $selector = ""} {* exclude child items here *}
                 {var $show = ($rockfrontend->isActive($item) or $item->parents->count()===1)}
                 {var $inDropdown = $item->parents->count()>1}
                 {var $active = $inDropdown ? $item==$page : $rockfrontend->isActive($item)}
                 {var $subid = "menu-".$item->id}
-                {var $numc = ($item->children()->count() && $item!==$first) }
+                {var $numc = ($item->children($selector)->count() && $item!==$first) }
                 {* list item markup *}
                 <li n:class="$active ? 'uk-active'">
                   <a
@@ -50,7 +51,9 @@
                     >
                       {include
                         mainmenu,
-                        $inDropdown ? $item->children()->prepend($item) : $item->children(),
+                        $inDropdown
+                          ? $item->children($selector)->prepend($item)
+                          : $item->children($selector),
                         $item
                       }
                     </ul>