Merge branch 'main' into 2.0-pre

# Conflicts:
#	core/constants.py
#	templates/status.html
This commit is contained in:
Ian Renton
2026-08-05 20:34:26 +01:00
11 changed files with 57 additions and 15 deletions
+1 -1
View File
@@ -76,7 +76,7 @@
</div>
<script src="/static/js/add-spot.js?v=1785434214"></script>
<script src="/static/js/add-spot.js?v=1785958091"></script>
<script>$(document).ready(function () {
$("#nav-link-add-spot").addClass("active");
}); <!-- highlight active page in nav --></script>
+1 -1
View File
@@ -82,7 +82,7 @@
</div>
<script src="/static/js/alerts.js?v=1785434213"></script>
<script src="/static/js/alerts.js?v=1785958091"></script>
<script>$(document).ready(function () {
$("#nav-link-alerts").addClass("active");
}); <!-- highlight active page in nav --></script>
+2 -2
View File
@@ -82,8 +82,8 @@
<script>
let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
</script>
<script src="/static/js/spotsbandsandmap.js?v=1785434214"></script>
<script src="/static/js/bands.js?v=1785434214"></script>
<script src="/static/js/spotsbandsandmap.js?v=1785958091"></script>
<script src="/static/js/bands.js?v=1785958091"></script>
<script>$(document).ready(function () {
$("#nav-link-bands").addClass("active");
}); <!-- highlight active page in nav --></script>
+5 -5
View File
@@ -1,6 +1,6 @@
{% extends "skeleton.html" %}
{% block head_extra %}
<link rel="stylesheet" href="/static/css/style.css?v=1785434213" type="text/css">
<link rel="stylesheet" href="/static/css/style.css?v=1785958091" type="text/css">
<link href="/static/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
<link href="/static/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
<link href="/static/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -10,10 +10,10 @@
<script src="/static/vendor/js/bootstrap-5.3.8.bundle.min.js"></script>
<script src="/static/vendor/js/tinycolor2-1.6.0.min.js"></script>
<script src="/static/js/utils.js?v=1785434213"></script>
<script src="/static/js/ui-ham.js?v=1785434213"></script>
<script src="/static/js/geo.js?v=1785434213"></script>
<script src="/static/js/common.js?v=1785434213"></script>
<script src="/static/js/utils.js?v=1785958091"></script>
<script src="/static/js/ui-ham.js?v=1785958091"></script>
<script src="/static/js/geo.js?v=1785958091"></script>
<script src="/static/js/common.js?v=1785958091"></script>
{% end %}
{% block body %}
<div class="container">
+1 -1
View File
@@ -284,7 +284,7 @@
</div>
<script src="/static/vendor/js/chart-4.4.9.umd.min.js"></script>
<script src="/static/js/conditions.js?v=1785434213"></script>
<script src="/static/js/conditions.js?v=1785958091"></script>
<script>$(document).ready(function () {
$("#nav-link-conditions").addClass("active");
}); <!-- highlight active page in nav --></script>
+2 -2
View File
@@ -115,8 +115,8 @@
<script>
let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
</script>
<script src="/static/js/spotsbandsandmap.js?v=1785434213"></script>
<script src="/static/js/map.js?v=1785434213"></script>
<script src="/static/js/spotsbandsandmap.js?v=1785958091"></script>
<script src="/static/js/map.js?v=1785958091"></script>
<script>$(document).ready(function () {
$("#nav-link-map").addClass("active");
}); <!-- highlight active page in nav --></script>
+2 -2
View File
@@ -121,8 +121,8 @@
<script>
let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
</script>
<script src="/static/js/spotsbandsandmap.js?v=1785434213"></script>
<script src="/static/js/spots.js?v=1785434213"></script>
<script src="/static/js/spotsbandsandmap.js?v=1785958091"></script>
<script src="/static/js/spots.js?v=1785958091"></script>
<script>$(document).ready(function () {
$("#nav-link-spots").addClass("active");
}); <!-- highlight active page in nav --></script>
+1 -1
View File
@@ -81,7 +81,7 @@
</div>
</div>
<script src="/static/js/status.js?v=1785434213"></script>
<script src="/static/js/status.js?v=1785958091"></script>
<script>
$(document).ready(function () {
$("#nav-link-status").addClass("active");