Merge remote-tracking branch 'origin/main'

# Conflicts:
#	core/constants.py
#	pyproject.toml
#	templates/add_spot.html
#	templates/alerts.html
#	templates/bands.html
#	templates/base.html
#	templates/conditions.html
#	templates/map.html
#	templates/spots.html
#	templates/status.html
This commit is contained in:
Ian Renton
2026-08-28 15:46:24 +01:00
29 changed files with 80 additions and 63 deletions
+3 -2
View File
@@ -109,11 +109,12 @@
<script src="/static/vendor/js/leaflet-cqzones.js"></script>
<script src="/static/vendor/js/leaflet-workedallbritainireland.js" type="module"></script>
<script src="/static/js/spotsbandsandmap.js?v=1787928232"></script>
<script>
const CARTODB_API_KEY = "{{ web_ui_options.get('cartodb_api_key', '') }}";
</script>
<script src="/static/js/map.js?v=1787928232"></script>
<script src="/static/js/spotsbandsandmap.js?v=1787928384"></script>
<script src="/static/js/map.js?v=1787928384"></script>
<script>$(document).ready(function () {
$("#nav-link-map").addClass("active");
}); <!-- highlight active page in nav --></script>