From f1192e9414b53eeb1551fe8c747dec89ae1c8a61 Mon Sep 17 00:00:00 2001 From: James Wilson Date: Thu, 6 Apr 2017 14:18:23 -0500 Subject: [PATCH 1/4] Add fall back fonts for Helvetica Neue --- public_html/style.css | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/public_html/style.css b/public_html/style.css index 277925a..e1af4db 100644 --- a/public_html/style.css +++ b/public_html/style.css @@ -1,5 +1,5 @@ html, body { - margin: 0; padding: 0; background-color: #ffffff; font-family: Helvetica Neue, Sans-Serif; + margin: 0; padding: 0; background-color: #ffffff; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 10pt; overflow: auto; height: 100%; } @@ -196,7 +196,7 @@ div#loader { z-index: 99; position: absolute; left: 0; top: 0; bottom: 0; right: .selected { background-color: #dddddd; } .plane_table_row { cursor: pointer; - font-family: Helvetica Neue; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; } .hidden { display: none; } @@ -236,7 +236,7 @@ select.error, textarea.error, input.error { /* new css */ .rangeRingText { - font-family: Helvetica Neue; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-weight: bold; font-size: 8px; color: #333333; @@ -245,7 +245,7 @@ select.error, textarea.error, input.error { .dateTime { - font-family: Helvetica Neue; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-weight: bold; font-size: 14px; line-height: 18px; @@ -259,7 +259,7 @@ select.error, textarea.error, input.error { .infoHeading { - font-family: Helvetica Neue; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 14px; line-height: 18px; color: #002F5D; @@ -268,7 +268,7 @@ select.error, textarea.error, input.error { .infoData { - font-family: Helvetica Neue; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 14px; line-height: 18px; color: #000000; @@ -277,7 +277,7 @@ select.error, textarea.error, input.error { .legend { - font-family: Helvetica Neue; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; width: 100%; font-size: 12px; color: #000000; @@ -289,7 +289,7 @@ select.error, textarea.error, input.error { .settingsHeading { - font-family: Helvetica Neue; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 14px; line-height: 20px; color: #002F5D; @@ -298,7 +298,7 @@ select.error, textarea.error, input.error { .settingsText { - font-family: Helvetica Neue; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 14px; line-height: 20px; text-indent: 16px @@ -308,7 +308,7 @@ select.error, textarea.error, input.error { .link { - font-family: Helvetica Neue; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 10px; line-height: 20px; color: #0000C8; @@ -318,7 +318,7 @@ select.error, textarea.error, input.error { .infoHeading { - font-family: Helvetica Neue; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 12px; line-height: 16px; color: #666666; @@ -327,7 +327,7 @@ select.error, textarea.error, input.error { .infoData { - font-family: Helvetica Neue; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 12px; line-height: 16px; color: #000000; @@ -383,7 +383,7 @@ select.error, textarea.error, input.error { .buttonText { - font-family: Helvetica Neue; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-weight: bold; font-size: 12px; color: #FFFFFF; @@ -448,7 +448,7 @@ select.error, textarea.error, input.error { } .identLarge { - font-family: Helvetica Neue; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 24px; line-height: 20px; color: #002F5D; @@ -457,7 +457,7 @@ select.error, textarea.error, input.error { } .identSmall { - font-family: Helvetica Neue; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 12px; font-weight: bold; line-height: 20px; @@ -535,7 +535,7 @@ select.error, textarea.error, input.error { } #dump1090_infoblock { - font-family: Helvetica Neue; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; } .infoBlockTitleText { From bd96af982768133cef59d1f039a3315ca42a7845 Mon Sep 17 00:00:00 2001 From: James Wilson Date: Thu, 6 Apr 2017 14:23:30 -0500 Subject: [PATCH 2/4] Check for other TIS-B types --- public_html/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public_html/script.js b/public_html/script.js index bc3fcbb..57c4d96 100644 --- a/public_html/script.js +++ b/public_html/script.js @@ -1001,7 +1001,7 @@ function refreshTableInfo() { if (tableplane.getDataSource() === "adsb_icao") { classes += " vPosition"; - } else if (tableplane.getDataSource() === "tisb_trackfile") { + } else if (tableplane.getDataSource() === "tisb_trackfile" || tableplane.getDataSource() === "tisb_icao" || tableplane.getDataSource() === "tisb_other") { classes += " tisb"; } else if (tableplane.getDataSource() === "mlat") { classes += " mlat"; From d225b9bc3fd242821d1bba181d64decb9ef45aea Mon Sep 17 00:00:00 2001 From: James Wilson Date: Tue, 25 Apr 2017 18:28:57 -0500 Subject: [PATCH 3/4] Fix event variable name --- public_html/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public_html/script.js b/public_html/script.js index 57c4d96..795c750 100644 --- a/public_html/script.js +++ b/public_html/script.js @@ -1457,7 +1457,7 @@ function initializeUnitsSelector() { } function onDisplayUnitsChanged(e) { - var displayUnits = event.target.value; + var displayUnits = e.target.value; // Save display units to local storage localStorage['displayUnits'] = displayUnits; DisplayUnits = displayUnits; From 80eca0ff9a1688c7e048e18d2f7c361d9ab336ca Mon Sep 17 00:00:00 2001 From: James Wilson Date: Tue, 9 May 2017 12:23:03 -0500 Subject: [PATCH 4/4] Always show correct source on data popup --- public_html/script.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/public_html/script.js b/public_html/script.js index 795c750..39138e1 100644 --- a/public_html/script.js +++ b/public_html/script.js @@ -910,7 +910,7 @@ function refreshSelected() { } else { $('#selected_position').text(format_latlng(selected.position)); } - $('#selected_source').text( (selected.position_from_mlat ? "MLAT" : "ADS-B")); + $('#selected_follow').removeClass('hidden'); if (FollowSelected) { $('#selected_follow').css('font-weight', 'bold'); @@ -919,7 +919,15 @@ function refreshSelected() { $('#selected_follow').css('font-weight', 'normal'); } } - + if (selected.getDataSource() === "adsb_icao") { + $('#selected_source').text("ADS-B"); + } else if (selected.getDataSource() === "tisb_trackfile" || selected.getDataSource() === "tisb_icao" || selected.getDataSource() === "tisb_other") { + $('#selected_source').text("TIS-B"); + } else if (selected.getDataSource() === "mlat") { + $('#selected_source').text("MLAT"); + } else { + $('#selected_source').text("Other"); + } $('#selected_sitedist').text(format_distance_long(selected.sitedist, DisplayUnits)); $('#selected_rssi').text(selected.rssi.toFixed(1) + ' dBFS'); $('#selected_message_count').text(selected.messages);