From af9f542740c9ecd14f348fe93c2a1fc0b460468d Mon Sep 17 00:00:00 2001
From: Ian Renton <ian@ianrenton.com>
Date: Wed, 17 Jun 2026 18:02:21 +0100
Subject: [PATCH] Skip JS integrity checks since jsdelivr docs say they may
 re-minify sources as necessary, potentially resulting in different checksums

(cherry picked from commit e5b2afd7656dd64fb72099e46c01f3a37d68a764)
---
 templates/about.html         |  2 +-
 templates/add_spot.html      | 60 ++++++------------------------------
 templates/alerts.html        |  4 +--
 templates/api_only_home.html |  3 +-
 templates/bands.html         |  6 ++--
 templates/base.html          | 27 ++++++----------
 templates/conditions.html    |  4 +--
 templates/map.html           |  6 ++--
 templates/spots.html         |  6 ++--
 templates/status.html        |  4 +--
 10 files changed, 36 insertions(+), 86 deletions(-)

diff --git a/templates/about.html b/templates/about.html
index b36c287..419d672 100644
--- a/templates/about.html
+++ b/templates/about.html
@@ -69,7 +69,7 @@
     <p>This software is dedicated to the memory of Tom G1PJB, SK, a friend and colleague who sadly passed away around the time I started writing it in Autumn 2025. I was looking forward to showing it to you when it was done.</p>
 </div>
 
-<script src="/js/common.js?v=1781335058"></script>
+<script src="/js/common.js?v=1781811363"></script>
 <script>$(document).ready(function() { $("#nav-link-about").addClass("active"); }); <!-- highlight active page in nav --></script>
 
 {% end %}
\ No newline at end of file
diff --git a/templates/add_spot.html b/templates/add_spot.html
index 5661274..ca67a1d 100644
--- a/templates/add_spot.html
+++ b/templates/add_spot.html
@@ -1,6 +1,13 @@
 {% extends "base.html" %}
 {% block content %}
 
+<div id="add-spot-intro-box" class="permanently-dismissible-box mt-3">
+<div class="alert alert-primary alert-dismissible fade show" role="alert">
+  <i class="fa-solid fa-circle-info"></i> <strong>Adding spots to Spothole</strong><br/>This page is implemented as a proof of concept for adding spots to the Spothole system. Currently, spots added in this way are only visible within Spothole and are not sent "upstream" to DX clusters or xOTA spotting sites. The functionality might be extended to include this in future if there is demand for it. If you'd like this to be added, please give a thumbs-up on <a href="https://git.ianrenton.com/ian/spothole/issues/39" target="_new" class="alert-link">issue #39</a> or get in touch via email.
+  <button type="button" id="add-spot-intro-box-dismiss" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+</div>
+</div>
+
 <div class="mt-3">
     <div id="add-spot-area" class="card mb-3">
         <div class="card-header">
@@ -53,31 +60,6 @@
                 </div>
             </form>
 
-            <div id="upstream-area" class="mt-3" style="display:none;">
-                <div class="row g-2 align-items-center">
-                    <div class="col-auto">
-                        <div class="form-check">
-                            <input class="form-check-input" type="checkbox" id="submit-upstream">
-                            <label class="form-check-label" for="submit-upstream">
-                                Send spot to <span id="upstream-provider-label"></span>
-                            </label>
-                        </div>
-                    </div>
-                    <div class="col-auto" id="upstream-provider-select-col" style="display:none;">
-                        <select id="upstream-provider-select" class="form-select form-select-sm"></select>
-                    </div>
-                    <div class="col-auto">
-                        <button type="button" class="btn btn-sm btn-outline-secondary" id="upstream-credentials-btn" onclick="showCredentialsModal();" style="display:none;">
-                            <i class="fa-solid fa-key"></i> Credentials
-                        </button>
-                    </div>
-                </div>
-            </div>
-
-            <div id="recaptcha-area" class="mt-3" style="display:none;">
-                <div id="recaptcha-widget"></div>
-            </div>
-
             <div id="result-good"></div>
             <div id="result-bad"></div>
 
@@ -87,30 +69,8 @@
 
 </div>
 
