From 8abc0a4a30d55ff8060c1546be0e0f5e1980d395 Mon Sep 17 00:00:00 2001
From: Thomas Rusiecki <rusieckithomas@gmail.com>
Date: Thu, 27 Feb 2025 08:19:52 -0300
Subject: [PATCH] fix for incorrect submenu collpase

---
 dashboard/templates/base.html | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/dashboard/templates/base.html b/dashboard/templates/base.html
index 2123b5e..c1f3030 100644
--- a/dashboard/templates/base.html
+++ b/dashboard/templates/base.html
@@ -81,7 +81,7 @@
           <div class="position-sticky pt-5">
             <ul class="nav flex-column">
 
-              <!-- User submenu-->
+              <!-- Admin submenu-->
 	            {% if user.is_admin %}
               {% with is_path=request.path|startswith:'/admin' %}
               <li class="nav-item">
@@ -168,11 +168,11 @@
               <!--Evidences submenu -->
               {% with is_path=request.path|startswith:'/evidence,/device/add' %}
               <li class="nav-item">
-                <a class="admin {% if is_evidence_path %} active {% endif %}nav-link fw-bold" data-bs-toggle="collapse" data-bs-target="#ul_evidences" aria-expanded="false" aria-controls="ul_evidences" href="javascript:void()">
+                <a class="admin {% if is_path %} active {% endif %}nav-link fw-bold" data-bs-toggle="collapse" data-bs-target="#ul_evidences" aria-expanded="false" aria-controls="ul_evidences" href="javascript:void()">
                   <i class="bi bi-usb-drive icon_sidebar"></i>
                   {% trans 'Evidences' %}
                 </a>
-                <ul class="flex-column mb-2 ul_sidebar accordion-collapse {% if path in 'upload list import add' %}expanded{% else %}collapse{% endif %}" id="ul_evidences" data-bs-parent="#sidebarMenu">
+                <ul class="flex-column mb-2 ul_sidebar accordion-collapse {% if is_path %}expanded{% else %}collapse{% endif %}" id="ul_evidences" data-bs-parent="#sidebarMenu">
                   <li class="nav-item">
                     <a class="nav-link{% if path == 'list' and is_path %} active2{% endif %}" href="{% url 'evidence:list' %}">
                       {% trans 'List of evidences' %}
@@ -239,8 +239,14 @@
             </div>
           </div>
 
-          {% block content %}
-          {% endblock content %}
+          <div class="d-flex flex-wrap gap-2 justify-content-end m-2 mb-4">
+            {% block actions %}
+            {% endblock %}
+          </div>
+          <div class= "mx-2">
+            {% block content %}
+            {% endblock content %}
+          </div>
 
         </main>
       </div>