From 1710b3df679ce206f2694ae475575e4f8860d81c Mon Sep 17 00:00:00 2001
From: Thomas Rusiecki <rusieckithomas@gmail.com>
Date: Tue, 4 Mar 2025 09:27:57 -0300
Subject: [PATCH] ui changes to left menu

---
 dashboard/templates/base.html | 17 ++++++++++-------
 dashboard/views.py            |  7 +++----
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/dashboard/templates/base.html b/dashboard/templates/base.html
index 0ae59c8..4fa06ae 100644
--- a/dashboard/templates/base.html
+++ b/dashboard/templates/base.html
@@ -113,7 +113,7 @@
               <li class="nav-item">
                 <a class="admin {% if path in 'all_device' %}active {% endif %}nav-link fw-bold" data-bs-toggle="collapse" data-bs-target="#ul_device" aria-expanded="false" aria-controls="ul_lots" href="javascript:void()">
                   <i class="bi bi-laptop icon_sidebar"></i>
-                  {% trans 'Device' %}
+                  {% trans 'Devices' %}
                 </a>
                 <ul class="flex-column mb-2 ul_sidebar accordion-collapse {% if path in 'all_device' %}expanded{% else %}collapse{% endif %}" id="ul_device" data-bs-parent="#sidebarMenu">
 		  <li class="nav-item">
@@ -124,7 +124,7 @@
                 </ul>
               </li>
               <li class="nav-item">
-                <a class="admin {% if path == 'tags' or path == 'lot' 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()">
+                <a class="admin {% if path == 'tags' or path == 'lot' 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>
@@ -133,11 +133,14 @@
                   {% for tag in lot_tags %}
                   <li class="nav-items">
 		  {% if tag.inbox %}
-                    <a class="nav-link{% if path == 'unassigned' %} active2{% endif %}" href="{% url 'dashboard:unassigned' %}">
+                    <a class="nav-link{% if path == 'inbox' %} active2{% endif %}" href="{% url 'dashboard:unassigned' %}">
+                      <i>
+                        {{ tag.name }}
+                      </i>
 		  {% else %}
                     <a class="nav-link{% if path == 'tags' %} active2{% endif %}" href="{% url 'lot:tags' tag.id %}">
-		  {% endif %}
                       {{ tag.name }}
+		  {% endif %}
                     </a>
                   </li>
                   {% endfor %}
@@ -156,17 +159,17 @@
                   </li>
                   <li class="nav-item">
                     <a class="nav-link{% if path == 'upload' %} active2{% endif %}" href="{% url 'evidence:upload' %}">
-                      {% trans 'Upload with JSON file' %}
+                      {% trans 'Upload JSON file' %}
                     </a>
                   </li>
                   <li class="nav-item">
                     <a class="nav-link{% if path == 'import' %} active2{% endif %}" href="{% url 'evidence:import' %}">
-                      {% trans 'Upload with Spreadsheet' %}
+                      {% trans 'Upload Spreadsheet' %}
                     </a>
                   </li>
                   <li class="nav-item">
                     <a class="nav-link{% if path == 'add' %} active2{% endif %}" href="{% url 'device:add' %}">
-                      {% trans 'Upload with Web Form' %}
+                      {% trans 'Upload Web Form' %}
                     </a>
                   </li>
                 </ul>
diff --git a/dashboard/views.py b/dashboard/views.py
index 01a8566..85e2a28 100644
--- a/dashboard/views.py
+++ b/dashboard/views.py
@@ -14,14 +14,13 @@ from lot.models import Lot
 
 class UnassignedDevicesView(InventaryMixin):
     template_name = "unassigned_devices.html"
-    section = "Unassigned"
-    title = _("Unassigned Devices")
-    breadcrumb = "Devices / Unassigned Devices"
+    section = "Inbox"
+    title = _("Inbox")
+    breadcrumb = "Lot / Inbox"
 
     def get_devices(self, user, offset, limit):
         return Device.get_unassigned(self.request.user.institution, offset, limit)
 
-
 class AllDevicesView(InventaryMixin):
     template_name = "unassigned_devices.html"
     section = "All"
-- 
2.30.2