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 77a2fd70c3
commit ba8a819c7d
58 changed files with 1126 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,11 +1,11 @@
@extends('app')
@section('title', 'flights')
@section('title', __trans_choice('Flight', 2))
@section('content')
<div class="row">
@include('flash::message')
<div class="col-md-9">
<h2>{{ $title ?? 'Flights' }}</h2>
<h2>{{ $title ?? __trans_choice('Flight', 2) }}</h2>
@include('flights.table')
</div>
<div class="col-md-3">

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

@@ -1,7 +1,7 @@
<div class="card">
<div class="card-block" style="min-height: 0px">
<div class="form-group text-right">
<a href="{{ route('frontend.flights.bids') }}">My Bids</a>
<a href="{{ route('frontend.flights.bids') }}">{{ __trans_choice('My Bid', 2) }}</a>
</div>
</div>
</div>

12
resources/views/layouts/default/flights/search.blade.php
View File

@@ -1,4 +1,4 @@
<h3 class="description">search</h3>
<h3 class="description">{{ __('Search') }}</h3>
<div class="card pull-right">
<div class="card-block" style="min-height: 0px">
<div class="form-group">
@@ -8,23 +8,23 @@
'class'=>'form-inline'
]) }}
<div>
<p>Flight Number</p>
<p>{{ __('Flight Number') }}</p>
{{ Form::text('flight_number', null, ['class' => 'form-control']) }}
</div>
<div style="margin-top: 10px;">
<p>Departure Airport</p>
<p>{{ __('Departure Airport') }}</p>
{{ Form::select('dep_icao', $airports, null , ['class' => 'form-control']) }}
</div>
<div style="margin-top: 10px;">
<p>Arrival Airport</p>
<p>{{ __('Arrival Airport') }}</p>
{{ Form::select('arr_icao', $airports, null , ['class' => 'form-control']) }}
</div>
<div class="clear" style="margin-top: 10px;">
{{ Form::submit('find', ['class' => 'btn btn-primary']) }}&nbsp;
<a href="{{ route('frontend.flights.index') }}">clear</a>
{{ Form::submit(__('Find'), ['class' => 'btn btn-primary']) }}&nbsp;
<a href="{{ route('frontend.flights.index') }}">{{ __('Reset') }}</a>
</div>
{{ Form::close() }}
</div>

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

@@ -1,5 +1,5 @@
@extends('app')
@section('title', 'Flight '.$flight->ident)
@section('title', __trans_choice('Flight', 1).' '.$flight->ident)
@section('content')
<div class="row">
@@ -13,7 +13,7 @@
<div class="col-12">
<table class="table">
<tr>
<td>Departure</td>
<td>{{ __('Departure') }}</td>
<td>
{{ $flight->dpt_airport->name }}
(<a href="{{route('frontend.airports.show', [
@@ -24,7 +24,7 @@
</tr>
<tr>
<td>Arrival</td>
<td>{{ __('Arrival') }}</td>
<td>
{{ $flight->arr_airport->name }}
(<a href="{{route('frontend.airports.show', [
@@ -34,7 +34,7 @@
</tr>
@if($flight->alt_airport_id)
<tr>
<td>Alternate Airport</td>
<td>{{ __('Alternate Airport') }}</td>
<td>
{{ $flight->alt_airport->full_name }}
</td>
@@ -42,13 +42,13 @@
@endif
<tr>
<td>Route</td>
<td>{{ __('Route') }}</td>
<td>{{ $flight->route }}</td>
</tr>
@if(filled($flight->notes))
<tr>
<td>Notes</td>
<td>{{ __('Notes') }}</td>
<td>{{ $flight->notes }}</td>
</tr>
@endif

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

@@ -24,7 +24,7 @@
x-id="{{ $flight->id }}"
x-saved-class="btn-info"
type="button"
title="Add/Remove Bid"
title="{{ __('Add/Remove Bid') }}"
>
<i class="fas fa-map-marker"></i>
</button>
@@ -34,14 +34,14 @@
<div class="row">
<div class="col-sm-5">
{{--<table class="table-condensed"></table>--}}
<span class="title">DEP&nbsp;</span>
<span class="title">{{ __('DEP') }}&nbsp;</span>
{{ $flight->dpt_airport->name }}
(<a href="{{route('frontend.airports.show', [
'id' => $flight->dpt_airport->icao
])}}">{{$flight->dpt_airport->icao}}</a>)
@if($flight->dpt_time), {{ $flight->dpt_time }}@endif
<br />
<span class="title">ARR&nbsp;</span>
<span class="title">{{ __('ARR') }}&nbsp;</span>
{{ $flight->arr_airport->name }}
(<a href="{{route('frontend.airports.show', [
'id' => $flight->arr_airport->icao
@@ -49,19 +49,19 @@
@if($flight->arr_time), {{ $flight->arr_time }}@endif
<br />
@if($flight->distance)
<span class="title">DISTANCE&nbsp;</span>
<span class="title">{{ __('DISTANCE') }}&nbsp;</span>
{{ $flight->distance }} {{ setting('units.distance') }}
@endif
<br />
@if($flight->level)
<span class="title">LEVEL&nbsp;</span>
<span class="title">{{ __('LEVEL') }}&nbsp;</span>
{{ $flight->level }} {{ setting('units.altitude') }}
@endif
</div>
<div class="col-sm-7">
<div class="row">
<div class="col-sm-12">
<span class="title">ROUTE&nbsp;</span>
<span class="title">{{ __('ROUTE') }}&nbsp;</span>
{{ $flight->route }}
</div>
</div>