- fixed an error on finance in admin panel
- flight ident now use this format: VA IATA(if empty ICAO) + Flight Number + - + Flight Code (without C) + - + Flight Leg (without L) - added function __trans_choice in helpers.php for translation - fixed error in flight edit/insert panel not showing/inserting Tuesday in days - fixed an error occurring when metar retrieved is empty - edited now-ui-kit.css to align login fields correctly - added /public/assets/frontend/js/core/jquery-3.3.1.min.js to fix a missed resource error in authentication pages - added translations file for en and it locales - translated all the frontend templates
This commit is contained in:
lordwilbur
committed by
Nabeel Shahzad
Nabeel Shahzad
parent
77a2fd70c3
commit
ba8a819c7d
@@ -1,11 +1,11 @@
|
||||
<div class="nav nav-tabs" role="tablist" style="background: #067ec1; color: #FFF;">
|
||||
News
|
||||
{{ __('News') }}
|
||||
</div>
|
||||
<div class="card border-blue-bottom">
|
||||
<div class="card-block" style="min-height: 0px">
|
||||
@if($news->count() === 0)
|
||||
<div class="text-center text-muted" style="padding: 30px;">
|
||||
no news items
|
||||
{{ __('No News Found') }}
|
||||
</div>
|
||||
@endif
|
||||
|
||||
|
||||
@@ -37,22 +37,22 @@
|
||||
</a>
|
||||
</h3>
|
||||
<p id="map_flight_info">
|
||||
{ pirep.dpt_airport.name } ({ pirep.dpt_airport.icao }) to
|
||||
{ pirep.dpt_airport.name } ({ pirep.dpt_airport.icao }) {{ __('to') }}
|
||||
{ pirep.arr_airport.name } ({ pirep.arr_airport.icao })
|
||||
</p>
|
||||
</div>
|
||||
<div style="float: right; margin-left: 30px; margin-right: 30px;">
|
||||
<p id="map_flight_stats_right">
|
||||
Ground Speed: <span style="font-weight: bold">{ pirep.position.gs }</span><br/>
|
||||
Altitude: <span style="font-weight: bold">{ pirep.position.altitude }</span><br/>
|
||||
Heading: <span style="font-weight: bold">{ pirep.position.heading }</span><br/>
|
||||
{{ __('Ground Speed') }}: <span style="font-weight: bold">{ pirep.position.gs }</span><br/>
|
||||
{{ __('Altitude') }}: <span style="font-weight: bold">{ pirep.position.altitude }</span><br/>
|
||||
{{ __('Heading') }}: <span style="font-weight: bold">{ pirep.position.heading }</span><br/>
|
||||
</p>
|
||||
</div>
|
||||
<div style="float: right; margin-left: 30px;">
|
||||
<p id="map_flight_stats_middle">
|
||||
Status: <span style="font-weight: bold">{ pirep.status_text }</span><br />
|
||||
Flight Time: <span style="font-weight: bold">{ pirep.flight_time | time_hm }</span><br />
|
||||
Distance: <span style="font-weight: bold">{ pirep.position.distance.{{setting('units.distance')}} }</span>
|
||||
{{ __('Status') }}: <span style="font-weight: bold">{ pirep.status_text }</span><br />
|
||||
{{ __('Flight Time') }}: <span style="font-weight: bold">{ pirep.flight_time | time_hm }</span><br />
|
||||
{{ __('Distance') }}: <span style="font-weight: bold">{ pirep.position.distance.{{setting('units.distance')}} }</span>
|
||||
/ <span style="font-weight: bold">
|
||||
{ pirep.planned_distance.{{setting('units.distance')}} }</span>
|
||||
</p>
|
||||
@@ -74,18 +74,18 @@ and being mindful of the rivets bindings
|
||||
--}}
|
||||
<div id="live_flights" class="row">
|
||||
<div class="col-md-12">
|
||||
<div rv-hide="has_data" class="jumbotron text-center">There are no flights</div>
|
||||
<div rv-hide="has_data" class="jumbotron text-center">{{ __('There are no flights.') }}</div>
|
||||
<table rv-show="has_data" id="live_flights_table" class="table table-striped">
|
||||
<thead>
|
||||
<tr class="text-small header">
|
||||
<td class="text-small">Flight</td>
|
||||
<td class="text-small">Departure</td>
|
||||
<td class="text-small">Arrival</td>
|
||||
<td class="text-small">Aircraft</td>
|
||||
<td class="text-small">Altitude</td>
|
||||
<td class="text-small">GS</td>
|
||||
<td class="text-small">Distance</td>
|
||||
<td class="text-small">Status</td>
|
||||
<td class="text-small">{{ __trans_choice('Flight', 1) }}</td>
|
||||
<td class="text-small">{{ __('Departure') }}</td>
|
||||
<td class="text-small">{{ __('Arrival') }}</td>
|
||||
<td class="text-small">{{ __('Aircraft') }}</td>
|
||||
<td class="text-small">{{ __('Altitude') }}</td>
|
||||
<td class="text-small">{{ __('GS') }}</td>
|
||||
<td class="text-small">{{ __('Distance') }}</td>
|
||||
<td class="text-small">{{ __('Status') }}</td>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
@@ -5,38 +5,38 @@ https://api.checkwx.com/#metar-decoded
|
||||
|
||||
--}}
|
||||
@if(!$metar)
|
||||
<p>METAR/TAF data could not be retrieved</p>
|
||||
<p>{{ __('METAR/TAF data could not be retrieved') }}</p>
|
||||
@else
|
||||
<table class="table table-striped">
|
||||
<tr>
|
||||
<td>Conditions</td>
|
||||
<td>{{ __('Conditions') }}</td>
|
||||
<td>
|
||||
{{ $metar['category'] }}
|
||||
{{ $metar['temperature'][$unit_temp] }}
|
||||
°{{strtoupper($unit_temp)}}
|
||||
@if($metar['visibility'])
|
||||
, visibility {{ $metar['visibility'][$unit_dist] }} {{$unit_dist}}
|
||||
, {{ __('visibility') }} {{ $metar['visibility'][$unit_dist] }} {{$unit_dist}}
|
||||
@endif
|
||||
@if($metar['humidity'])
|
||||
, {{ $metar['humidity'] }}% humidity
|
||||
, {{ $metar['humidity'] }}% {{ __('humidity') }}
|
||||
@endif
|
||||
@if($metar['dew_point'])
|
||||
, dew point
|
||||
, {{ __('dew point') }}
|
||||
{{ $metar['dew_point'][$unit_temp] }}
|
||||
°{{strtoupper($unit_temp)}}
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Barometer</td>
|
||||
<td>{{ __('Barometer') }}</td>
|
||||
<td>
|
||||
{{ $metar['barometer'] }} Hg
|
||||
/ {{ $metar['barometer_in'] * 1000 }} MB
|
||||
{{ number_format($metar['barometer'], 2) }} hPa
|
||||
/ {{ number_format($metar['barometer_in'], 2) }} inHg
|
||||
</td>
|
||||
</tr>
|
||||
@if($metar['clouds'])
|
||||
<tr>
|
||||
<td>Clouds</td>
|
||||
<td>{{ __('Clouds') }}</td>
|
||||
<td>
|
||||
@if($unit_alt === 'ft')
|
||||
{{$metar['clouds_report_ft']}}
|
||||
@@ -47,17 +47,17 @@ https://api.checkwx.com/#metar-decoded
|
||||
</tr>
|
||||
@endif
|
||||
<tr>
|
||||
<td>Wind</td>
|
||||
<td>{{ __('Wind') }}</td>
|
||||
<td>
|
||||
{{$metar['wind_speed']}} kts from {{$metar['wind_direction_label']}}
|
||||
{{$metar['wind_speed']}} kts {{ __('from') }} {{$metar['wind_direction_label']}}
|
||||
({{$metar['wind_direction']}}°)
|
||||
@if($metar['wind_gust_speed'])
|
||||
gusts to {{ $metar['wind_gust_speed'] }}
|
||||
{{ __('gusts to').' '.$metar['wind_gust_speed'] }}
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>METAR</td>
|
||||
<td>{{ __('METAR') }}</td>
|
||||
<td>
|
||||
<div style="line-height:1.5em;min-height: 3em;">
|
||||
{{ $metar['raw'] }}
|
||||
@@ -66,14 +66,14 @@ https://api.checkwx.com/#metar-decoded
|
||||
</tr>
|
||||
@if($metar['remarks'])
|
||||
<tr>
|
||||
<td>Remarks</td>
|
||||
<td>{{ __('Remarks') }}</td>
|
||||
<td>
|
||||
{{ $metar['remarks'] }}
|
||||
</td>
|
||||
</tr>
|
||||
@endif
|
||||
<tr>
|
||||
<td>Updated</td>
|
||||
<td>{{ __('Updated') }}</td>
|
||||
<td>{{$metar['observed_time']}} ({{$metar['observed_age']}})</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
Reference in New Issue
Block a user