FGFS-4.1/phpvms
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fixed an error on finance in admin panel

Browse Source 
- 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
2018-05-16 08:47:31 +02:00
committed by Nabeel Shahzad
parent 84f64f45d9
commit 06f8322eeb
20 changed files with 358 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/views/layouts/default/airports/show.blade.php
View File

@@ -39,7 +39,7 @@
<h5>@lang('frontend.airports.inboundflights')</h5>
@if(!$inbound_flights)
<div class="jumbotron text-center">
@lang('frontend.airports.noflightfound')
@lang('frontend.airports.noflightfound')
</div>
@else
<table class="table table-striped table-condensed">
@@ -74,7 +74,7 @@
<h5>@lang('frontend.airports.outboundflights')</h5>
@if(!$outbound_flights)
<div class="jumbotron text-center">
@lang('frontend.airports.noflightfound')
@lang('frontend.airports.noflightfound')
</div>
@else
<table class="table table-striped table-condensed">

2
resources/views/layouts/default/auth/login.blade.php
View File

@@ -1,5 +1,5 @@
@extends('auth.layout')
@section('title', __('Log In'))
@section('title', trans('frontend.global.login'))
@section('content')
<div class="col-md-4 content-center">

2
resources/views/layouts/default/auth/register.blade.php
View File

@@ -88,7 +88,7 @@
@include('auth.toc')
<div style="width: 100%; text-align: right; padding-top: 20px;">
@lang('frontend.auth.tocaccept')<br /><br />
@lang('frontend.auth.tocaccept')<br /><br />
{{ Form::submit(trans('frontend.auth.register'), ['class' => 'btn btn-primary']) }}
</div>

2
resources/views/layouts/default/auth/rejected.blade.php
View File

@@ -7,7 +7,7 @@
<div class="flex-center position-ref full-height">
<div class="title m-b-md">
<h2 class="description">
@lang('frontend.auth.deniedmessage')
@lang('frontend.auth.deniedmessage')
</h2>
</div>
</div>

2
resources/views/layouts/default/auth/suspended.blade.php
View File

@@ -7,7 +7,7 @@
<div class="flex-center position-ref full-height">
<div class="title m-b-md">
<h2 class="description">
@lang('frontend.auth.suspendedmessage')
@lang('frontend.auth.suspendedmessage')
</h2>
</div>
</div>

2
resources/views/layouts/default/auth/toc.blade.php
View File

@@ -1,6 +1,6 @@
<h4>@lang('frontend.toc.toctitle')</h4>
<textarea class="form-control" style="height: 150px; border: 1px #ccc solid; background-color: transparent" readonly>
@foreach (trans('frontend.toc.toctext') as $line)
{{ str_replace(':appname', config('app.name'), $line) }}
{{ str_replace(':appname', config('app.name'), $line) }}
@endforeach
</textarea>

10
resources/views/layouts/default/dashboard/index.blade.php
View File

@@ -62,11 +62,11 @@
<div class="card">
<div class="nav nav-tabs" role="tablist" style="background: #067ec1; color: #FFF;">
@lang('frontend.dashboard.yourlastreport')
@lang('frontend.dashboard.yourlastreport')
</div>
@if($last_pirep === null)
<div class="card-block" style="text-align:center;">
@lang('frontend.dashboard.noreportsyet') <a href="{{ route('frontend.pireps.create') }}">@lang('frontend.dashboard.fileonenow')</a>
@lang('frontend.dashboard.noreportsyet') <a href="{{ route('frontend.pireps.create') }}">@lang('frontend.dashboard.fileonenow')</a>
</div>
@else
@include('pireps.pirep_card', ['pirep' => $last_pirep])
@@ -81,7 +81,7 @@
<div class="col-sm-4">
<div class="card">
<div class="nav nav-tabs" role="tablist" style="background: #067ec1; color: #FFF;">
@lang('frontend.dashboard.weatherat', ['ICAO' => $current_airport])
@lang('frontend.dashboard.weatherat', ['ICAO' => $current_airport])
</div>
<div class="card-block">
<!-- Tab panes -->
@@ -93,7 +93,7 @@
<div class="card">
<div class="nav nav-tabs" role="tablist" style="background: #067ec1; color: #FFF;">
@lang('frontend.dashboard.recentreports')
@lang('frontend.dashboard.recentreports')
</div>
<div class="card-block">
<!-- Tab panes -->
@@ -105,7 +105,7 @@
<div class="card">
<div class="nav nav-tabs" role="tablist" style="background: #067ec1; color: #FFF;">
@lang('frontend.global.newestpilots')
@lang('frontend.global.newestpilots')
</div>
<div class="card-block">
<!-- Tab panes -->

4
resources/views/layouts/default/flights/show.blade.php
View File

@@ -74,13 +74,13 @@
{{ Widget::Weather([
'icao' => $flight->arr_airport_id,
]) }}
@if ($flight->alt_airport_id)
@if ($flight->alt_airport_id)
<br />
<h5>{{$flight->alt_airport_id}} @lang('frontend.global.metar')</h5>
{{ Widget::Weather([
'icao' => $flight->alt_airport_id,
]) }}
@endif
@endif
</div>
</div>
@endsection

18
resources/views/layouts/default/home.blade.php
View File

