Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup unused things #57

Merged
merged 1 commit into from
Jul 24, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions 88-tar1090.conf
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,6 @@ $HTTP["url"] =~ "^/INSTANCE/.*\.png$" {
"Cache-Control" => "public, max-age=2419200",
)
}
$HTTP["url"] =~ "^/INSTANCE/spinny.gif$" {
setenv.add-response-header += (
"Cache-Control" => "public, max-age=1209600",
)
}
$HTTP["url"] =~ "^/INSTANCE/config.js$" {
setenv.add-response-header += (
"Cache-Control" => "public, must-revalidate",
Expand Down
5 changes: 0 additions & 5 deletions 95-tar1090-otherport.conf
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,6 @@ $HTTP["url"] =~ "^/INSTANCE/.*\.png$" {
"Cache-Control" => "public, max-age=2419200",
)
}
$HTTP["url"] =~ "^/INSTANCE/spinny.gif$" {
setenv.add-response-header += (
"Cache-Control" => "public, max-age=1209600",
)
}
$HTTP["url"] =~ "^/INSTANCE/.*\.js$" {
setenv.add-response-header += (
"Cache-Control" => "public, max-age=1209600",
Expand Down
Binary file removed html/images/column-adjust.png
Binary file not shown.
Binary file removed html/images/[email protected]
Binary file not shown.
Binary file removed html/images/[email protected]
Binary file not shown.
Binary file removed html/images/fa_logo_color.png
Binary file not shown.
Binary file removed html/images/[email protected]
Binary file not shown.
Binary file removed html/images/[email protected]
Binary file not shown.
Binary file removed html/images/ff-sv-logo.png
Binary file not shown.
Binary file removed html/images/[email protected]
Binary file not shown.
Binary file removed html/images/[email protected]
Binary file not shown.
Binary file removed html/images/map-icon.png
Binary file not shown.
Binary file removed html/images/[email protected]
Binary file not shown.
Binary file removed html/images/[email protected]
Binary file not shown.
Binary file removed html/images/pa-sv-logo.png
Binary file not shown.
Binary file removed html/images/[email protected]
Binary file not shown.
Binary file removed html/images/[email protected]
Binary file not shown.
Binary file removed html/images/table-icon.png
Binary file not shown.
Binary file removed html/images/[email protected]
Binary file not shown.
Binary file removed html/images/[email protected]
Binary file not shown.
Binary file removed html/images/[email protected]
Binary file not shown.
Binary file removed html/images/[email protected]
Binary file not shown.
260 changes: 130 additions & 130 deletions html/index.html

Large diffs are not rendered by default.

50 changes: 0 additions & 50 deletions html/script.js
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,6 @@ let MessageRate = 0;
let layers;
let layers_group;

// piaware vs flightfeeder
let isFlightFeeder = false;

let estimateStyle = new ol.style.Style({
stroke: new ol.style.Stroke({
color: '#808080',
Expand Down Expand Up @@ -779,8 +776,6 @@ function init_page() {
// Set page basics
document.title = PageName;

//flightFeederCheck();

PlaneRowTemplate = document.getElementById("plane_row_template");

$('#clock_div').text(new Date().toLocaleString());
Expand Down Expand Up @@ -2705,7 +2700,6 @@ function expandSidebar(e) {
mapIsVisible = false;
$("#toggle_sidebar_control").hide();
$("#splitter").hide();
$("#sudo_buttons").hide();
$("#shrink_sidebar_button").show();
$("#sidebar_container").width("100%");
setColumnVisibility();
Expand All @@ -2722,7 +2716,6 @@ function showMap() {
mapIsVisible = true;
$("#toggle_sidebar_control").show();
$("#splitter").show();
$("#sudo_buttons").show();
$("#shrink_sidebar_button").hide();
setColumnVisibility();
clearTimeout(refreshId);
Expand Down Expand Up @@ -3387,32 +3380,6 @@ function toggleLayer(element, layer) {
});
}

// check status.json if it has a serial number for a flightfeeder
function flightFeederCheck() {
$.ajax('/status.json', {
success: function(data) {
if (data.type === "flightfeeder") {
isFlightFeeder = true;
updatePiAwareOrFlightFeeder();
}
}
})
}

// updates the page to replace piaware with flightfeeder references
function updatePiAwareOrFlightFeeder() {
if (isFlightFeeder) {
$('.piAwareLogo').hide();
$('.flightfeederLogo').show();
PageName = 'FlightFeeder SkyAware';
} else {
$('.flightfeederLogo').hide();
$('.piAwareLogo').show();
PageName = 'PiAware SkyAware';
}
refreshPageTitle();
}

function fetchPfData() {
if (fetchingPf)
return;
Expand Down Expand Up @@ -4390,23 +4357,6 @@ function drawUpintheair() {
}
}

function solidGoldT() {
solidT = true;
let list = [[], [], [], []];
for (let i = 0; i < PlanesOrdered.length; i++) {
let plane = PlanesOrdered[i];
//console.log(plane);
if (plane.seen_pos && plane.seen_pos < 1200) {
plane.visible = true;
list[Math.floor(4*i/PlanesOrdered.length)].push(plane);
}
}
getTrace(null, null, {onlyFull: true, list: list[0],});
getTrace(null, null, {onlyFull: true, list: list[1],});
getTrace(null, null, {onlyFull: true, list: list[2],});
getTrace(null, null, {onlyFull: true, list: list[3],});
}

function gotoTime(timestamp) {
clearTimeout(traceOpts.showTimeout);
if (timestamp) {
Expand Down
77 changes: 0 additions & 77 deletions html/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ html, body {
#sidebar_container {
display: flex;
flex-direction: column;
width: flex;
left: calc( 0px * var(--SCALE)) !important;
height: 100%;
}
Expand Down Expand Up @@ -225,17 +224,9 @@ div#update_error { position: absolute; bottom: calc( 25px * var(--SCALE)); left:
text-align: center; }

div#loader { z-index: 99; position: absolute; left: 0; top: 0; bottom: 0; right: 0; background: #000; opacity: 0.8; filter: alpha(opacity=80); }
#spinny { width: calc(128px * var(--SCALE)); height: calc(128px * var(--SCALE)); position: absolute; top: 50%; left: 50%; margin: calc( -64px * var(--SCALE)) 0 0 calc( -64px * var(--SCALE)); }
#loader_progress { width: calc(250px * var(--SCALE)); height: calc( 20px * var(--SCALE)); position: absolute; top: 50%; left: 50%; margin: calc(128px * var(--SCALE)) 0 0 - calc(125px * var(--SCALE)); }


#sudo_buttons {
display: flex;
padding: calc( 0px * var(--SCALE)) calc( 40px * var(--SCALE)) calc( 0px * var(--SCALE)) calc( 40px * var(--SCALE));
justify-content: space-between;
}


.aircraft_table_header {
background-color: #00596b;
color: #FFFFFF;
Expand Down Expand Up @@ -310,14 +301,6 @@ select.error, textarea.error, input.error {
}

/* new css */
.rangeRingText
{
font-weight: bold;
font-size: calc( 8px * var(--SCALE));
color: #333333;
color: rgb(51, 51, 51);
}

.dateTime
{
font-weight: bold;
Expand Down Expand Up @@ -360,12 +343,6 @@ select.error, textarea.error, input.error {
padding-top: calc( 10px * var(--SCALE));
}

.settingsHeading
{
font-size: 110%;
line-height: calc( 20px * var(--SCALE));
color: #003f4b;
}

.settingsText
{
Expand All @@ -388,28 +365,17 @@ select.error, textarea.error, input.error {
right: calc( 0px * var(--SCALE));
top: calc(140px * var(--SCALE));
width: calc( 38px * var(--SCALE));
height: flex;
z-index: 9;
}
#header_top {
text-align: right;
position: absolute;
right: calc( 94px * var(--SCALE));
top: calc( 0px * var(--SCALE));
width: flex;
height: calc( 38px * var(--SCALE));
z-index: 9;
}

.adsbLogo {
padding-left: calc( 20px * var(--SCALE));
padding-top: calc( 30px * var(--SCALE));
padding-bottom: calc( 5px * var(--SCALE));
}

.logoContainer {
flex: 1;
}

.buttonContainer {
display: block;
Expand Down Expand Up @@ -520,11 +486,6 @@ select.error, textarea.error, input.error {
padding-bottom: calc( 12px * var(--SCALE));
}

.infoRowTitle {
}

.infoRowContent {
}

.infoRowFluid {
display: inline-block;
Expand All @@ -546,9 +507,6 @@ table.infoTable tr td {
margin: 0;
}

.infoRowLine {
}

.infoRowSpacer {
padding-top: calc( 3px * var(--SCALE));
padding-bottom: calc( 3px * var(--SCALE));
Expand Down Expand Up @@ -580,17 +538,6 @@ table.infoTable tr td {
padding-right: calc( 5px * var(--SCALE));
}

.infoBlockTopSection {
padding-top: calc( 14px * var(--SCALE));
padding-bottom: calc( 14px * var(--SCALE));
padding-left: calc( 8px * var(--SCALE));
}

.infoBlock45pxSection {
height: calc( 45px * var(--SCALE));
line-height: calc( 45px * var(--SCALE));
padding-left: calc( 10px * var(--SCALE));
}

.infoBlockSection {
padding-top: calc( 8px * var(--SCALE));
Expand All @@ -599,9 +546,6 @@ table.infoTable tr td {
padding-right: calc( 5px * var(--SCALE));
}

.lightGreyBackground {
background-color: #efefef;
}

#dump1090_infoblock {
}
Expand All @@ -623,14 +567,6 @@ table.infoTable tr td {
color: #003f4b;
}

.legendBox {
width: calc( 15px * var(--SCALE));
height: calc( 15px * var(--SCALE));
border: calc( 1px * var(--SCALE)) solid #efefef;
border-radius: calc( 4px * var(--SCALE));
-moz-border-radius: calc( 4px * var(--SCALE));
-webkit-border-radius: calc( 4px * var(--SCALE));
}


.legendTitle {
Expand Down Expand Up @@ -730,13 +666,6 @@ table.infoTable tr td {
*/


.bottom-container {
width: 100%;
margin-top: calc( 8px * var(--SCALE));
padding: calc( 40px * var(--SCALE)) calc( 0px * var(--SCALE));
text-align: center;
background-color: #eee;
}
#selected_flightaware_link a {
background-color: #67b6c3;
color: white;
Expand All @@ -759,13 +688,7 @@ table.infoTable tr td {
vertical-align: middle;
display: inline;
}
.selected_airframe a {
color: #003f4b;
}

.infoblock-container-small .infoRowFluid {
display: block;
}

/* Retina 2x images */
@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
Expand Down