From 5c4324e14c6cf4cc7657cdee05ef8e8d3e559dd8 Mon Sep 17 00:00:00 2001
From: "pmoreno.rodriguez" <pmoreno.rodriguez@outlook.com>
Date: Sun, 26 Nov 2023 10:51:40 +0100
Subject: [PATCH] Macros redefined for navigation

---
 templates/macros/macros.html.twig             | 39 ++++++--------
 .../partials/sidebar_navigation.html.twig     | 54 ++++++-------------
 2 files changed, 30 insertions(+), 63 deletions(-)

diff --git a/templates/macros/macros.html.twig b/templates/macros/macros.html.twig
index a86f812..f34a9f5 100644
--- a/templates/macros/macros.html.twig
+++ b/templates/macros/macros.html.twig
@@ -20,30 +20,21 @@
 {% macro nav_loop(page) %}
   {% import _self as nav_macros %}
   {% for p in page.children.visible %}
-    {% set current_page = (p.active or p.activeChild) ? 'active' : '' %}
-    {% if p.children.visible.count > 0 %}
-      <li class="{{ current_page }}">
-        <a>
-          {% if p.header.icon %}
+    {% set active_page = (p.active or p.activeChild) ? 'active' : '' %}
+    {% set has_visible_children = p.children.visible.count > 0 %}
+    <li>
+      <a href="{{ p.url }}" class="{{ active_page }}">
+        {% if p.header.icon %}
             <i class="fa fa-{{ p.header.icon }}"></i>
-          {% endif %}
-          {{ p.menu }}
-            {% if p.routable ?? false %}&nbsp;<i class="fa fa-angle-down"></i>
-            {% endif %}
-        </a>
-        <ul>
-          {{ nav_macros.nav_loop(p) }}
-        </ul>
-      </li>
-    {% else %}
-      <li class="{{ current_page }}">
-        <a href="{{ p.url }}">
-          {% if p.header.icon %}
-            <i class="fa fa-{{ p.header.icon }}"></i>
-          {% endif %}
-          <span>{{ p.menu }}</span>
-        </a>
-      </li>
-    {% endif %}
+        {% endif %}
+        {{ p.menu }}
+        {% if has_visible_children %}&nbsp;<i class="fa fa-angle-down"></i>{% endif %}
+      </a>
+      {% if has_visible_children %}
+      <ul>
+        {{ nav_macros.nav_loop(p) }}
+      </ul>
+      {% endif %}
+    </li>
   {% endfor %}
 {% endmacro %}
\ No newline at end of file
diff --git a/templates/partials/sidebar_navigation.html.twig b/templates/partials/sidebar_navigation.html.twig
index 0a3fb7a..de48c68 100644
--- a/templates/partials/sidebar_navigation.html.twig
+++ b/templates/partials/sidebar_navigation.html.twig
@@ -1,34 +1,22 @@
 {% block menu_navigation %}
-  {% macro loop(page) %}
-    {% for p in page.children.visible %}
-      {% set current_page = (p.active or p.activeChild) ? 'active' : '' %}
-      {% if p.children.visible.count > 0 %}
-        <li class="{{ current_page }}">
-          <a class="dropdown-btn">
+{% macro loop(page) %}
+{% for p in page.children.visible %}
+    {% set current_page = (p.active or p.activeChild) ? 'active' : '' %}
+    <li class="{{ current_page }}">
+        <a href="{{ p.url }}">
             {% if p.header.icon %}
-              <i class="fa fa-{{ p.header.icon }}"></i>
-            {% endif %}
-            <span>{{ p.menu }}
-              {% if p.routable ?? false %}&nbsp;<i class="fa fa-caret-down"></i>
-              {% endif %}
-            </span>
-          </a>
-          <ul class="subitem_hide">
-            {{ _self.loop(p) }}
-          </ul>
-        </li>
-      {% else %}
-        <li class="{{ current_page }}">
-          <a href="{{ p.url }}">
-            {% if p.header.icon %}
-              <i class="fa fa-{{ p.header.icon }}"></i>
+                <i class="fa fa-{{ p.header.icon }}"></i>
             {% endif %}
             <span>{{ p.menu }}</span>
-          </a>
-        </li>
-      {% endif %}
-    {% endfor %}
-  {% endmacro %}
+        </a>
+        {% if p.children.visible.count > 0 %}
+            <ul class="subitem">
+                {{ _self.loop(p) }}
+            </ul>
+        {% endif %}
+    </li>
+{% endfor %}
+{% endmacro %}
   <ul class="menulink">
     {{ _self.loop(pages) }}
     {% if theme_var('custommenus.enabled') %}
@@ -44,16 +32,4 @@
       {% endfor %}
     {% endif %}
   </ul>
-{% endblock %}
-
-{% block javascripts %}
-<script>
-if ((window.innerWidth || document.documentElement.clientWidth) < 980){ 
-  /* Script for dropdown menu in sidebar */
-  $(".subitem_hide").hide(); /* this hides the list initially */
-      $(".dropdown-btn").click(function () {
-      $(this).next(".subitem_hide").slideToggle();
-  });
-  }
-</script>
 {% endblock %}
\ No newline at end of file