05/19 Sync code with LT

2026-05-19 12:49:10 -04:00
parent 9bded4ed1f
commit 5e0c014ca7
1 changed files with 70 additions and 86 deletions
@@ -1,39 +1,30 @@
 <!DOCTYPE html>
 <html lang="en">
-  <head>
+
+<head>
  <meta charset="UTF-8" />
  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
  <title>{% block title %}{{ COMPANY_NAME }}{% endblock %}</title>

  <!-- Main CSS -->
-    <link
-      rel="stylesheet"
-      href="{{ url_for('static', filename='css/style.css') }}"
-    />
+  <link rel="stylesheet" href="{{ url_for('static', filename='css/style.css') }}" />

-    <!-- 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 -->
+  <!-- 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" />
+
  <!-- Page-specific CSS -->
  {% block extra_head %}{% endblock %}

  <!-- Favicon -->
-    <link
-      rel="icon"
-      type="image/x-icon"
-      href="{{ url_for('static', filename='images/favicon.ico') }}"
-    />
-  </head>
-  <body class="login-layout">
+  <link rel="icon" type="image/x-icon" href="{{ url_for('static', filename='images/favicon.ico') }}" />
+</head>
+
+<body class="login-layout">
  <!-- Non-authenticated Layout (Login, Register, etc.) -->
  <main class="main-content">
    <!-- Flash Messages -->
@@ -43,13 +34,9 @@
      {% for category, message in messages %}
      <div class="alert alert-{{ category }}">
        <i
-            class="fas {% if category == 'success' %}fa-check-circle{% elif category == 'error' %}fa-exclamation-circle{% elif category == 'info' %}fa-info-circle{% else %}fa-exclamation-triangle{% endif %}"
-          ></i>
+          class="fas {% if category == 'success' %}fa-check-circle{% elif category == 'error' %}fa-exclamation-circle{% elif category == 'info' %}fa-info-circle{% else %}fa-exclamation-triangle{% endif %}"></i>
        {{ message }}
-          <button
-            class="alert-close"
-            onclick="this.parentElement.style.display='none'"
-          >
+        <button class="alert-close" onclick="this.parentElement.style.display='none'">
          <i class="fas fa-times"></i>
        </button>
      </div>
@@ -65,7 +52,7 @@
  <footer class="footer">
    <div class="container">
      <div class="footer-content">
-          <p>&copy; 2025 QR Code Management System. All rights reserved.</p>
+        <p>&copy; {{ CURRENT_YEAR }} {{ COMPANY_NAME }}. 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>
@@ -85,7 +72,7 @@
  <script>
    // Pass Flask session data to JavaScript
    window.qrConfig = {
-        currentUserId: {{ session.user_id|default('null') }},
+      currentUserId: {{ session.user_id |default ('null') }},
    currentUserRole: '{{ session.role|default('') }}',
      currentUserName: '{{ session.full_name|default('') }}',
        csrfToken: '{{ csrf_token() if csrf_token else '' }}'
@@ -93,11 +80,8 @@
  </script>
  {% if turnstile_enabled %}
  <!-- Cloudflare Turnstile -->
-    <script
-      src="https://challenges.cloudflare.com/turnstile/v0/api.js"
-      async
-      defer
-    ></script>
+  <script src="https://challenges.cloudflare.com/turnstile/v0/api.js" async defer></script>
  {% endif %}
-  </body>
+</body>
+
 </html>