From 8d354755f091b9222a80a8ca0f74d1a458333f44 Mon Sep 17 00:00:00 2001
From: Smittix <jamessmith1@outlook.com>
Date: Thu, 29 Jan 2026 10:31:39 +0000
Subject: [PATCH] revert: Remove utility bar and fix disclaimer flash issue

Reverts the utility bar feature and disclaimer timing changes that
caused the disclaimer to flash on screen for users who had already
accepted it.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
---
 templates/adsb_dashboard.html       |   2 -
 templates/ais_dashboard.html        |   2 -
 templates/index.html                |  58 ++------
 templates/partials/utility-bar.html | 221 ----------------------------
 templates/satellite_dashboard.html  |   2 -
 5 files changed, 9 insertions(+), 276 deletions(-)
 delete mode 100644 templates/partials/utility-bar.html
diff --git a/templates/adsb_dashboard.html b/templates/adsb_dashboard.html
index ac86a8a..920d1e9 100644
--- a/templates/adsb_dashboard.html
+++ b/templates/adsb_dashboard.html
@@ -22,8 +22,6 @@
     <link rel="stylesheet" href="{{ url_for('static', filename='css/adsb_dashboard.css') }}">
 </head>
 <body>
-    {% include 'partials/utility-bar.html' %}
-
     <div class="radar-bg"></div>
     <div class="scanline"></div>
 
diff --git a/templates/ais_dashboard.html b/templates/ais_dashboard.html
index 5645c9c..2c9e54b 100644
--- a/templates/ais_dashboard.html
+++ b/templates/ais_dashboard.html
@@ -22,8 +22,6 @@
     <link rel="stylesheet" href="{{ url_for('static', filename='css/responsive.css') }}">
 </head>
 <body>
-    {% include 'partials/utility-bar.html' %}
-
     <!-- Radar background effects -->
     <div class="radar-bg"></div>
     <div class="scanline"></div>
diff --git a/templates/index.html b/templates/index.html
index 69964c9..0c79d2a 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -6,17 +6,6 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>iNTERCEPT // See the Invisible</title>
     <link rel="icon" type="image/svg+xml" href="/favicon.svg">
-    <!-- Check disclaimer BEFORE page renders to prevent flash of welcome page -->
-    <script>
-        if (localStorage.getItem('disclaimerAccepted') !== 'true') {
-            document.documentElement.classList.add('disclaimer-pending');
-        }
-    </script>
-    <style>
-        /* Hide welcome page when disclaimer hasn't been accepted yet */
-        .disclaimer-pending .welcome-overlay { display: none !important; }
-        .disclaimer-pending #disclaimerModal { display: flex !important; }
-    </style>
     <!-- Fonts - Conditional CDN/Local loading -->
     {% if offline_settings.fonts_source == 'local' %}
     <link rel="stylesheet" href="{{ url_for('static', filename='css/fonts-local.css') }}">
@@ -218,7 +207,7 @@
     </div>
 
     <!-- Disclaimer Modal -->
-    <div class="disclaimer-overlay" id="disclaimerModal">
+    <div class="disclaimer-overlay" id="disclaimerModal" style="display: none;">
         <div class="disclaimer-modal">
             <div class="warning-icon icon"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="m21.73 18-8-14a2 2 0 0 0-3.48 0l-8 14A2 2 0 0 0 4 21h16a2 2 0 0 0 1.73-3Z"/><line x1="12" y1="9" x2="12" y2="13"/><line x1="12" y1="17" x2="12.01" y2="17"/></svg></div>
             <h2>DISCLAIMER</h2>
@@ -1910,24 +1899,21 @@
             const welcome = document.getElementById('welcomePage');
             welcome.classList.add('fade-out');
 
-            // After fade out, hide welcome and switch to mode
+            // After fade out, hide welcome and show disclaimer if needed
             setTimeout(() => {
                 welcome.style.display = 'none';
-                switchMode(mode);
+                checkDisclaimer();
             }, 400);
         }
 
-        // Disclaimer handling - called on page load
+        // Disclaimer handling
         function checkDisclaimer() {
             const accepted = localStorage.getItem('disclaimerAccepted');
             if (accepted === 'true') {
-                // Already accepted - ensure welcome page is shown, disclaimer hidden
-                document.documentElement.classList.remove('disclaimer-pending');
                 document.getElementById('disclaimerModal').style.display = 'none';
-                document.getElementById('welcomePage').style.display = '';
+                // Switch to the selected mode
+                switchMode(selectedStartMode);
             } else {
-                // Not accepted - show disclaimer, hide welcome page
-                document.documentElement.classList.add('disclaimer-pending');
                 document.getElementById('disclaimerModal').style.display = 'flex';
             }
         }