-<!-- Credentials modal -->
-<div class="modal fade" id="credentials-modal" tabindex="-1" aria-labelledby="credentials-modal-label" aria-hidden="true">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title" id="credentials-modal-label">Credentials for <span id="credentials-provider-name"></span></h5>
-        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-      </div>
-      <div class="modal-body">
-        <p class="small text-muted">Credentials are stored only in your browser and are never saved on the server.</p>
-        <div id="credentials-fields"></div>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
-        <button type="button" class="btn btn-primary" onclick="saveCredentials();">Save</button>
-      </div>
-    </div>
-  </div>
-</div>
-
-<script>window._recaptchaSiteKey = {% raw json_encode(web_ui_options.get('recaptcha-site-key', '')) %};
-window._allowUpstreamSpotting = {% raw json_encode(web_ui_options.get('allow-upstream-spotting', True)) %};</script>
-<script src="/js/common.js?v=1781335058"></script>
-<script src="/js/add-spot.js?v=1781335058"></script>
+<script src="/js/common.js?v=1781811363"></script>
+<script src="/js/add-spot.js?v=1781811363"></script>
 <script>$(document).ready(function() { $("#nav-link-add-spot").addClass("active"); }); <!-- highlight active page in nav --></script>
 
-{% end %}
+{% end %}
\ No newline at end of file
diff --git a/templates/alerts.html b/templates/alerts.html
index 532c686..0c5ccb9 100644
--- a/templates/alerts.html
+++ b/templates/alerts.html
@@ -70,8 +70,8 @@
 
 </div>
 
-<script src="/js/common.js?v=1781335058"></script>
-<script src="/js/alerts.js?v=1781335058"></script>
+<script src="/js/common.js?v=1781811363"></script>
+<script src="/js/alerts.js?v=1781811363"></script>
 <script>$(document).ready(function() { $("#nav-link-alerts").addClass("active"); }); <!-- highlight active page in nav --></script>
 
 {% end %}
\ No newline at end of file
diff --git a/templates/api_only_home.html b/templates/api_only_home.html
index 68aeead..28625c2 100644
--- a/templates/api_only_home.html
+++ b/templates/api_only_home.html
@@ -1,7 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.8/dist/css/bootstrap.min.css" rel="stylesheet"
-          integrity="sha384-sRIl4kxILFvY47J16cr9ZwB07vP4J8+LH7qKQnuqkuIAvNWLzeN8tE5YBujZqJLB" crossorigin="anonymous">
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.8/dist/css/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous">
 {% end %}
 {% block body %}
 <div class="container mt-5">
diff --git a/templates/bands.html b/templates/bands.html
index db6d520..879dbf7 100644
--- a/templates/bands.html
+++ b/templates/bands.html
@@ -76,9 +76,9 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/common.js?v=1781335058"></script>
-<script src="/js/spotsbandsandmap.js?v=1781335058"></script>
-<script src="/js/bands.js?v=1781335058"></script>
+<script src="/js/common.js?v=1781811363"></script>
+<script src="/js/spotsbandsandmap.js?v=1781811363"></script>
+<script src="/js/bands.js?v=1781811363"></script>
 <script>$(document).ready(function() { $("#nav-link-bands").addClass("active"); }); <!-- highlight active page in nav --></script>
 
 {% end %}
\ No newline at end of file
diff --git a/templates/base.html b/templates/base.html
index 359b550..14d6841 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,27 +1,18 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-    <link rel="stylesheet" href="/css/style.css?v=1781335058" type="text/css">
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.8/dist/css/bootstrap.min.css" rel="stylesheet"
-          integrity="sha384-sRIl4kxILFvY47J16cr9ZwB07vP4J8+LH7qKQnuqkuIAvNWLzeN8tE5YBujZqJLB" crossorigin="anonymous">
+    <link rel="stylesheet" href="/css/style.css?v=1781811363" type="text/css">
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.8/dist/css/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous">
     <link href="/fa/css/fontawesome.min.css" rel="stylesheet" />
     <link href="/fa/css/solid.min.css" rel="stylesheet" />
 
