From 8c244acd003b93839e30a859706ac9cae413da75 Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@puigdefabregas.eu>
Date: Tue, 4 Feb 2025 15:48:47 +0100
Subject: [PATCH] change menu bar structure

---
 dashboard/templates/base.html    | 45 +++++++++++---------------------
 dashboard/urls.py                |  4 +--
 device/templates/new_device.html |  2 +-
 device/views.py                  |  2 +-
 evidence/templates/upload.html   |  6 ++---
 login/views.py                   |  9 +++----
 lot/templates/delete_lot.html    |  2 +-
 lot/templates/new_lot.html       |  2 +-
 lot/views.py                     | 10 +++----
 9 files changed, 33 insertions(+), 49 deletions(-)

diff --git a/dashboard/templates/base.html b/dashboard/templates/base.html
index de53139..94ab6dc 100644
--- a/dashboard/templates/base.html
+++ b/dashboard/templates/base.html
@@ -115,24 +115,17 @@
               </li>
 	      {% endif %}
               <li class="nav-item">
-                <a class="admin {% if path == 'unassigned_devices' %}active {% endif %}nav-link fw-bold" data-bs-toggle="collapse" data-bs-target="#ul_devices" aria-expanded="false" aria-controls="ul_devices" href="javascript:void()">
-                  <i class="bi bi-laptop icon_sidebar"></i>
-                  {% trans 'Devices' %}
-                </a>
-                <ul class="flex-column mb-2 ul_sidebar accordion-collapse {% if path == 'unassigned_devices' %}expanded{% else %}collapse{% endif %}" id="ul_devices" data-bs-parent="#sidebarMenu">
-                  <li class="nav-item">
-                    <a class="nav-link{% if path == 'unassigned_devices' %} active2{% endif %}" href="{% url 'dashboard:unassigned_devices' %}">
-                      {% trans 'Unassigned devices' %}
-                    </a>
-                  </li>
-                </ul>
-              </li>
-              <li class="nav-item">
-                <a class="admin {% if path == 'tags' or path == 'lot' %}active {% endif %}nav-link fw-bold" data-bs-toggle="collapse" data-bs-target="#ul_lots" aria-expanded="false" aria-controls="ul_lots" href="javascript:void()">
+                <a class="admin {% if path == 'tag' or path in 'unassigned dashboard' %}active {% endif %}nav-link fw-bold" data-bs-toggle="collapse" data-bs-target="#ul_lots" aria-expanded="false" aria-controls="ul_lots" href="javascript:void()">
                   <i class="bi bi-database icon_sidebar"></i>
                   {% trans 'Lots' %}
                 </a>
-                <ul class="flex-column mb-2 ul_sidebar accordion-collapse {% if path == 'tags' or path == 'lot' %}expanded{% else %}collapse{% endif %}" id="ul_lots" data-bs-parent="#sidebarMenu">
+                <ul class="flex-column mb-2 ul_sidebar accordion-collapse {% if path == 'tag' or path in 'unassigned dashboard' %}expanded{% else %}collapse{% endif %}" id="ul_lots" data-bs-parent="#sidebarMenu">
+		  <li class="nav-item">
+                    <a class="nav-link{% if path == 'unassigned' %} active2{% endif %}" href="{% url 'dashboard:unassigned' %}">
+                      {% trans 'Unassigned' %}
+                    </a>
+                  </li>
+
                   {% for tag in lot_tags %}
                   <li class="nav-items">
                     <a class="nav-link{% if path == 'tags' %} active2{% endif %}" href="{% url 'lot:tags' tag.id %}">
@@ -143,29 +136,21 @@
                 </ul>
               </li>
               <li class="nav-item">
-                <a class="admin {% if path in 'upload list' %}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 path in 'upload list import add' %}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' %}expanded{% else %}collapse{% endif %}" id="ul_evidences" data-bs-parent="#sidebarMenu">
+                <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">
+                  <li class="nav-item">
+                    <a class="nav-link{% if path == 'list' %} active2{% endif %}" href="{% url 'evidence:list' %}">
+                      {% trans 'List of evidences' %}
+                    </a>
+                  </li>
                   <li class="nav-item">
                     <a class="nav-link{% if path == 'upload' %} active2{% endif %}" href="{% url 'evidence:upload' %}">
                       {% trans 'Upload one' %}
                     </a>
                   </li>
