From ab45424fe8d2d08173587ef5d14d59580834ae2c Mon Sep 17 00:00:00 2001
From: Rachele Morino <rachelekm@gmail.com>
Date: Fri, 12 Jan 2024 16:32:29 -0500
Subject: [PATCH 1/3] Adjust banner logic to display by alert ID & text content

---
 python/cac_tripplanner/templates/base.html             | 10 +++++++---
 .../templates/partials/alert-banner.html               |  7 ++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/python/cac_tripplanner/templates/base.html b/python/cac_tripplanner/templates/base.html
index 4c79e5f3..2943d803 100644
--- a/python/cac_tripplanner/templates/base.html
+++ b/python/cac_tripplanner/templates/base.html
@@ -172,14 +172,18 @@
         jQuery.noConflict(); // because JotForms.
         // Hide top alert banner across pages on close
         jQuery(document).ready(function ($) {
-            const hideBanner = localStorage.getItem('hide-top-alert-banner') || false;
-            if(!hideBanner){
+            // update this for every new alert to match id in alert-banner.html
+            var alertId = 'gophillygo-alert-2024-01-12',
+            hasAlertMessage = jQuery('.alert-body').text().trim(),
+            wasAlreadyHidden = localStorage.getItem(alertId) || false,
+            shouldShowBanner = hasAlertMessage && !wasAlreadyHidden;
+            if(shouldShowBanner){
                 jQuery('.nav-banner').removeClass('hidden');
             };
 
             jQuery('.nav-banner').on('click', function(e) {
                 e.stopPropagation();
-                localStorage.setItem('hide-top-alert-banner', true);
+                localStorage.setItem(alertId, true);
                 jQuery('.nav-banner').addClass('hidden');
             });
         });
diff --git a/python/cac_tripplanner/templates/partials/alert-banner.html b/python/cac_tripplanner/templates/partials/alert-banner.html
index b05b5b58..82d9b753 100644
--- a/python/cac_tripplanner/templates/partials/alert-banner.html
+++ b/python/cac_tripplanner/templates/partials/alert-banner.html
@@ -1,5 +1,10 @@
 <div class="nav-banner alert-warning hidden">
-    <div class="alert-body">Message for all of our Android app users: after January 1, 2024, we will no longer be supporting the app, but the GoPhillyGo mobile website will continue to be available across all devices.</div>
+    <div class="alert-body">
+        <!-- Alert ID gophillygo-alert-2024-01-12 -->
+        <!-- Add text here and update the Alert ID comment above to match
+            alertId in base.html. Will show an alert at the top of the page. -->
+            Message for all of our Android app users: after January 1, 2024, we will no longer be supporting the app, but the GoPhillyGo mobile website will continue to be available across all devices.
+        </div>
     <button title="Dismiss this message" name="close"
         class="btn-dismiss-nav-banner"><i class="icon-cancel"></i>
     </button>

From 27995853f3b2a99bd6660846df417f50965a6102 Mon Sep 17 00:00:00 2001
From: Rachele Morino <rachelekm@gmail.com>
Date: Fri, 12 Jan 2024 16:33:33 -0500
Subject: [PATCH 2/3] Remove banner message communicating android sunset

---
 python/cac_tripplanner/templates/partials/alert-banner.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/python/cac_tripplanner/templates/partials/alert-banner.html b/python/cac_tripplanner/templates/partials/alert-banner.html
index 82d9b753..f69f8a22 100644
--- a/python/cac_tripplanner/templates/partials/alert-banner.html
+++ b/python/cac_tripplanner/templates/partials/alert-banner.html
@@ -3,7 +3,6 @@
         <!-- Alert ID gophillygo-alert-2024-01-12 -->
         <!-- Add text here and update the Alert ID comment above to match
             alertId in base.html. Will show an alert at the top of the page. -->
-            Message for all of our Android app users: after January 1, 2024, we will no longer be supporting the app, but the GoPhillyGo mobile website will continue to be available across all devices.
         </div>
     <button title="Dismiss this message" name="close"
         class="btn-dismiss-nav-banner"><i class="icon-cancel"></i>

From f941a01c97d59afd38a00ab389780c388b893f08 Mon Sep 17 00:00:00 2001
From: Rachele Morino <rachelekm@gmail.com>
Date: Tue, 16 Jan 2024 10:10:02 -0500
Subject: [PATCH 3/3] Format comments

---
 python/cac_tripplanner/templates/base.html                  | 6 +++---
 python/cac_tripplanner/templates/partials/alert-banner.html | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/python/cac_tripplanner/templates/base.html b/python/cac_tripplanner/templates/base.html
index 2943d803..b7807a6d 100644
--- a/python/cac_tripplanner/templates/base.html
+++ b/python/cac_tripplanner/templates/base.html
@@ -174,9 +174,9 @@
         jQuery(document).ready(function ($) {
             // update this for every new alert to match id in alert-banner.html
             var alertId = 'gophillygo-alert-2024-01-12',
-            hasAlertMessage = jQuery('.alert-body').text().trim(),
-            wasAlreadyHidden = localStorage.getItem(alertId) || false,
-            shouldShowBanner = hasAlertMessage && !wasAlreadyHidden;
+              hasAlertMessage = jQuery('.alert-body').text().trim(),
+              wasAlreadyHidden = localStorage.getItem(alertId) || false,
+              shouldShowBanner = hasAlertMessage && !wasAlreadyHidden;
             if(shouldShowBanner){
                 jQuery('.nav-banner').removeClass('hidden');
             };
diff --git a/python/cac_tripplanner/templates/partials/alert-banner.html b/python/cac_tripplanner/templates/partials/alert-banner.html
index f69f8a22..dfcce602 100644
--- a/python/cac_tripplanner/templates/partials/alert-banner.html
+++ b/python/cac_tripplanner/templates/partials/alert-banner.html
@@ -2,7 +2,7 @@
     <div class="alert-body">
         <!-- Alert ID gophillygo-alert-2024-01-12 -->
         <!-- Add text here and update the Alert ID comment above to match
-            alertId in base.html. Will show an alert at the top of the page. -->
+        alertId in base.html. Will show an alert at the top of the page. -->
         </div>
     <button title="Dismiss this message" name="close"
         class="btn-dismiss-nav-banner"><i class="icon-cancel"></i>