@@ -9,13 +9,13 @@
<div class="row">
<div class="col-sm-9">
<center><h1 class="description">@lang('frontend.home.welcome.message', ['Appname' => config('app.name')])</h1></center>
<div class="photo-container">
<img src="{{ public_asset('/assets/img/Airplane.jpg') }}" style=""/>
</div>
<div class="photo-container">
<img src="{{ public_asset('/assets/img/Airplane.jpg') }}" style=""/>
</div>
</div>
<div class="col-sm-3 ">
<h2 class="description">@lang('frontend.global.newestpilots')</h2>
@foreach($users as $user)
@foreach($users as $user)
<div class="card card-signup blue-bg">
{{--<div class="card-bg">--}}
{{--<i class="fa fa-user-o" style="opacity: .1;"></i>--}}
@@ -25,12 +25,12 @@
<a href="{{ route('frontend.profile.show', ['id' => $user->id]) }}" class="text-white">{{ $user->name }}</a>
</h3>
<div class="photo-container">
@if ($user->avatar == null)
@if ($user->avatar == null)
<img class="rounded-circle"
src="{{ $user->gravatar(123) }}">
@else
<img src="{{ $user->avatar->url }}" style="width: 123px;">
@endif
@else
<img src="{{ $user->avatar->url }}" style="width: 123px;">
@endif
</div>
</div>
<div class="content content-center">
@@ -46,7 +46,7 @@
<a href="{{ route('frontend.profile.show', ['id' => $user->id]) }}" class="btn btn-neutral btn-sm">@lang('frontend.global.profile')</a>
</div>
</div>
@endforeach
@endforeach
</div>
</div>
@endsection

2
resources/views/layouts/default/nav.blade.php
View File

@@ -36,7 +36,7 @@
<li class="nav-item">
<a class="nav-link" href="{{ url('/login') }}">
<i class="fas fa-sign-in-alt"></i>
<p>@lang('frontend.nav.login')</p>
<p>@lang('frontend.global.login')</p>
</a>
</li>
<li class="nav-item">

2
resources/views/layouts/default/pireps/fields.blade.php
View File

@@ -12,7 +12,7 @@ flight reports that have been filed. You've been warned!
<div class="row">
<div class="col-sm-12">
@component('components.info')
@lang('frontend.pireps.fieldsreadonly')
@lang('frontend.pireps.fieldsreadonly')
@endcomponent
</div>
</div>

12
resources/views/layouts/default/users/table.blade.php
View File

@@ -13,12 +13,12 @@
<tr>
<td style="width: 80px;">
<div class="photo-container">
@if ($user->avatar == null)
<img class="rounded-circle"
src="{{ $user->gravatar(256) }}&s=256"/>
@else
<img src="{{ $user->avatar->url }}">
@endif
@if ($user->avatar == null)
<img class="rounded-circle"
src="{{ $user->gravatar(256) }}&s=256"/>
@else
<img src="{{ $user->avatar->url }}">
@endif
</div>
</td>
<td>

4
resources/views/layouts/default/widgets/latest_news.blade.php
View File

@@ -1,11 +1,11 @@
<div class="nav nav-tabs" role="tablist" style="background: #067ec1; color: #FFF;">
@lang('frontend.widgets.latestnews.news')
@lang('frontend.widgets.latestnews.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;">
@lang('frontend.widgets.latestnews.nonewsfound')
@lang('frontend.widgets.latestnews.nonewsfound')
</div>
@endif

12
resources/views/layouts/default/widgets/live_map.blade.php
View File

@@ -43,16 +43,16 @@
</div>
<div style="float: right; margin-left: 30px; margin-right: 30px;">
<p id="map_flight_stats_right">
@lang('frontend.widgets.livemap.groundspeed'): <span style="font-weight: bold">{ pirep.position.gs }</span><br/>
@lang('frontend.widgets.livemap.altitude'): <span style="font-weight: bold">{ pirep.position.altitude }</span><br/>
@lang('frontend.widgets.livemap.heading'): <span style="font-weight: bold">{ pirep.position.heading }</span><br/>
@lang('frontend.widgets.livemap.groundspeed'): <span style="font-weight: bold">{ pirep.position.gs }</span><br/>
@lang('frontend.widgets.livemap.altitude'): <span style="font-weight: bold">{ pirep.position.altitude }</span><br/>
@lang('frontend.widgets.livemap.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">
@lang('frontend.global.status'): <span style="font-weight: bold">{ pirep.status_text }</span><br />
@lang('frontend.global.flighttime'): <span style="font-weight: bold">{ pirep.flight_time | time_hm }</span><br />
@lang('frontend.global.distance'): <span style="font-weight: bold">{ pirep.position.distance.{{setting('units.distance')}} }</span>
@lang('frontend.global.status'): <span style="font-weight: bold">{ pirep.status_text }</span><br />
@lang('frontend.global.flighttime'): <span style="font-weight: bold">{ pirep.flight_time | time_hm }</span><br />
@lang('frontend.global.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>

2
resources/views/layouts/default/widgets/weather.blade.php
View File

@@ -52,7 +52,7 @@ https://api.checkwx.com/#metar-decoded
{{$metar['wind_speed']}} kts @lang('frontend.global.from') {{$metar['wind_direction_label']}}
({{$metar['wind_direction']}}°)
@if($metar['wind_gust_speed'])
@lang('frontend.widgets.weather.guststo') {{ $metar['wind_gust_speed'] }}
@lang('frontend.widgets.weather.guststo') {{ $metar['wind_gust_speed'] }}
@endif
</td>
</tr>