mirror of
https://git.ianrenton.com/ian/spothole.git
synced 2026-08-11 07:01:41 +00:00
Merge branch 'main' into 2.0-pre
# Conflicts: # core/constants.py # templates/status.html
This commit is contained in:
+1
-1
@@ -93,7 +93,7 @@ spot_providers:
|
||||
allow_rbn_spots: false
|
||||
|
||||
- class: "RBN"
|
||||
- # RBN sources have a "name" property in case you want to differentiate between the CW/RTTY and FT8 sources.
|
||||
# RBN sources have a "name" property in case you want to differentiate between the CW/RTTY and FT8 sources.
|
||||
name: "RBN CW/RTTY"
|
||||
enabled: false
|
||||
port: 7000
|
||||
|
||||
@@ -110,10 +110,10 @@ class GMA(HTTPSpotProvider):
|
||||
elif not ref_response.from_cache:
|
||||
if not ref_response.ok:
|
||||
logging.warning(
|
||||
f"HTTP {ref_response.status_code} when looking up GMA ref {source_spot["REF"]}")
|
||||
f"HTTP {ref_response.status_code} when looking up GMA ref {source_spot['REF']}")
|
||||
else:
|
||||
logging.warning(
|
||||
f"GMA API returned a malformed response when looking up ref {source_spot["REF"]}")
|
||||
f"GMA API returned a malformed response when looking up ref {source_spot['REF']}")
|
||||
except:
|
||||
logging.warning("Exception when looking up " + self.REF_INFO_URL_ROOT + source_spot[
|
||||
"REF"] + ", ignoring this spot for now", exc_info=True)
|
||||
|
||||
@@ -76,7 +76,7 @@
|
||||
|
||||
</div>
|
||||
|
||||
<script src="/static/js/add-spot.js?v=1786338394"></script>
|
||||
<script src="/static/js/add-spot.js?v=1786423818"></script>
|
||||
<script>$(document).ready(function () {
|
||||
$("#nav-link-add-spot").addClass("active");
|
||||
}); <!-- highlight active page in nav --></script>
|
||||
|
||||
@@ -82,7 +82,7 @@
|
||||
|
||||
</div>
|
||||
|
||||
<script src="/static/js/alerts.js?v=1786338394"></script>
|
||||
<script src="/static/js/alerts.js?v=1786423818"></script>
|
||||
<script>$(document).ready(function () {
|
||||
$("#nav-link-alerts").addClass("active");
|
||||
}); <!-- highlight active page in nav --></script>
|
||||
|
||||
@@ -79,8 +79,8 @@
|
||||
|
||||
</div>
|
||||
|
||||
<script src="/static/js/spotsbandsandmap.js?v=1786338394"></script>
|
||||
<script src="/static/js/bands.js?v=1786338394"></script>
|
||||
<script src="/static/js/spotsbandsandmap.js?v=1786423818"></script>
|
||||
<script src="/static/js/bands.js?v=1786423818"></script>
|
||||
<script>$(document).ready(function () {
|
||||
$("#nav-link-bands").addClass("active");
|
||||
}); <!-- highlight active page in nav --></script>
|
||||
|
||||
+5
-5
@@ -1,6 +1,6 @@
|
||||
{% extends "skeleton.html" %}
|
||||
{% block head_extra %}
|
||||
<link rel="stylesheet" href="/static/css/style.css?v=1786338394" type="text/css">
|
||||
<link rel="stylesheet" href="/static/css/style.css?v=1786423818" 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=1786338394"></script>
|
||||
<script src="/static/js/ui-ham.js?v=1786338394"></script>
|
||||
<script src="/static/js/geo.js?v=1786338394"></script>
|
||||
<script src="/static/js/common.js?v=1786338394"></script>
|
||||
<script src="/static/js/utils.js?v=1786423818"></script>
|
||||
<script src="/static/js/ui-ham.js?v=1786423818"></script>
|
||||
<script src="/static/js/geo.js?v=1786423818"></script>
|
||||
<script src="/static/js/common.js?v=1786423818"></script>
|
||||
{% end %}
|
||||
{% block body %}
|
||||
<div class="container">
|
||||
|
||||
@@ -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=1786338394"></script>
|
||||
<script src="/static/js/conditions.js?v=1786423818"></script>
|
||||
<script>$(document).ready(function () {
|
||||
$("#nav-link-conditions").addClass("active");
|
||||
}); <!-- highlight active page in nav --></script>
|
||||
|
||||
+2
-2
@@ -112,8 +112,8 @@
|
||||
<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=1786338394"></script>
|
||||
<script src="/static/js/map.js?v=1786338394"></script>
|
||||
<script src="/static/js/spotsbandsandmap.js?v=1786423818"></script>
|
||||
<script src="/static/js/map.js?v=1786423818"></script>
|
||||
<script>$(document).ready(function () {
|
||||
$("#nav-link-map").addClass("active");
|
||||
}); <!-- highlight active page in nav --></script>
|
||||
|
||||
@@ -118,8 +118,8 @@
|
||||
|
||||
</div>
|
||||
|
||||
<script src="/static/js/spotsbandsandmap.js?v=1786338394"></script>
|
||||
<script src="/static/js/spots.js?v=1786338394"></script>
|
||||
<script src="/static/js/spotsbandsandmap.js?v=1786423818"></script>
|
||||
<script src="/static/js/spots.js?v=1786423818"></script>
|
||||
<script>$(document).ready(function () {
|
||||
$("#nav-link-spots").addClass("active");
|
||||
}); <!-- highlight active page in nav --></script>
|
||||
|
||||
@@ -81,7 +81,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script src="/static/js/status.js?v=1786338394"></script>
|
||||
<script src="/static/js/status.js?v=1786423818"></script>
|
||||
<script>
|
||||
$(document).ready(function () {
|
||||
$("#nav-link-status").addClass("active");
|
||||
|
||||
Reference in New Issue
Block a user