@@ -1935,13 +1921,9 @@
         function acceptDisclaimer() {
             localStorage.setItem('disclaimerAccepted', 'true');
             document.getElementById('disclaimerModal').classList.add('disclaimer-hidden');
-
-            // Remove pending class and show welcome page after disclaimer fades out
+            // Switch to the selected mode after accepting
             setTimeout(() => {
-                document.documentElement.classList.remove('disclaimer-pending');
-                document.getElementById('disclaimerModal').style.display = 'none';
-                document.getElementById('welcomePage').style.display = '';
-                document.getElementById('welcomePage').classList.remove('fade-out');
+                switchMode(selectedStartMode);
             }, 300);
         }
 
@@ -1950,29 +1932,7 @@
             document.getElementById('rejectionPage').classList.remove('disclaimer-hidden');
         }
 
-        // Check disclaimer on DOMContentLoaded
-        document.addEventListener('DOMContentLoaded', function() {
-            checkDisclaimer();
-
-            // Handle URL parameters for settings/help (from dashboard utility bar)
-            const urlParams = new URLSearchParams(window.location.search);
-            if (urlParams.get('settings') === 'open') {
-                // Wait for page to initialize, then open settings
-                setTimeout(function() {
-                    if (typeof showSettings === 'function') showSettings();
-                }, 500);
-                // Clean up URL
-                history.replaceState({}, '', window.location.pathname);
-            }
-            if (urlParams.get('help') === 'open') {
-                // Wait for page to initialize, then open help
-                setTimeout(function() {
-                    if (typeof showHelp === 'function') showHelp();
-                }, 500);
-                // Clean up URL
-                history.replaceState({}, '', window.location.pathname);
-            }
-        });
+        // Don't auto-check disclaimer - wait for welcome page mode selection
 
         let eventSource = null;
         let isRunning = false;
