Skip to content

Commit

Permalink
Merge pull request cyoung#60 from TomBric/master
Browse files Browse the repository at this point in the history 
Minor updates traffic display
  • Loading branch information
@b3nn0
b3nn0 committed Jul 1, 2020
2 parents b78c013 + afdedc1 commit 6b53506
Showing 1 changed file with 20 additions and 20 deletions.
40 changes: 20 additions & 20 deletions web/plates/traffic.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
<span class="col-xs-3" ng-hide="showReg"><strong>Callsign</strong></span>
<span class="col-xs-3" ng-show="showReg"><strong>Tail Num</strong></span>
<span class="col-xs-2" ng-hide="showSquawk"><strong>Code</strong></span>
<span class="col-xs-2" ng-show="showCategory"><strong>Categ</strong></span>
<span class="col-xs-2" ng-show="showSquawk"><strong>Squawk</strong></span>
<span class="col-xs-5 text-right" ng-hide="GPS_connected && RelDist"><strong>Location</strong></span>
<span class="col-xs-3 text-right" ng-show="GPS_connected && RelDist"><strong>Dist</strong></span>
<span class="col-xs-2" ng-show="showCategory"><strong>Categ</strong></span>
<span class="col-xs-4 text-right" ng-hide="GPS_connected && RelDist"><strong>Location</strong></span>
<span class="col-xs-2 text-right" ng-show="GPS_connected && RelDist"><strong>Distan</strong></span>
<span class="col-xs-2 text-right" ng-show="GPS_connected && RelDist"><strong>Bearing</strong></span>
</div>

Expand Down Expand Up @@ -43,11 +43,11 @@
<span style="font-size:80%" ng-hide="showSquawk">{{aircraft.icao}}<span style="font-size:50%">{{aircraft.addr_type == 3 ? "&nbsp;(TFID)" : ""}}</span></span>
<span ng-show="showSquawk"><span ng-show="aircraft.squawk < 1000">0</span><span ng-show="aircraft.squawk < 100">0</span><span ng-show="aircraft.squawk < 10">0</span>{{aircraft.squawk}}</span>
</span>
<span class="col-xs-2">
<span style="font-size:80%" ng-show="showCategory">{{aircraft.category}}</span>
<span class="col-xs-2" ng-show="showCategory">
<span style="font-size:80%">{{aircraft.category}}</span>
</span>
<span class="col-xs-5 text-right" ng-hide="GPS_connected && RelDist">{{aircraft.lat}} {{aircraft.lon}}</span>
<span class="col-xs-3 text-right" ng-show="GPS_connected && RelDist">{{aircraft.dist.toFixed(1)}}<span style="font-size:50%">NM</span></span>
<span class="col-xs-4 text-right" ng-hide="GPS_connected && RelDist">{{aircraft.lat}} {{aircraft.lon}}</span>
<span class="col-xs-2 text-right" ng-show="GPS_connected && RelDist">{{aircraft.dist.toFixed(1)}}<span style="font-size:50%">NM</span></span>
<span class="col-xs-2 text-right" ng-show="GPS_connected && RelDist">{{aircraft.bearing}}&deg;</span>

