July 6 - Adjust the Admin menu, grouping functions

This commit is contained in:
2026-07-06 17:25:55 -04:00
parent 2c1d9f5e77
commit ed650897d7
+48 -23
View File
@@ -152,11 +152,6 @@
</a> </a>
</li> </li>
{% endif %} {% 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'] %} {% if current_user.role in ['admin', 'director'] %}
<li class="nav-item"> <li class="nav-item">
<a class="nav-link {{ 'active' if request.endpoint and request.endpoint.startswith('customers.') }}" href="{{ url_for('customers.index') }}">Customers</a> <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> </li>
{% endif %} {% endif %}
{% if current_user.role == 'admin' %} {% if current_user.role == 'admin' %}
<li class="nav-item"> {% set admin_active = request.endpoint and (
<a class="nav-link {{ 'active' if request.endpoint and request.endpoint.startswith('audit.') }}" href="{{ url_for('audit.index') }}">Audit Trail</a> request.endpoint.startswith('audit.')
</li> or request.endpoint == 'auth.notification_matrix'
<li class="nav-item"> or request.endpoint.startswith('broadcast.')
<a class="nav-link {{ 'active' if request.endpoint == 'auth.notification_matrix' }}" href="{{ url_for('auth.notification_matrix') }}"> or request.endpoint.startswith('devices.')
<i class="bi bi-grid-3x3-gap-fill"></i> Notif. Matrix or (request.endpoint.startswith('auth.') and 'user' in request.endpoint)
</a> ) %}
</li> <li class="nav-item dropdown">
<li class="nav-item"> <a class="nav-link dropdown-toggle {{ 'active' if admin_active }}"
<a class="nav-link {{ 'active' if request.endpoint and request.endpoint.startswith('broadcast.') }}" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
href="{{ url_for('broadcast.index') }}"> <i class="bi bi-gear-fill me-1"></i>Admin
<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
</a> </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> </li>
{% endif %} {% endif %}
</ul> </ul>