AFG/dump1090
3
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'SkyAware' into dev

Browse source
This commit is contained in:
Eric Tran 2019-07-31 16:23:20 +00:00
parent ef125bd5f0 b01f42097d
commit 9cef820dfc
9 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
public_html/config.js
View file

@ -99,7 +99,7 @@ SiteCircles = true; // true to show circles (only shown if the center marker is
SiteCirclesDistances = new Array(100,150,200); SiteCirclesDistances = new Array(100,150,200);
// Controls page title, righthand pane when nothing is selected // Controls page title, righthand pane when nothing is selected
PageName = "PiAware Skyview"; PageName = "PiAware SkyAware";
// Show country flags by ICAO addresses? // Show country flags by ICAO addresses?
ShowFlags = true; ShowFlags = true;

BIN
public_html/images/ff-sa-logo.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 9.5 KiB

BIN
public_html/images/ff-sa-logo@2x.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 22 KiB

BIN
public_html/images/ff-sa-logo@3x.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 35 KiB

BIN
public_html/images/pa-sa-logo.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.7 KiB

BIN
public_html/images/pa-sa-logo@2x.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 21 KiB

BIN
public_html/images/pa-sa-logo@3x.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 34 KiB

6
public_html/index.html
View file

@ -23,7 +23,7 @@
<script type="text/javascript" src="flags.js"></script> <script type="text/javascript" src="flags.js"></script>
<script type="text/javascript" src="layers.js"></script> <script type="text/javascript" src="layers.js"></script>
<script type="text/javascript" src="script.js?v=2"></script> <script type="text/javascript" src="script.js?v=2"></script>
<title>PiAware Skyview</title> <title>PiAware SkyAware</title>
</head> </head>
<body onload="initialize()"> <body onload="initialize()">
@ -49,8 +49,8 @@
<div id="header" class="infoHeading"> <div id="header" class="infoHeading">
<div class="logoContainer"> <div class="logoContainer">
<a href="http://flightaware.com/" target="_blank"><img src="images/fa_logo_color.png" alt="FlightAware" class="flightawareLogo" srcset="images/fa_logo_color.png 1x, images/fa_logo_color@2x.png 2x, images/fa_logo_color@3x.png 3x"></a> <a href="http://flightaware.com/" target="_blank"><img src="images/fa_logo_color.png" alt="FlightAware" class="flightawareLogo" srcset="images/fa_logo_color.png 1x, images/fa_logo_color@2x.png 2x, images/fa_logo_color@3x.png 3x"></a>
<img src="images/pa-sv-logo.png" alt="PiAware SkyView" class="adsbLogo piAwareLogo" srcset="images/pa-sv-logo.png 1x, images/pa-sv-logo@2x.png 2x, images/pa-sv-logo@3x.png 3x"> <img src="images/pa-sa-logo.png" alt="PiAware SkyAware" class="adsbLogo piAwareLogo" srcset="images/pa-sa-logo.png 1x, images/pa-sa-logo@2x.png 2x, images/pa-sa-logo@3x.png 3x">
<img src="images/ff-sv-logo.png" alt="FlightFeeder SkyView" class="adsbLogo flightfeederLogo" srcset="images/ff-sv-logo.png 1x, images/ff-sv-logo@2x.png 2x, images/ff-sv-logo@3x.png 3x" style="display: none;"> <img src="images/ff-sa-logo.png" alt="FlightFeeder SkyAware" class="adsbLogo flightfeederLogo" srcset="images/ff-sa-logo.png 1x, images/ff-sa-logo@2x.png 2x, images/ff-sa-logo@3x.png 3x" style="display: none;">
</div> </div>
<div class="buttonContainer"> <div class="buttonContainer">
<div class="dateTime" id="clock_div"></div> <div class="dateTime" id="clock_div"></div>

4
public_html/script.js
View file

@ -1896,11 +1896,11 @@ function updatePiAwareOrFlightFeeder() {
if (isFlightFeeder) { if (isFlightFeeder) {
$('.piAwareLogo').hide(); $('.piAwareLogo').hide();
$('.flightfeederLogo').show(); $('.flightfeederLogo').show();
PageName = 'FlightFeeder Skyview'; PageName = 'FlightFeeder SkyAware';
} else { } else {
$('.flightfeederLogo').hide(); $('.flightfeederLogo').hide();
$('.piAwareLogo').show(); $('.piAwareLogo').show();
PageName = 'PiAware Skyview'; PageName = 'PiAware SkyAware';
} }
refreshPageTitle(); refreshPageTitle();
} }