</div>
Expand All @@ -68,25 +68,25 @@
<div class="panel-body traffic-footer">
<div class="separator"></div>
<div class="row">
<div class="col-sm-4">
<div class="col-sm-3">
<label class="control-label col-xs-6">Show Tail Number</label>
<span class="col-xs-3"><ui-switch ng-model='showReg' settings-change></ui-switch></span>
</div>
<div class="col-sm-4">
<div class="col-sm-3">
<label class="control-label col-xs-6">Show Squawk</label>
<span class="col-xs-3"><ui-switch ng-model='showSquawk' settings-change></ui-switch></span>
</div>
<div class="col-sm-4">
<div class="col-sm-3">
<label class="control-label col-xs-6">Show Category</label>
<span class="col-xs-3"><ui-switch ng-model='showCategory' settings-change></ui-switch></span>
</div>
<div class="col-sm-4">
<div class="col-sm-3">
<label class="control-label col-xs-6" ng-show="GPS_connected">Show Distance</label>
<label class="control-label text-muted col-xs-6" ng-hide="GPS_connected">Show Distance N/A</label>
<span class="col-xs-3"><ui-switch ng-model='RelDist' settings-change></ui-switch></span>
</div>
<!--
<div class="col-sm-4">
<div class="col-sm-3">
<label class="control-label col-xs-6">GPS Status</label>
<span ng-show="GPS_connected" class="label label-success col-xs-3" style="font-size:100%; display:block; height: 34px; line-height: 34px">Valid</span>
<span ng-hide="GPS_connected" class="label label-danger col-xs-3" style="font-size:100%; display:block; height: 34px; line-height: 34px">No Fix</span>
Expand All @@ -104,12 +104,12 @@
<div class="panel-body traffic-page">
<div class="row">
<div class="col-sm-6">
<span class="col-xs-4" ng-hide="showReg"><strong>Callsign</strong></span>
<span class="col-xs-4" ng-show="showReg"><strong>Tail Num</strong></span>
<span class="col-xs-3" ng-hide="showReg"><strong>Callsign</strong></span>
<span class="col-xs-3" ng-show="showReg"><strong>Tail Num</strong></span>
<span class="col-xs-2"><strong>Code</strong></span>
<span class="col-xs-2" ng-show="showCategory"><strong>Categ</strong></span>
<span class="col-xs-2 text-right"><strong>DistEst</strong></span>
<span class="col-xs-2"><strong>Squawk</strong></span>
<span class="col-xs-2"><strong>Dist est.</strong></span>
</div>

<div class="col-sm-6">
Expand All @@ -124,20 +124,20 @@
<div class="row" ng-repeat="aircraft in data_list_invalid | orderBy: 'icao'">
<div class="separator"></div>
<div class="col-sm-6">
<span class="col-xs-4" ng-hide="showReg">
<span class="col-xs-3" ng-hide="showReg">
<span ng-show="aircraft.tail" ng-class="'label traffic-style'+aircraft.src+aircraft.targettype">{{aircraft.addr_symb}}<strong>&nbsp;{{aircraft.tail}}</strong></span>
<span ng-hide="aircraft.tail" ng-class="'label traffic-style'+aircraft.src+aircraft.targettype">{{aircraft.addr_symb}}<strong>&nbsp;[--N/A--]</strong></span>
</span>
<span class="col-xs-4" ng-show="showReg">
<span class="col-xs-3" ng-show="showReg">
<span ng-show="aircraft.reg" ng-class="'label traffic-style'+aircraft.src+aircraft.targettype">{{aircraft.addr_symb}}<strong>&nbsp;{{aircraft.reg}}</strong></span>
<span ng-hide="aircraft.reg" ng-class="'label traffic-style'+aircraft.src+aircraft.targettype">{{aircraft.addr_symb}}<strong>&nbsp;[--N/A--]</strong></span>
</span>
<span class="col-xs-2" style="font-size:80%">{{aircraft.icao}}<span style="font-size:50%">{{aircraft.addr_type == 3 ? "&nbsp;(TFID)" : ""}}</span></span>
<span class="col-xs-2">
<span style="font-size:80%" ng-show="showCategory">{{aircraft.category}}</span>
<span class="col-xs-2" ng-show="showCategory">
<span style="font-size:80%">{{aircraft.category}}</span>
</span>
<span class="col-xs-2 text-right">{{aircraft.distEst.toFixed(1)}}<span style="font-size:50%">NM</span></span>
<span class="col-xs-2"><span ng-show="aircraft.squawk < 1000">0</span><span ng-show="aircraft.squawk < 100">0</span><span ng-show="aircraft.squawk < 10">0</span>{{aircraft.squawk}}</span>
<span class="col-xs-2">{{aircraft.distEst.toFixed(1)}}<span style="font-size:50%">NM</span></span>
</div>

<div class="col-sm-6">
Expand Down

0 comments on commit 6b53506

Please sign in to comment.