Merge pull request #12 from drakeapps/master

Skyview Fixes
This commit is contained in:
Oliver Jowett 2017-05-09 19:41:06 +01:00 committed by GitHub
commit 2e0aba4f1f
2 changed files with 28 additions and 20 deletions

View file

@ -911,7 +911,7 @@ function refreshSelected() {
} else { } else {
$('#selected_position').text(format_latlng(selected.position)); $('#selected_position').text(format_latlng(selected.position));
} }
$('#selected_source').text( (selected.position_from_mlat ? "MLAT" : "ADS-B"));
$('#selected_follow').removeClass('hidden'); $('#selected_follow').removeClass('hidden');
if (FollowSelected) { if (FollowSelected) {
$('#selected_follow').css('font-weight', 'bold'); $('#selected_follow').css('font-weight', 'bold');
@ -920,7 +920,15 @@ function refreshSelected() {
$('#selected_follow').css('font-weight', 'normal'); $('#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_sitedist').text(format_distance_long(selected.sitedist, DisplayUnits));
$('#selected_rssi').text(selected.rssi.toFixed(1) + ' dBFS'); $('#selected_rssi').text(selected.rssi.toFixed(1) + ' dBFS');
$('#selected_message_count').text(selected.messages); $('#selected_message_count').text(selected.messages);
@ -1002,7 +1010,7 @@ function refreshTableInfo() {
if (tableplane.getDataSource() === "adsb_icao") { if (tableplane.getDataSource() === "adsb_icao") {
classes += " vPosition"; classes += " vPosition";
} else if (tableplane.getDataSource() === "tisb_trackfile") { } else if (tableplane.getDataSource() === "tisb_trackfile" || tableplane.getDataSource() === "tisb_icao" || tableplane.getDataSource() === "tisb_other") {
classes += " tisb"; classes += " tisb";
} else if (tableplane.getDataSource() === "mlat") { } else if (tableplane.getDataSource() === "mlat") {
classes += " mlat"; classes += " mlat";
@ -1458,7 +1466,7 @@ function initializeUnitsSelector() {
} }
function onDisplayUnitsChanged(e) { function onDisplayUnitsChanged(e) {
var displayUnits = event.target.value; var displayUnits = e.target.value;
// Save display units to local storage // Save display units to local storage
localStorage['displayUnits'] = displayUnits; localStorage['displayUnits'] = displayUnits;
DisplayUnits = displayUnits; DisplayUnits = displayUnits;

View file

@ -1,5 +1,5 @@
html, body { 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%; 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; } .selected { background-color: #dddddd; }
.plane_table_row { .plane_table_row {
cursor: pointer; cursor: pointer;
font-family: Helvetica Neue; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
} }
.hidden { display: none; } .hidden { display: none; }
@ -236,7 +236,7 @@ select.error, textarea.error, input.error {
/* new css */ /* new css */
.rangeRingText .rangeRingText
{ {
font-family: Helvetica Neue; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: bold; font-weight: bold;
font-size: 8px; font-size: 8px;
color: #333333; color: #333333;
@ -245,7 +245,7 @@ select.error, textarea.error, input.error {
.dateTime .dateTime
{ {
font-family: Helvetica Neue; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: bold; font-weight: bold;
font-size: 14px; font-size: 14px;
line-height: 18px; line-height: 18px;
@ -259,7 +259,7 @@ select.error, textarea.error, input.error {
.infoHeading .infoHeading
{ {
font-family: Helvetica Neue; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 14px; font-size: 14px;
line-height: 18px; line-height: 18px;
color: #002F5D; color: #002F5D;
@ -268,7 +268,7 @@ select.error, textarea.error, input.error {
.infoData .infoData
{ {
font-family: Helvetica Neue; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 14px; font-size: 14px;
line-height: 18px; line-height: 18px;
color: #000000; color: #000000;
@ -277,7 +277,7 @@ select.error, textarea.error, input.error {
.legend .legend
{ {
font-family: Helvetica Neue; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
width: 100%; width: 100%;
font-size: 12px; font-size: 12px;
color: #000000; color: #000000;
@ -289,7 +289,7 @@ select.error, textarea.error, input.error {
.settingsHeading .settingsHeading
{ {
font-family: Helvetica Neue; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 14px; font-size: 14px;
line-height: 20px; line-height: 20px;
color: #002F5D; color: #002F5D;
@ -298,7 +298,7 @@ select.error, textarea.error, input.error {
.settingsText .settingsText
{ {
font-family: Helvetica Neue; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 14px; font-size: 14px;
line-height: 20px; line-height: 20px;
text-indent: 16px text-indent: 16px
@ -308,7 +308,7 @@ select.error, textarea.error, input.error {
.link .link
{ {
font-family: Helvetica Neue; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 10px; font-size: 10px;
line-height: 20px; line-height: 20px;
color: #0000C8; color: #0000C8;
@ -318,7 +318,7 @@ select.error, textarea.error, input.error {
.infoHeading .infoHeading
{ {
font-family: Helvetica Neue; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 12px; font-size: 12px;
line-height: 16px; line-height: 16px;
color: #666666; color: #666666;
@ -327,7 +327,7 @@ select.error, textarea.error, input.error {
.infoData .infoData
{ {
font-family: Helvetica Neue; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 12px; font-size: 12px;
line-height: 16px; line-height: 16px;
color: #000000; color: #000000;
@ -383,7 +383,7 @@ select.error, textarea.error, input.error {
.buttonText .buttonText
{ {
font-family: Helvetica Neue; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: bold; font-weight: bold;
font-size: 12px; font-size: 12px;
color: #FFFFFF; color: #FFFFFF;
@ -448,7 +448,7 @@ select.error, textarea.error, input.error {
} }
.identLarge { .identLarge {
font-family: Helvetica Neue; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 24px; font-size: 24px;
line-height: 20px; line-height: 20px;
color: #002F5D; color: #002F5D;
@ -457,7 +457,7 @@ select.error, textarea.error, input.error {
} }
.identSmall { .identSmall {
font-family: Helvetica Neue; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 12px; font-size: 12px;
font-weight: bold; font-weight: bold;
line-height: 20px; line-height: 20px;
@ -535,7 +535,7 @@ select.error, textarea.error, input.error {
} }
#dump1090_infoblock { #dump1090_infoblock {
font-family: Helvetica Neue; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
} }
.infoBlockTitleText { .infoBlockTitleText {