w1cdn/spothole
1
0
Fork 0
mirror of https://git.ianrenton.com/ian/spothole.git synced 2026-04-30 02:35:57 +00:00
Code Issues 13 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	templates/about.html
#	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-04-05 09:28:44 +01:00
parent 497b84f5dc d51e5184a1
commit e170f9c6c2
16 changed files with 201 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/about.html
View File

@@ -67,7 +67,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=1775377643"></script>
<script src="/js/common.js?v=1775377724"></script>
<script>$(document).ready(function() { $("#nav-link-about").addClass("active"); }); <!-- highlight active page in nav --></script>
{% end %}

4
templates/add_spot.html
View File

@@ -69,8 +69,8 @@
</div>
<script src="/js/common.js?v=1775377643"></script>
<script src="/js/add-spot.js?v=1775377643"></script>
<script src="/js/common.js?v=1775377724"></script>
<script src="/js/add-spot.js?v=1775377724"></script>
<script>$(document).ready(function() { $("#nav-link-add-spot").addClass("active"); }); <!-- highlight active page in nav --></script>
{% end %}

4
templates/alerts.html
View File

@@ -56,8 +56,8 @@
</div>
<script src="/js/common.js?v=1775377643"></script>
<script src="/js/alerts.js?v=1775377643"></script>
<script src="/js/common.js?v=1775377724"></script>
<script src="/js/alerts.js?v=1775377724"></script>
<script>$(document).ready(function() { $("#nav-link-alerts").addClass("active"); }); <!-- highlight active page in nav --></script>
{% end %}

6
templates/bands.html
View File

@@ -62,9 +62,9 @@
<script>
let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
</script>
<script src="/js/common.js?v=1775377643"></script>
<script src="/js/spotsbandsandmap.js?v=1775377643"></script>
<script src="/js/bands.js?v=1775377643"></script>
<script src="/js/common.js?v=1775377724"></script>
<script src="/js/spotsbandsandmap.js?v=1775377724"></script>
<script src="/js/bands.js?v=1775377724"></script>
<script>$(document).ready(function() { $("#nav-link-bands").addClass("active"); }); <!-- highlight active page in nav --></script>
{% end %}

10
templates/base.html
View File

@@ -46,10 +46,10 @@
crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/tinycolor2@1.6.0/cjs/tinycolor.min.js"></script>
<script src="https://misc.ianrenton.com/jsutils/utils.js?v=1775377643"></script>
<script src="https://misc.ianrenton.com/jsutils/storage.js?v=1775377643"></script>
<script src="https://misc.ianrenton.com/jsutils/ui-ham.js?v=1775377643"></script>
<script src="https://misc.ianrenton.com/jsutils/geo.js?v=1775377643"></script>
<script src="https://misc.ianrenton.com/jsutils/utils.js?v=1775377724"></script>
<script src="https://misc.ianrenton.com/jsutils/storage.js?v=1775377724"></script>
<script src="https://misc.ianrenton.com/jsutils/ui-ham.js?v=1775377724"></script>
<script src="https://misc.ianrenton.com/jsutils/geo.js?v=1775377724"></script>
</head>
<body>
@@ -71,7 +71,9 @@
{% if allow_spotting %}
<li class="nav-item ms-4"><a href="/add-spot" class="nav-link" id="nav-link-add-spot"><i class="fa-solid fa-comment"></i> Add&nbsp;Spot</a></li>
{% end %}
{% if has_hamqsl or has_noaa_forecast %}
<li class="nav-item ms-4"><a href="/conditions" class="nav-link" id="nav-link-conditions"><i class="fa-solid fa-sun"></i> Conditions</a></li>
{% end %}
<li class="nav-item ms-4"><a href="/status" class="nav-link" id="nav-link-status"><i class="fa-solid fa-chart-simple"></i> Status</a></li>
<li class="nav-item ms-4"><a href="/about" class="nav-link" id="nav-link-about"><i class="fa-solid fa-circle-info"></i> About</a></li>
<li class="nav-item ms-4"><a href="/apidocs" class="nav-link" id="nav-link-api"><i class="fa-solid fa-gear"></i> API</a></li>

