From f044bd895712e0e1631d13a1843056cb85c246af Mon Sep 17 00:00:00 2001
From: Sami Mokaddem <sami.mokaddem@circl.lu>
Date: Wed, 23 Feb 2022 10:19:16 +0100
Subject: [PATCH] chg: [layout:sidebar] Only show collapsible parents if they
 have children

---
 templates/element/layouts/sidebar/entry.php | 66 +++++++++++----------
 webroot/css/layout.css                      |  4 ++
 2 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/templates/element/layouts/sidebar/entry.php b/templates/element/layouts/sidebar/entry.php
index 0d7c79c..81949a1 100644
--- a/templates/element/layouts/sidebar/entry.php
+++ b/templates/element/layouts/sidebar/entry.php
@@ -8,7 +8,7 @@
     if (!empty($children)) {
         $url = "#{$seed}";
     } else {
-        $url = $parent['url'] ?? '#';
+        $url = $parent['url'] ?? false;
     }
 
     $controller = \Cake\Utility\Inflector::variable($this->request->getParam('controller'));
@@ -59,38 +59,40 @@
 ?>
 
 <li class="<?= !empty($children) ? 'parent collapsed' : '' ?>">
-    <a
-        class="d-flex align-items-center sidebar-link <?= !empty($children) ? 'collapsed' : '' ?> <?= $active ? 'active' : '' ?> <?= $hasActiveChild ? 'have-active-child' : '' ?>"
-        href="<?= h($url) ?>"
-        <?= !empty($children) ? 'data-bs-toggle="collapse"' : '' ?>
-        <?= $hasActiveChild ? 'aria-expanded="true"' : '' ?>
-    >
-        <i class="position-relative sidebar-icon <?= $this->FontAwesome->getClass($icon) ?>">
-            <?php
-            if ($childHasNotification || ($hasNotification && !empty($children))) {
-                echo $this->Bootstrap->notificationBubble([
-                    'variant' => $childHasNotification ? $childNotificationVariant : $notificationVariant,
+    <?php if (!empty($children) || !empty($url)): ?>
+        <a
+            class="d-flex align-items-center sidebar-link <?= !empty($children) ? 'collapsed' : '' ?> <?= $active ? 'active' : '' ?> <?= $hasActiveChild ? 'have-active-child' : '' ?>"
+            href="<?= h($url) ?>"
+            <?= !empty($children) ? 'data-bs-toggle="collapse"' : '' ?>
+            <?= $hasActiveChild ? 'aria-expanded="true"' : '' ?>
+        >
+            <i class="position-relative sidebar-icon <?= $this->FontAwesome->getClass($icon) ?>">
+                <?php
+                if ($childHasNotification || ($hasNotification && !empty($children))) {
+                    echo $this->Bootstrap->notificationBubble([
+                        'variant' => $childHasNotification ? $childNotificationVariant : $notificationVariant,
+                    ]);
+                }
+                ?>
+            </i>
+            <span class="text"><?= h($label) ?></span>
+                <?php
+                if (empty($children) && $hasNotification) {
+                    echo $this->Bootstrap->badge([
+                        'text' => $notificationAmount,
+                        'class' => 'ms-auto',
+                        'variant' => $notificationVariant,
+                    ]);
+                }
+                ?>
+        </a>
+        <?php if (!empty($children)): ?>
+            <?= $this->element('layouts/sidebar/sub-menu', [
+                    'seed' => $seed,
+                    'children' => $children,
+                    'open' => $hasActiveChild,
                 ]);
-            }
             ?>
-        </i>
-        <span class="text"><?= h($label) ?></span>
-            <?php
-            if (empty($children) && $hasNotification) {
-                echo $this->Bootstrap->badge([
-                    'text' => $notificationAmount,
-                    'class' => 'ms-auto',
-                    'variant' => $notificationVariant,
-                ]);
-            }
-            ?>
-    </a>
-    <?php if (!empty($children)): ?>
-        <?= $this->element('layouts/sidebar/sub-menu', [
-                'seed' => $seed,
-                'children' => $children,
-                'open' => $hasActiveChild,
-            ]);
-        ?>
+        <?php endif; ?>
     <?php endif; ?>
 </li>
diff --git a/webroot/css/layout.css b/webroot/css/layout.css
index 92a6afe..4625b2b 100644
--- a/webroot/css/layout.css
+++ b/webroot/css/layout.css
@@ -328,6 +328,10 @@ ul.sidebar-elements > li > a.sidebar-link > * {
     vertical-align: middle;
 }
 
+ul.sidebar-elements li.parent .sub-menu > li > a.sidebar-link > i.sidebar-icon {
+    margin-right: 8px;
+}
+
 ul.sidebar-elements > li > a.sidebar-link > i.sidebar-icon {
     margin-right: 10px;
     font-size: 19px;