Merge remote-tracking branch 'upstream/testing' into testing

pull/448/head
Mark Jessop 2021-04-18 19:03:08 +09:30
commit 9b1c76e12b
1 zmienionych plików z 35 dodań i 4 usunięć

Wyświetl plik

@ -68,7 +68,10 @@
async: true,
success: function(data) {
// Update the current version field.
$('#currentversion').text(data.current);
if (getCookie('version') == "false") {}
else {
$('#currentversion').text(data.current);
}
// Update the latest version area.
if(data.latest == 'Latest'){
@ -273,6 +276,13 @@
document.getElementById("showimperialbutton").checked = false;
}
// Check if user has version shown selection.
if (getCookie('version') == 'false') {
document.getElementById("showversionbutton").checked = false;
} else {
document.getElementById("showversionbutton").checked = true;
}
// Check if user has preffered scan chart visiblity.
if (getCookie('scan') == 'true') {
document.getElementById("showscanbutton").checked = true;
@ -354,6 +364,17 @@
}
});
// Check if show version button has been ticked.
$('#showversionbutton').change(function() {
if ($(this).is(":checked")) {
setCookie("version", 'true', 365);
location.reload();
} else {
setCookie("version", 'false', 365);
location.reload();
}
});
// Check if UTC button has been ticked.
$('#showUTCbutton').change(function() {
if ($(this).is(":checked")) {
@ -1418,7 +1439,17 @@
</label>
</div>
<br>
<br>
<br>
<h2 style="display:inline;vertical-align:middle;">Show Software Version</h2>
&nbsp;
<div style="display:inline;vertical-align:middle;">
<label class="switch">
<input type="checkbox" id="showversionbutton">
<span class="slider round"></span>
</label>
</div>
<br>
<br>
<h2 style="display:inline;vertical-align:middle;">Live KML</h2>
&nbsp;
<div style="display:inline;vertical-align:middle;">
@ -1444,7 +1475,7 @@
<!-- Wrapper for main screen -->
<div id="main" onload="loadMap();">
<div>
<span style="font-size:3vh;cursor:pointer;" onclick="changeNav()">&#9776; Radiosonde Auto-RX <span id="currentversion"></span></span>
<span style="font-size:3vh;cursor:pointer;" onclick="changeNav()">&#9776; Radiosonde Auto-RX <span id="currentversion" style="white-space:nowrap"></span></span>
</div>
<span style="font-size:2vh;" id="footertext"></span>
<p style="font-size:2vh;">Station: <span id="station_callsign">???</span></p>
@ -1463,4 +1494,4 @@
</div>
</div>
</body>
</html>
</html>