-                  <li class="nav-item">
-                    <a class="nav-link{% if path == 'list' %} active2{% endif %}" href="{% url 'evidence:list' %}">
-                      {% trans 'Old evidences' %}
-                    </a>
-                  </li>
-                </ul>
-              </li>
-              <li class="nav-item">
-                <a class="admin {% if path in 'import add' %}active {% endif %}nav-link fw-bold" data-bs-toggle="collapse" data-bs-target="#ul_placeholders" aria-expanded="false" aria-controls="ul_placeholders" href="javascript:void()">
-                  <i class="bi-menu-button-wide icon_sidebar"></i>
-                  {% trans 'Placeholders' %}
-                </a>
-                <ul class="flex-column mb-2 ul_sidebar accordion-collapse {% if path in 'import add' %}expanded{% else %}collapse{% endif %}" id="ul_placeholders" data-bs-parent="#sidebarMenu">
                   <li class="nav-item">
                     <a class="nav-link{% if path == 'import' %} active2{% endif %}" href="{% url 'evidence:import' %}">
                       {% trans 'Upload Spreadsheet' %}
diff --git a/dashboard/urls.py b/dashboard/urls.py
index 835e708..4e27760 100644
--- a/dashboard/urls.py
+++ b/dashboard/urls.py
@@ -1,10 +1,10 @@
 from django.urls import path
-from dashboard import views 
+from dashboard import views
 
 app_name = 'dashboard'
 
 urlpatterns = [
-    path("", views.UnassignedDevicesView.as_view(), name="unassigned_devices"),
+    path("", views.UnassignedDevicesView.as_view(), name="unassigned"),
     path("<int:pk>/", views.LotDashboardView.as_view(), name="lot"),
     path("search", views.SearchView.as_view(), name="search"),
 ]
diff --git a/device/templates/new_device.html b/device/templates/new_device.html
index 320790d..46b4ce6 100644
--- a/device/templates/new_device.html
+++ b/device/templates/new_device.html
@@ -78,7 +78,7 @@
     {% endfor %}
   </div>
   <div class="container">
-    <a class="btn btn-grey" href="{% url 'dashboard:unassigned_devices' %}">{% translate "Cancel" %}</a>
+    <a class="btn btn-grey" href="{% url 'dashboard:unassigned' %}">{% translate "Cancel" %}</a>
     <input class="btn btn-green-admin" type="submit" name="submit" value="{% translate 'Save' %}" />
   </div>
 
diff --git a/device/views.py b/device/views.py
index 7ae34f3..b2b3192 100644
--- a/device/views.py
+++ b/device/views.py
@@ -40,7 +40,7 @@ class NewDeviceView(DashboardView, FormView):
     template_name = "new_device.html"
     title = _("New Device")
     breadcrumb = "Device / New Device"
-    success_url = reverse_lazy('dashboard:unassigned_devices')
+    success_url = reverse_lazy('dashboard:unassigned')
     form_class = DeviceFormSet
 
     def form_valid(self, form):
diff --git a/evidence/templates/upload.html b/evidence/templates/upload.html
index 6337b3e..e2d7aff 100644
--- a/evidence/templates/upload.html
+++ b/evidence/templates/upload.html
@@ -11,8 +11,8 @@
 <!-- override invalid-feedback class -->
 <style>
   .invalid-feedback {
-    color: #670000; 
-    font-size: 1rem; 
+    color: #670000;
+    font-size: 1rem;
   }
   </style>
 
@@ -22,7 +22,7 @@
 
 {% bootstrap_form form alert_error_type="none" error_css_class="alert alert-danger alert-icon alert-icon-border" %}
       <div class="form-actions-no-box">
-  <a class="btn btn-grey"       href="{% url 'dashboard:unassigned_devices' %}">{% translate "Cancel" %}</a>
+  <a class="btn btn-grey"       href="{% url 'dashboard:unassigned' %}">{% translate "Cancel" %}</a>
   <input class="btn btn-green-admin" type="submit" name="submit" value="{% translate 'Save' %}" />
 </div>
 
diff --git a/login/views.py b/login/views.py
index beb0368..885cc86 100644
--- a/login/views.py
+++ b/login/views.py
@@ -17,18 +17,18 @@ class LoginView(auth_views.LoginView):
     template_name = 'login.html'
     extra_context = {
         'title': _('Login'),
-        'success_url': reverse_lazy('dashboard:unassigned_devices'),
+        'success_url': reverse_lazy('dashboard:unassigned'),
         'commit_id': settings.COMMIT,
     }
 
     def get(self, request, *args, **kwargs):
         self.extra_context['success_url'] = request.GET.get(
             'next',
-            reverse_lazy('dashboard:unassigned_devices')
+            reverse_lazy('dashboard:unassigned')
         )
         if not self.request.user.is_anonymous:
