From d8b57cde777c331864cdfba3121d58522d51c377 Mon Sep 17 00:00:00 2001
From: NguyenND <ngodanguyen@gmail.com>
Date: Tue, 28 Apr 2026 15:18:43 -0400
Subject: [PATCH] 04/28 Updated UI 2

---
 app.py                            |  7 +++++--
 templates/base.html               | 16 +++++++---------
 templates/base_authenticated.html |  6 ++++++
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/app.py b/app.py
index ce66588..4c08359 100644
--- a/app.py
+++ b/app.py
@@ -107,8 +107,11 @@ def create_app() -> Flask:
 
     @app.context_processor
     def inject_company_name():
-        """Make COMPANY_NAME available to all templates"""
-        return {'COMPANY_NAME': os.environ.get('COMPANY_NAME', 'QR Code Management System')}
+        """Make COMPANY_NAME and THEME_NAME available to all templates"""
+        return {
+            'COMPANY_NAME': os.environ.get('COMPANY_NAME', 'QR Code Management System'),
+            'THEME_NAME':   os.environ.get('THEME_NAME', ''),
+        }
 
     @app.context_processor
     def inject_logging_status():
diff --git a/templates/base.html b/templates/base.html
index d3f2a37..720c681 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -11,20 +11,18 @@
       href="{{ url_for('static', filename='css/style.css') }}"
     />
 
-    <!-- Theme Override (set THEME_NAME in .env to activate, e.g. THEME_NAME=gov) -->
-    {% if THEME_NAME %}
-    <link
-      rel="stylesheet"
-      href="{{ url_for('static', filename='css/theme-' + THEME_NAME + '.css') }}"
-    />
-    {% endif %}
-
     <!-- Font Awesome -->
     <link
       href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0/css/all.min.css"
       rel="stylesheet"
     />
 
+    <!-- Theme override — loaded before page-specific CSS so per-page sheets
+         (e.g. auth.css) take cascade precedence unless theme uses !important -->
+    {% if THEME_NAME %}
+    <link rel="stylesheet" href="{{ url_for('static', filename='css/theme-' + THEME_NAME + '.css') }}" />
+    {% endif %}
+
     <!-- Page-specific CSS -->
     {% block extra_head %}{% endblock %}
 
@@ -67,7 +65,7 @@
     <footer class="footer">
       <div class="container">
         <div class="footer-content">
-          <p>&copy; {{ CURRENT_YEAR }} {{ COMPANY_NAME }}. All rights reserved.</p>
+          <p>&copy; 2025 QR Code Management System. All rights reserved.</p>
           <div class="footer-links">
             <a href="#" class="footer-link">Privacy Policy</a>
             <a href="#" class="footer-link">Terms of Service</a>
diff --git a/templates/base_authenticated.html b/templates/base_authenticated.html
index 8a77417..45ece3d 100644
--- a/templates/base_authenticated.html
+++ b/templates/base_authenticated.html
@@ -17,6 +17,12 @@
       rel="stylesheet"
     />
 
+    <!-- Theme override — loaded before page-specific CSS so per-page sheets
+         can still override theme values; use !important in theme CSS where needed -->
+    {% if THEME_NAME %}
+    <link rel="stylesheet" href="{{ url_for('static', filename='css/theme-' + THEME_NAME + '.css') }}" />
+    {% endif %}
+
     <!-- Page-specific CSS -->
     {% block extra_head %}{% endblock %}