diff --git a/templates/partials/utility-bar.html b/templates/partials/utility-bar.html
deleted file mode 100644
index a26da37..0000000
--- a/templates/partials/utility-bar.html
+++ /dev/null
@@ -1,221 +0,0 @@
-<!-- Utility Bar - Shared navigation and controls for dashboard pages -->
-<div class="utility-bar">
-    <a href="/" class="utility-home" title="Back to Main Dashboard">
-        <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-            <path d="M3 9l9-7 9 7v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z"/>
-            <polyline points="9 22 9 12 15 12 15 22"/>
-        </svg>
-        <span>iNTERCEPT</span>
-    </a>
-    <div class="utility-controls">
-        <button class="utility-btn" onclick="toggleDashboardTheme()" title="Toggle Theme">
-            <svg class="icon-sun" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-                <circle cx="12" cy="12" r="5"/>
-                <line x1="12" y1="1" x2="12" y2="3"/>
-                <line x1="12" y1="21" x2="12" y2="23"/>
-                <line x1="4.22" y1="4.22" x2="5.64" y2="5.64"/>
-                <line x1="18.36" y1="18.36" x2="19.78" y2="19.78"/>
-                <line x1="1" y1="12" x2="3" y2="12"/>
-                <line x1="21" y1="12" x2="23" y2="12"/>
-                <line x1="4.22" y1="19.78" x2="5.64" y2="18.36"/>
-                <line x1="18.36" y1="5.64" x2="19.78" y2="4.22"/>
-            </svg>
-            <svg class="icon-moon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-                <path d="M21 12.79A9 9 0 1 1 11.21 3 7 7 0 0 0 21 12.79z"/>
-            </svg>
-        </button>
-        <button class="utility-btn" onclick="toggleDashboardAnimations()" title="Toggle Animations">
-            <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-                <polygon points="5 3 19 12 5 21 5 3"/>
-            </svg>
-        </button>
-        <button class="utility-btn" onclick="showDashboardSettings()" title="Settings">
-            <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-                <circle cx="12" cy="12" r="3"/>
-                <path d="M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1-2.83 0l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-2 2 2 2 0 0 1-2-2v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1-2-2 2 2 0 0 1 2-2h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 2 2 2 2 0 0 1-2 2h-.09a1.65 1.65 0 0 0-1.51 1z"/>
-            </svg>
-        </button>
-        <button class="utility-btn" onclick="showDashboardHelp()" title="Help">
-            <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-                <circle cx="12" cy="12" r="10"/>
-                <path d="M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3"/>
-                <line x1="12" y1="17" x2="12.01" y2="17"/>
-            </svg>
-        </button>
-    </div>
-</div>
-
-<style>
-    .utility-bar {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        padding: 0 15px;
-        height: 36px;
-        background: rgba(0, 20, 40, 0.9);
-        border-bottom: 1px solid rgba(0, 200, 255, 0.2);
-        font-family: 'JetBrains Mono', monospace;
-        font-size: 11px;
-    }
-
-    .utility-home {
-        display: flex;
-        align-items: center;
-        gap: 8px;
-        color: var(--accent-cyan, #00d4ff);
-        text-decoration: none;
-        font-weight: 600;
-        letter-spacing: 0.5px;
-        transition: color 0.2s;
-    }
-
-    .utility-home:hover {
-        color: #fff;
-    }
-
-    .utility-home svg {
-        width: 16px;
-        height: 16px;
-    }
-
-    .utility-controls {
-        display: flex;
-        align-items: center;
-        gap: 4px;
-    }
-
-    .utility-btn {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        width: 28px;
-        height: 28px;
-        background: transparent;
-        border: 1px solid rgba(0, 200, 255, 0.3);
-        border-radius: 4px;
-        color: var(--text-secondary, #8899aa);
-        cursor: pointer;
-        transition: all 0.2s;
-    }
-
-    .utility-btn:hover {
-        background: rgba(0, 200, 255, 0.1);
-        border-color: var(--accent-cyan, #00d4ff);
-        color: var(--accent-cyan, #00d4ff);
-    }
-
-    .utility-btn svg {
-        width: 14px;
-        height: 14px;
-    }
-
-    /* Theme toggle - show sun in dark mode, moon in light mode */
-    .utility-btn .icon-moon { display: none; }
-    .utility-btn .icon-sun { display: block; }
-
-    [data-theme="light"] .utility-btn .icon-moon { display: block; }
-    [data-theme="light"] .utility-btn .icon-sun { display: none; }
-
-    /* Animations toggle state indicator */
-    [data-animations="off"] .utility-btn[onclick*="Animations"] {
-        opacity: 0.5;
-    }
-
-    /* Light theme adjustments */
-    [data-theme="light"] .utility-bar {
-        background: rgba(240, 245, 250, 0.95);
-        border-bottom-color: rgba(0, 100, 150, 0.2);
-    }
-
-    [data-theme="light"] .utility-home {
-        color: #0066aa;
-    }
-
-    [data-theme="light"] .utility-btn {
-        border-color: rgba(0, 100, 150, 0.3);
-        color: #446688;
-    }
-
-    [data-theme="light"] .utility-btn:hover {
-        background: rgba(0, 100, 150, 0.1);
-        border-color: #0066aa;
-        color: #0066aa;
-    }
-
-    /* Responsive */
-    @media (max-width: 600px) {
-        .utility-home span {
-            display: none;
-        }
-    }
-</style>
-
-<script>
-    // Dashboard utility functions
-    (function() {
-        // Theme toggle
-        window.toggleDashboardTheme = function() {
-            const html = document.documentElement;
-            const currentTheme = html.getAttribute('data-theme');
-            const newTheme = currentTheme === 'light' ? 'dark' : 'light';
-
-            if (newTheme === 'dark') {
-                html.removeAttribute('data-theme');
-            } else {
-                html.setAttribute('data-theme', newTheme);
-            }
-
-            // Update maps to use appropriate tiles
-            if (typeof Settings !== 'undefined' && Settings.updateAllMaps) {
-                Settings.updateAllMaps();
-            }
-
-            localStorage.setItem('intercept-theme', newTheme);
-
-            // Sync to server
-            fetch('/settings', {
-                method: 'POST',
-                headers: { 'Content-Type': 'application/json' },
-                body: JSON.stringify({ theme: newTheme })
-            }).catch(err => console.warn('Failed to save theme:', err));
-        };
-
-        // Animations toggle
-        window.toggleDashboardAnimations = function() {
-            const html = document.documentElement;
-            const currentState = html.getAttribute('data-animations');
-            const newState = currentState === 'off' ? 'on' : 'off';
-
-            if (newState === 'on') {
-                html.removeAttribute('data-animations');
-            } else {
-                html.setAttribute('data-animations', newState);
-            }
-
-            localStorage.setItem('intercept-animations', newState);
-        };
-
-        // Settings - open main dashboard with settings open
-        window.showDashboardSettings = function() {
-            window.location.href = '/?settings=open';
-        };
-
-        // Help - open main dashboard with help open
-        window.showDashboardHelp = function() {
-            window.location.href = '/?help=open';
-        };
-
-        // Apply saved theme/animations on page load
-        (function() {
-            const theme = localStorage.getItem('intercept-theme');
-            if (theme === 'light') {
-                document.documentElement.setAttribute('data-theme', 'light');
-            }
-
-            const animations = localStorage.getItem('intercept-animations');
-            if (animations === 'off') {
-                document.documentElement.setAttribute('data-animations', 'off');
-            }
-        })();
-    })();
-</script>
diff --git a/templates/satellite_dashboard.html b/templates/satellite_dashboard.html
index b16c5f2..74d56a9 100644
--- a/templates/satellite_dashboard.html
+++ b/templates/satellite_dashboard.html
@@ -22,8 +22,6 @@
     <link rel="stylesheet" href="{{ url_for('static', filename='css/satellite_dashboard.css') }}">
 </head>
 <body>
-    {% include 'partials/utility-bar.html' %}
-
     <div class="grid-bg"></div>
     <div class="scanline"></div>
 
