mirror
/
adsb-receiver
kopia lustrzana https://github.com/jprochazka/adsb-receiver
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge remote-tracking branch 'refs/remotes/origin/master' into upgrade

pull/113/head
Joe Prochazka 2016-03-07 12:37:27 -05:00
rodzic 4a18bc69c9 ee8d148e78
commit c0e66d0ebb
2 zmienionych plików z 13 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
build/portal/html/api/notifications.php
Wyświetl plik

@ -57,7 +57,7 @@
// Check dump1090-mutability's aircraft JSON output to see if the flight is visible. // Check dump1090-mutability's aircraft JSON output to see if the flight is visible.
$visibleFlights = array(); $visibleFlights = array();
$url = $common->getBaseUrl()."/dump1090/data/aircraft.json"; $url = "http://localhost/dump1090/data/aircraft.json";
$json = file_get_contents($url); $json = file_get_contents($url);
$data = json_decode($json, true); $data = json_decode($json, true);
foreach ($data['aircraft'] as $aircraft) { foreach ($data['aircraft'] as $aircraft) {

18
build/portal/html/templates/default/master.tpl
Wyświetl plik

@ -58,12 +58,18 @@
</div> </div>
</nav> </nav>
{if setting:enableFlightNotifications eq TRUE} {if setting:enableFlightNotifications eq TRUE}
<div id="flight-notifications" class="container"> <div id="flight-notifications" class="modal fade in" role="dialog">
<div class="alert alert-success" role="alert"> <div class="modal-dialog">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button> <div class="modal-content">
<strong>Flight Spotted!</strong> <div class="modal-header">
<p>This receiver is currently receiving data from the following flight number(s).</p> <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<ul></ul> <h4 class="modal-title">Flight Spotted</h4>
</div>
<div class="modal-body">
<p>This receiver is currently receiving data from the following flight number(s).</p>
<ul></ul>
</div>
</div>
</div> </div>
</div> </div>
{/if} {/if}