From 43b08e4dd8b88ce936458bb39b67efe9c6f2acb2 Mon Sep 17 00:00:00 2001
From: Rad Cirskis <nad2000@gmail.com>
Date: Sat, 13 Aug 2022 01:45:56 +1200
Subject: [PATCH 1/2] make active current model in the navigation

---
 admin_volt/templates/admin/sidebar.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin_volt/templates/admin/sidebar.html b/admin_volt/templates/admin/sidebar.html
index 544fc61..cb09bc3 100644
--- a/admin_volt/templates/admin/sidebar.html
+++ b/admin_volt/templates/admin/sidebar.html
@@ -79,9 +79,9 @@ <h2 class="h5 mb-3">Hi, {{ request.user.first_name|default:request.user.username
                                     <ul class="flex-column nav">
                                         {% for model in app.models %}
                                             {% if model.url %}
-                                                <li class="nav-item {% if 'bootstrap-tables' in segment %} active {% endif %}">
+                                              <li class="nav-item{% if 'bootstrap-tables' in segment or model.url in request.path|urlencode %} active {% endif %}">
                                                     <a class="nav-link" href="{{ model.url }}">
-                                                        <span class="sidebar-text">{{ model.label }}</span>
+                                                      <span class="sidebar-text">{{ model.label }}</span>
                                                     </a>
                                                 </li>
                                             {% else %}
@@ -97,4 +97,4 @@ <h2 class="h5 mb-3">Hi, {{ request.user.first_name|default:request.user.username
             {% endif %}
         </ul>
     </div>
-</nav>
\ No newline at end of file
+</nav>

From ec59c716c59ff23f380a1bfe740cd906bd6e42d1 Mon Sep 17 00:00:00 2001
From: Rad Cirskis <nad2000@gmail.com>
Date: Sat, 13 Aug 2022 02:15:14 +1200
Subject: [PATCH 2/2] expended application nav-time list for the current
 selected application of or moded

---
 admin_volt/templates/admin/sidebar.html | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/admin_volt/templates/admin/sidebar.html b/admin_volt/templates/admin/sidebar.html
index cb09bc3..f38fe85 100644
--- a/admin_volt/templates/admin/sidebar.html
+++ b/admin_volt/templates/admin/sidebar.html
@@ -60,10 +60,12 @@ <h2 class="h5 mb-3">Hi, {{ request.user.first_name|default:request.user.username
                 {% for app in app_list %}
                     {% if app.has_perms and not app.pinned %}
                         <li class="nav-item">
-                            <span class="nav-link collapsed d-flex justify-content-between align-items-center" data-bs-toggle="collapse" data-bs-target="#submenu-{{ app.app_label }}">
+                          <span class="nav-link{% if app_label != app.label and app.url not in request.path|urlencode  %} collapsed{% endif %} d-flex justify-content-between align-items-center" data-bs-toggle="collapse" data-bs-target="#submenu-{{ app.app_label }}">
                                 <span>
                                     <span class="sidebar-icon {{ app.icon }}"></span>
-                                    <span class="sidebar-text">{{ app.label|slice:18 }}{% if app.label|length > 18 %}..{% endif %}</span>
+                                    <a href="{{ app.url }}">
+                                      <span class="sidebar-text">{{ app.label|slice:18 }}{% if app.label|length > 18 %}..{% endif %}</span>
+                                    </a>
                                 </span>
                                 {% if app.models %}
                                     <span class="link-arrow">
@@ -75,7 +77,8 @@ <h2 class="h5 mb-3">Hi, {{ request.user.first_name|default:request.user.username
                             </span>
 
                             {% if app.models %}
-                                <div class="multi-level collapse {% if 'tables-bootstrap-' in segment %} show {% endif %}" role="list" id="submenu-{{ app.app_label }}" aria-expanded="false">
+                              <div class="multi-level collapse {% if 'tables-bootstrap-' in segment or app_label == app.label or app.url in request.path|urlencode %} show {% endif %}" role="list" id="submenu-{{ app.app_label }}"  
+                                                                                                                                      aria-expanded="{% if app_label == app.label or app.url in request.path|urlencode %}true{% else %}false{% endif %}">
                                     <ul class="flex-column nav">
                                         {% for model in app.models %}
                                             {% if model.url %}