From e98326db37e86d499ffd0d7899bc6bce57331f86 Mon Sep 17 00:00:00 2001
From: Luke Fretwell <luke@lukefretwell.com>
Date: Sun, 7 Jun 2026 07:08:58 -0700
Subject: [PATCH] Standardize footer: canonical structure, analytics.html, move
 nav scripts to js.html, feedback URL/a11y/hostname fix

---
 _includes/analytics.html | 11 +++++++
 _includes/feedback.html  | 28 +++++++++--------
 _includes/footer.html    | 66 +++++++++++++---------------------------
 _includes/js.html        | 12 +++++++-
 4 files changed, 59 insertions(+), 58 deletions(-)
 create mode 100644 _includes/analytics.html

diff --git a/_includes/analytics.html b/_includes/analytics.html
new file mode 100644
index 00000000..72c2fc47
--- /dev/null
+++ b/_includes/analytics.html
@@ -0,0 +1,11 @@
+<!-- Google tag (gtag.js) -->
+<script
+  async
+  defer
+  src="https://www.googletagmanager.com/gtag/js?id=G-9NLQN90ZH2"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+  gtag('config', 'G-9NLQN90ZH2');
+</script>
diff --git a/_includes/feedback.html b/_includes/feedback.html
index 821a69b3..35656077 100644
--- a/_includes/feedback.html
+++ b/_includes/feedback.html
@@ -1,23 +1,27 @@
 <a
-  href="https://scangov.com/"
+  href="https://scangov.com/plans"
   id="feedback-button"
-  aria-label="Get ScanGov — return to main site"
-  class="feedback btn">
+  class="feedback btn"
+  aria-hidden="true"
+  tabindex="-1">
   Get ScanGov
 </a>
+
 <script>
   const feedbackButton = document.getElementById("feedback-button");
   const footer = document.querySelector("footer");
 
   function updateButton() {
-  const scrolled = document.documentElement.scrollTop > window.innerHeight * 0.3;
-  const footerVisible = footer && footer.getBoundingClientRect().top < window.innerHeight;
-  const visible = scrolled && !footerVisible;
-  feedbackButton.classList.toggle('is-visible', visible);
-  feedbackButton.setAttribute('aria-hidden', visible ? 'false' : 'true');
-  feedbackButton.setAttribute('tabindex', visible ? '0' : '-1');
+    const scrolled = document.documentElement.scrollTop > window.innerHeight * 0.3;
+    const footerVisible = footer && footer.getBoundingClientRect().top < window.innerHeight;
+    const visible = scrolled && !footerVisible;
+    feedbackButton.classList.toggle('is-visible', visible);
+    feedbackButton.setAttribute('aria-hidden', visible ? 'false' : 'true');
+    feedbackButton.setAttribute('tabindex', visible ? '0' : '-1');
   }
 
-  window.addEventListener('scroll', updateButton);
-  updateButton();
-</script>
\ No newline at end of file
+  if (window.location.hostname !== 'my.scangov.com') {
+    window.addEventListener('scroll', updateButton);
+    updateButton();
+  }
+</script>
diff --git a/_includes/footer.html b/_includes/footer.html
index d9db2072..850d8f5a 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,4 +1,21 @@
 <footer>
+  {% if footer %}
+  <div class="container mt-5 pt-5 border-top">
+    <div class="row">
+      {% for col in footer %}
+        <div class="col-6 col-sm-6 col-md-3 mb-3">
+          <ul class="nav flex-column">
+            {% for item in col %}
+              <li class="small mb-1">
+                <a href="{{ item.url }}" class="nav-link p-0 text-body-secondary">{{ item.title }}</a>
+              </li>
+            {% endfor %}
+          </ul>
+        </div>
+      {% endfor %}
+    </div>
+  </div>
+  {% endif %}
   <div class="container-fluid py-4 mt-4 border-top">
     <div class="row">
       <div class="col-12 text-center">
@@ -12,50 +29,9 @@
     </div>
   </div>
 </footer>
-<script>
-  function onThisPage() {
-    let targetEl = document.querySelector('.js-on-this-page');
-    let headersToLink = document.querySelectorAll('h2');
-    console.log(headersToLink)
-    let html = `<p class="border-bottom pb-3">On this page</p>
-      <ul class="nav flex-column">
-        ${Array.from(headersToLink).map(h => {
-          return `<li class="mb-2 small ">
-            <a href="#${h.id}">${h.textContent.trim()}</a>
-          </li>`;
-        }).join('')}
-      </ul>`;
-      targetEl.innerHTML = html;
-  }
-  if(document.querySelector('.js-on-this-page')) {
-    onThisPage();
-  }
-</script>
-<!-- Google tag (gtag.js) -->
-<script
-  async
-  defer
-  src="https://www.googletagmanager.com/gtag/js?id=G-9NLQN90ZH2"></script>
-<script>
-  window.dataLayer = window.dataLayer || [];
-  function gtag(){dataLayer.push(arguments);}
-  gtag('js', new Date());
-
-  gtag('config', 'G-9NLQN90ZH2');
-</script>
+{% include "analytics.html" %}
 {% include "js.html" %}
-{% getBundle "fontawesome" %}
 {% include "feedback.html" %}
-<script>
-  document.querySelector('button.navbar-toggler').addEventListener('click',function(e) {
-    let el = document.querySelector(this.dataset.target);
-    console.log(el)
-    el.classList.toggle('show');
-  })
-  if(document.getElementById('dropdownMenuButton')) {
-    document.getElementById('dropdownMenuButton').addEventListener('click',function(e) {
-      let el = document.querySelector('[aria-labelledby="'+this.id+'"]')
-      el.classList.toggle('show');
-    })
-  }
-</script></body></html>
\ No newline at end of file
+{% getBundle "fontawesome" %}
+</body>
+</html>
diff --git a/_includes/js.html b/_includes/js.html
index 277cee91..2b813fc7 100644
--- a/_includes/js.html
+++ b/_includes/js.html
@@ -13,4 +13,14 @@
 
   // Update instantly when OS preference changes
   darkQuery.addEventListener('change', e => setTheme(e.matches));
-</script>
\ No newline at end of file
+</script>
+<script>
+  document.querySelector('button.navbar-toggler').addEventListener('click', function(e) {
+    document.querySelector(this.dataset.target).classList.toggle('show');
+  });
+  if (document.getElementById('dropdownMenuButton')) {
+    document.getElementById('dropdownMenuButton').addEventListener('click', function(e) {
+      document.querySelector('[aria-labelledby="' + this.id + '"]').classList.toggle('show');
+    });
+  }
+</script>