-            return redirect(reverse_lazy('dashboard:unassigned_devices'))
-            
+            return redirect(reverse_lazy('dashboard:unassigned'))
+
         return super().get(request, *args, **kwargs)
 
     def form_valid(self, form):
@@ -72,4 +72,3 @@ class PasswordResetView(auth_views.PasswordResetView):
         except Exception as err:
             logger.error(err)
         return HttpResponseRedirect(self.success_url)
-
diff --git a/lot/templates/delete_lot.html b/lot/templates/delete_lot.html
index 95fe1d6..babdb89 100644
--- a/lot/templates/delete_lot.html
+++ b/lot/templates/delete_lot.html
@@ -30,7 +30,7 @@
 {% endif %}
 {% bootstrap_form form %}
 <div class="form-actions-no-box">
-  <a class="btn btn-grey" href="{% url 'dashboard:unassigned_devices' %}">{% translate "Cancel" %}</a>
+  <a class="btn btn-grey" href="{% url 'dashboard:unassigned' %}">{% translate "Cancel" %}</a>
   <input class="btn btn-green-admin" type="submit" name="submit" value="{% translate 'Delete' %}" />
 </div>
 
diff --git a/lot/templates/new_lot.html b/lot/templates/new_lot.html
index 8f2df37..c4c2cc8 100644
--- a/lot/templates/new_lot.html
+++ b/lot/templates/new_lot.html
@@ -24,7 +24,7 @@
 {% endif %}
 {% bootstrap_form form %}
 <div class="form-actions-no-box">
-  <a class="btn btn-grey" href="{% url 'dashboard:unassigned_devices' %}">{% translate "Cancel" %}</a>
+  <a class="btn btn-grey" href="{% url 'dashboard:unassigned' %}">{% translate "Cancel" %}</a>
   <input class="btn btn-green-admin" type="submit" name="submit" value="{% translate 'Save' %}" />
 </div>
 
diff --git a/lot/views.py b/lot/views.py
index 6acc58c..2093668 100644
--- a/lot/views.py
+++ b/lot/views.py
@@ -18,7 +18,7 @@ class NewLotView(DashboardView, CreateView):
     template_name = "new_lot.html"
     title = _("New lot")
     breadcrumb = "lot / New lot"
-    success_url = reverse_lazy('dashboard:unassigned_devices')
+    success_url = reverse_lazy('dashboard:unassigned')
     model = Lot
     fields = (
         "type",
@@ -39,7 +39,7 @@ class DeleteLotView(DashboardView, DeleteView):
     template_name = "delete_lot.html"
     title = _("Delete lot")
     breadcrumb = "lot / Delete lot"
-    success_url = reverse_lazy('dashboard:unassigned_devices')
+    success_url = reverse_lazy('dashboard:unassigned')
     model = Lot
     fields = (
         "type",
@@ -58,7 +58,7 @@ class EditLotView(DashboardView, UpdateView):
     template_name = "new_lot.html"
     title = _("Edit lot")
     breadcrumb = "Lot / Edit lot"
-    success_url = reverse_lazy('dashboard:unassigned_devices')
+    success_url = reverse_lazy('dashboard:unassigned')
     model = Lot
     fields = (
         "type",
@@ -84,7 +84,7 @@ class AddToLotView(DashboardView, FormView):
     template_name = "list_lots.html"
     title = _("Add to lots")
     breadcrumb = "lot / add to lots"
-    success_url = reverse_lazy('dashboard:unassigned_devices')
+    success_url = reverse_lazy('dashboard:unassigned')
     form_class = LotsForm
 
     def get_context_data(self, **kwargs):
@@ -125,7 +125,7 @@ class LotsTagsView(DashboardView, TemplateView):
     template_name = "lots.html"
     title = _("lots")
     breadcrumb = _("lots") + " /"
-    success_url = reverse_lazy('dashboard:unassigned_devices')
+    success_url = reverse_lazy('dashboard:unassigned')
 
     def get_context_data(self, **kwargs):
         self.pk = kwargs.get('pk')