From 6d42c814913be2e863548acdc12554c48a0b880b Mon Sep 17 00:00:00 2001
From: NguyenND <ngodanguyen@gmail.com>
Date: Fri, 12 Jun 2026 12:56:50 -0400
Subject: [PATCH] 06/12 Redesign menu

---
 app/templates/base.html                    | 11 +++--------
 app/templates/reports/_subnav.html         |  8 ++++++++
 app/templates/scheduled_reports/index.html |  1 +
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/templates/base.html b/app/templates/base.html
index dd777c2..b68a426 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -116,6 +116,9 @@
                     <li class="nav-item">
                         <a class="nav-link {{ 'active' if request.endpoint and request.endpoint.startswith('dashboard.') }}" href="{{ url_for('dashboard.index') }}">Dashboard</a>
                     </li>
+                    <li class="nav-item">
+                        <a class="nav-link {{ 'active' if request.endpoint and (request.endpoint.startswith('reports.') or request.endpoint.startswith('scheduled_reports.')) }}" href="{{ url_for('reports.index') }}">Reports</a>
+                    </li>
                     {% if current_user.role in ['admin', 'director', 'project_manager'] %}
                     <li class="nav-item">
                         <a class="nav-link {{ 'active' if request.endpoint and request.endpoint.startswith('projects.') }}" href="{{ url_for('projects.index') }}">Contracts</a>
@@ -132,14 +135,6 @@
                     <li class="nav-item">
                         <a class="nav-link {{ 'active' if request.endpoint and request.endpoint.startswith('inspections.') }}" href="{{ url_for('inspections.index') }}">Inspections</a>
                     </li>
-                    <li class="nav-item">
-                        <a class="nav-link {{ 'active' if request.endpoint and request.endpoint.startswith('reports.') }}" href="{{ url_for('reports.index') }}">Reports</a>
-                    </li>
-                    {% if current_user.role == 'admin' %}
-                    <li class="nav-item">
-                        <a class="nav-link {{ 'active' if request.endpoint and request.endpoint.startswith('scheduled_reports.') }}" href="{{ url_for('scheduled_reports.index') }}">Scheduled Reports</a>
-                    </li>
-                    {% endif %}
                     <li class="nav-item">
                         <a class="nav-link {{ 'active' if request.endpoint and request.endpoint.startswith('issues.') and request.endpoint != 'issues.verification_queue' }}" href="{{ url_for('issues.index') }}">Issues</a>
                     </li>
diff --git a/app/templates/reports/_subnav.html b/app/templates/reports/_subnav.html
index 7bfa4a9..c3f9200 100644
--- a/app/templates/reports/_subnav.html
+++ b/app/templates/reports/_subnav.html
@@ -33,4 +33,12 @@
     </a>
   </li>
   {% endif %}
+  {% if current_user.role in ['admin', 'director', 'project_manager'] %}
+  <li class="nav-item">
+    <a class="nav-link {{ 'active' if request.endpoint and request.endpoint.startswith('scheduled_reports.') else '' }}"
+       href="{{ url_for('scheduled_reports.index') }}">
+      <i class="bi bi-calendar-check me-1"></i>Scheduled Reports
+    </a>
+  </li>
+  {% endif %}
 </ul>
diff --git a/app/templates/scheduled_reports/index.html b/app/templates/scheduled_reports/index.html
index 80c3484..be5ed1e 100644
--- a/app/templates/scheduled_reports/index.html
+++ b/app/templates/scheduled_reports/index.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% block title %}Scheduled Reports{% endblock %}
 {% block content %}
+{% include 'reports/_subnav.html' %}
 <div class="d-flex justify-content-between align-items-center mb-4">
   <h2><i class="bi bi-calendar-check"></i> Scheduled Reports</h2>
   <a href="{{ url_for('scheduled_reports.create') }}" class="btn btn-primary">