14
templates/conditions.html
View File

@@ -1,6 +1,7 @@
{% extends "base.html" %}
{% block content %}
{% if has_hamqsl %}
<div class="card mt-5">
<div class="card-header">
Propagation Conditions
@@ -110,7 +111,9 @@
</div>
<div class="row border-bottom align-items-start me-0">
<div class="col-12 col-md-2 py-2 fw-bold">X-ray Flux</div>
<div id="sw-xray-vals" class="col-12 col-md-3 py-2"><strong id="sw-x-ray"></strong></div>
<div id="sw-xray-vals" class="col-12 col-md-3 py-2">
<span class="me-3"><strong id="sw-xray"></strong></span>
<span class="me-3"><strong>R</strong><strong id="sw-radio-blackout-scale"></strong></span></div>
<div id="sw-xray-desc" class="col-12 col-md-7 py-2"></div>
</div>
<div class="row border-bottom align-items-start me-0">
@@ -129,7 +132,9 @@
<div class="form-text mt-3">Data from <a href="https://hamqsl.com">HamQSL.com</a>.</div>
</div>
</div>
{% end %}
{% if has_noaa_forecast %}
<div class="card mt-5">
<div class="card-header">
Forecast
@@ -152,7 +157,7 @@
</table>
</div>
<div class="col mt-3 px-3">
<h5>Blackout Forecast</h5>
<h5>Radio Blackout Forecast</h5>
<table id="forecast-blackout-table" class="table table-sm mt-2">
<thead>
<tr id="forecast-blackout-head"></tr>
@@ -166,6 +171,7 @@
</div>
</div>
</div>
{% end %}
<div class="card mt-5">
<div class="card-header">
@@ -224,8 +230,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=1775377643"></script>
<script src="/js/conditions.js?v=1775377643"></script>
<script src="/js/common.js?v=1775377724"></script>
<script src="/js/conditions.js?v=1775377724"></script>
<script>$(document).ready(function () {
$("#nav-link-conditions").addClass("active");
}); <!-- highlight active page in nav --></script>

6
templates/map.html
View File

@@ -79,9 +79,9 @@
<script>
let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
</script>
<script src="/js/common.js?v=1775377643"></script>
<script src="/js/spotsbandsandmap.js?v=1775377643"></script>
<script src="/js/map.js?v=1775377643"></script>
<script src="/js/common.js?v=1775377724"></script>
<script src="/js/spotsbandsandmap.js?v=1775377724"></script>
<script src="/js/map.js?v=1775377724"></script>
<script>$(document).ready(function() { $("#nav-link-map").addClass("active"); }); <!-- highlight active page in nav --></script>
{% end %}

6
templates/spots.html
View File

@@ -87,9 +87,9 @@
<script>
let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
</script>
<script src="/js/common.js?v=1775377643"></script>
<script src="/js/spotsbandsandmap.js?v=1775377643"></script>
<script src="/js/spots.js?v=1775377643"></script>
<script src="/js/common.js?v=1775377724"></script>
<script src="/js/spotsbandsandmap.js?v=1775377724"></script>
<script src="/js/spots.js?v=1775377724"></script>
<script>$(document).ready(function() { $("#nav-link-spots").addClass("active"); }); <!-- highlight active page in nav --></script>
{% end %}

4
templates/status.html
View File

@@ -59,8 +59,8 @@
</div>
</div>
<script src="/js/common.js?v=1775377643"></script>
<script src="/js/status.js?v=1775377643"></script>
<script src="/js/common.js?v=1775377724"></script>
<script src="/js/status.js?v=1775377724"></script>
<script>
$(document).ready(function() { $("#nav-link-status").addClass("active"); }); <!-- highlight active page in nav -->
</script>