From ed650897d78f0b931cd60b0fbe45aa3638b65e81 Mon Sep 17 00:00:00 2001
From: NguyenND <ngodanguyen@gmail.com>
Date: Mon, 6 Jul 2026 17:25:55 -0400
Subject: [PATCH] July 6 - Adjust the Admin menu, grouping functions

---
 app/templates/base.html | 71 ++++++++++++++++++++++++++++-------------
 1 file changed, 48 insertions(+), 23 deletions(-)

diff --git a/app/templates/base.html b/app/templates/base.html
index 9815153..c60bb08 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -152,11 +152,6 @@
                         </a>
                     </li>
                     {% endif %}
-                    {% if current_user.role == 'admin' %}
-                    <li class="nav-item">
-                        <a class="nav-link {{ 'active' if request.endpoint and request.endpoint.startswith('auth.') and 'user' in request.endpoint }}" href="{{ url_for('auth.list_users') }}">Users</a>
-                    </li>
-                    {% endif %}
                     {% if current_user.role in ['admin', 'director'] %}
                     <li class="nav-item">
                         <a class="nav-link {{ 'active' if request.endpoint and request.endpoint.startswith('customers.') }}" href="{{ url_for('customers.index') }}">Customers</a>
@@ -194,25 +189,55 @@
                     </li>
                     {% endif %}
                     {% if current_user.role == 'admin' %}
-                    <li class="nav-item">
-                        <a class="nav-link {{ 'active' if request.endpoint and request.endpoint.startswith('audit.') }}" href="{{ url_for('audit.index') }}">Audit Trail</a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link {{ 'active' if request.endpoint == 'auth.notification_matrix' }}" href="{{ url_for('auth.notification_matrix') }}">
-                            <i class="bi bi-grid-3x3-gap-fill"></i> Notif. Matrix
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link {{ 'active' if request.endpoint and request.endpoint.startswith('broadcast.') }}"
-                           href="{{ url_for('broadcast.index') }}">
-                            <i class="bi bi-megaphone-fill"></i> Broadcast
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link {{ 'active' if request.endpoint and request.endpoint.startswith('devices.') }}"
-                           href="{{ url_for('devices.index') }}">
-                            <i class="bi bi-tablet"></i> Devices
+                    {% set admin_active = request.endpoint and (
+                        request.endpoint.startswith('audit.')
+                        or request.endpoint == 'auth.notification_matrix'
+                        or request.endpoint.startswith('broadcast.')
+                        or request.endpoint.startswith('devices.')
+                        or (request.endpoint.startswith('auth.') and 'user' in request.endpoint)
+                    ) %}
+                    <li class="nav-item dropdown">
+                        <a class="nav-link dropdown-toggle {{ 'active' if admin_active }}"
+                           href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                            <i class="bi bi-gear-fill me-1"></i>Admin
                         </a>
+                        <ul class="dropdown-menu dropdown-menu-end">
+                            <li><h6 class="dropdown-header">User Management</h6></li>
+                            <li>
+                                <a class="dropdown-item {{ 'active' if request.endpoint and request.endpoint.startswith('auth.') and 'user' in request.endpoint }}"
+                                   href="{{ url_for('auth.list_users') }}">
+                                    <i class="bi bi-people-fill me-2"></i>Users
+                                </a>
+                            </li>
+                            <li><hr class="dropdown-divider"></li>
+                            <li><h6 class="dropdown-header">System</h6></li>
+                            <li>
+                                <a class="dropdown-item {{ 'active' if request.endpoint and request.endpoint.startswith('audit.') }}"
+                                   href="{{ url_for('audit.index') }}">
+                                    <i class="bi bi-clipboard-data me-2"></i>Audit Trail
+                                </a>
+                            </li>
+                            <li>
+                                <a class="dropdown-item {{ 'active' if request.endpoint == 'auth.notification_matrix' }}"
+                                   href="{{ url_for('auth.notification_matrix') }}">
+                                    <i class="bi bi-grid-3x3-gap-fill me-2"></i>Notification Matrix
+                                </a>
+                            </li>
+                            <li><hr class="dropdown-divider"></li>
+                            <li><h6 class="dropdown-header">Mobile &amp; Comms</h6></li>
+                            <li>
+                                <a class="dropdown-item {{ 'active' if request.endpoint and request.endpoint.startswith('broadcast.') }}"
+                                   href="{{ url_for('broadcast.index') }}">
+                                    <i class="bi bi-megaphone-fill me-2"></i>Broadcast
+                                </a>
+                            </li>
+                            <li>
+                                <a class="dropdown-item {{ 'active' if request.endpoint and request.endpoint.startswith('devices.') }}"
+                                   href="{{ url_for('devices.index') }}">
+                                    <i class="bi bi-tablet me-2"></i>Devices
+                                </a>
+                            </li>
+                        </ul>
                     </li>
                     {% endif %}
                 </ul>