-    <script src="https://cdn.jsdelivr.net/npm/jquery@3.7.1/dist/jquery.min.js"
-            integrity="sha384-1H217gwSVyLSIfaLxHbE7dRb3v4mYCKbpQvzx0cegeju1MVsGrX5xXxAvs/HgeFs"
-            crossorigin="anonymous"></script>
-    <script src="https://cdn.jsdelivr.net/npm/moment@2.29.4/moment.min.js"
-            integrity="sha384-N1xdnJwBzqfCpEDxEeSQzv4NPVPViBQq2NLbzth3YA1pLvR9mtf+TV5g6O+KLkPY"
-            crossorigin="anonymous"></script>
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.8/dist/js/bootstrap.bundle.min.js"
-            integrity="sha384-FKyoEForCGlyvwx9Hj09JcYn3nv7wiPVlz7YYwJrWVcXK/BmnVDxM+D2scQbITxI"
-            crossorigin="anonymous"></script>
-    <script src="https://cdn.jsdelivr.net/npm/tinycolor2@1.6.0/cjs/tinycolor.min.js"
-            integrity="sha384-L1eE4eD41kpBIWe2I0eHy+GnEUC4RIpcvibVW2JCminuPlTl+2Bc528iPdVMg5Dn"
-            crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/jquery@3.7.1/dist/jquery.min.js" crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/moment@2.29.4/moment.min.js" crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.8/dist/js/bootstrap.bundle.min.js" crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/tinycolor2@1.6.0/cjs/tinycolor.min.js" crossorigin="anonymous"></script>
 
-    <script src="https://misc.ianrenton.com/jsutils/utils.js?v=1781335058"></script>
-    <script src="https://misc.ianrenton.com/jsutils/ui-ham.js?v=1781335058"></script>
-    <script src="https://misc.ianrenton.com/jsutils/geo.js?v=1781335058"></script>
+    <script src="https://misc.ianrenton.com/jsutils/utils.js?v=1781811363"></script>
+    <script src="https://misc.ianrenton.com/jsutils/ui-ham.js?v=1781811363"></script>
+    <script src="https://misc.ianrenton.com/jsutils/geo.js?v=1781811363"></script>
 {% end %}
 {% block body %}
 <div class="container">
diff --git a/templates/conditions.html b/templates/conditions.html
index 81b9ac7..8b04a2e 100644
--- a/templates/conditions.html
+++ b/templates/conditions.html
@@ -284,8 +284,8 @@
 </div>
 
 <script src="https://cdn.jsdelivr.net/npm/chart.js@4.4.9/dist/chart.umd.min.js"></script>
-<script src="/js/common.js?v=1781335058"></script>
-<script src="/js/conditions.js?v=1781335058"></script>
+<script src="/js/common.js?v=1781811363"></script>
+<script src="/js/conditions.js?v=1781811363"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/map.html b/templates/map.html
index 5644a47..5b25c6a 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -94,9 +94,9 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/common.js?v=1781335058"></script>
-<script src="/js/spotsbandsandmap.js?v=1781335058"></script>
-<script src="/js/map.js?v=1781335058"></script>
+<script src="/js/common.js?v=1781811363"></script>
+<script src="/js/spotsbandsandmap.js?v=1781811363"></script>
+<script src="/js/map.js?v=1781811363"></script>
 <script>$(document).ready(function() { $("#nav-link-map").addClass("active"); }); <!-- highlight active page in nav --></script>
 
 {% end %}
\ No newline at end of file
diff --git a/templates/spots.html b/templates/spots.html
index 7e8c354..309968b 100644
--- a/templates/spots.html
+++ b/templates/spots.html
@@ -104,9 +104,9 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/common.js?v=1781335058"></script>
-<script src="/js/spotsbandsandmap.js?v=1781335058"></script>
-<script src="/js/spots.js?v=1781335058"></script>
+<script src="/js/common.js?v=1781811363"></script>
+<script src="/js/spotsbandsandmap.js?v=1781811363"></script>
+<script src="/js/spots.js?v=1781811363"></script>
 <script>$(document).ready(function() { $("#nav-link-spots").addClass("active"); }); <!-- highlight active page in nav --></script>
 
 {% end %}
\ No newline at end of file
diff --git a/templates/status.html b/templates/status.html
index 143bd09..3681101 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -59,8 +59,8 @@
     </div>
 </div>
 
-<script src="/js/common.js?v=1781335058"></script>
-<script src="/js/status.js?v=1781335058"></script>
+<script src="/js/common.js?v=1781811363"></script>
+<script src="/js/status.js?v=1781811363"></script>
 <script>
     $(document).ready(function() { $("#nav-link-status").addClass("active"); }); <!-- highlight active page in nav -->
 </script>