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

Move frontend.global.* to common.*

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-05-21 09:57:40 -05:00
parent a747657642
commit 203b6496fc
25 changed files with 201 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/layouts/default/flights/index.blade.php
+2 -2
View File
@@ -1,11 +1,11 @@
@extends('app')
@section('title', trans_choice('frontend.global.flight', 2))
@section('title', trans_choice('common.flight', 2))
@section('content')
<div class="row">
@include('flash::message')
<div class="col-md-9">
<h2>{{ $title ?? trans_choice('frontend.global.flight', 2) }}</h2>
<h2>{{ $title ?? trans_choice('common.flight', 2) }}</h2>
@include('flights.table')
</div>
<div class="col-md-3">
resources/views/layouts/default/flights/search.blade.php
+4 -4
View File
@@ -8,23 +8,23 @@
'class'=>'form-inline'
]) }}
<div>
<p>@lang('frontend.global.flightnumber')</p>
<p>@lang('common.flightnumber')</p>
{{ Form::text('flight_number', null, ['class' => 'form-control']) }}
</div>
<div style="margin-top: 10px;">
<p>@lang('frontend.global.departureairport')</p>
<p>@lang('common.departureairport')</p>
{{ Form::select('dep_icao', $airports, null , ['class' => 'form-control']) }}
</div>
<div style="margin-top: 10px;">
<p>@lang('frontend.global.arrivalairport')</p>
<p>@lang('common.arrivalairport')</p>
{{ Form::select('arr_icao', $airports, null , ['class' => 'form-control']) }}
</div>
<div class="clear" style="margin-top: 10px;">
{{ Form::submit(trans('frontend.global.find'), ['class' => 'btn btn-primary']) }}&nbsp;
<a href="{{ route('frontend.flights.index') }}">@lang('frontend.global.reset')</a>
<a href="{{ route('frontend.flights.index') }}">@lang('common.reset')</a>
</div>
{{ Form::close() }}
</div>
resources/views/layouts/default/flights/show.blade.php
+8 -8
View File
@@ -1,5 +1,5 @@
@extends('app')
@section('title', trans_choice('frontend.global.flight', 1).' '.$flight->ident)
@section('title', trans_choice('common.flight', 1).' '.$flight->ident)
@section('content')
<div class="row">
@@ -13,7 +13,7 @@
<div class="col-12">
<table class="table">
<tr>
<td>@lang('frontend.global.departure')</td>
<td>@lang('common.departure')</td>
<td>
{{ $flight->dpt_airport->name }}
(<a href="{{route('frontend.airports.show', [
@@ -24,7 +24,7 @@
</tr>
<tr>
<td>@lang('frontend.global.arrival')</td>
<td>@lang('common.arrival')</td>
<td>
{{ $flight->arr_airport->name }}
(<a href="{{route('frontend.airports.show', [
@@ -45,13 +45,13 @@
@endif
<tr>
<td>@lang('frontend.global.route')</td>
<td>@lang('common.route')</td>
<td>{{ $flight->route }}</td>
</tr>
@if(filled($flight->notes))
<tr>
<td>{{ trans_choice('frontend.global.note', 2) }}</td>
<td>{{ trans_choice('common.note', 2) }}</td>
<td>{{ $flight->notes }}</td>
</tr>
@endif
@@ -65,18 +65,18 @@
</div>
</div>
<div class="col-4">
<h5>{{$flight->dpt_airport_id}} @lang('frontend.global.metar')</h5>
<h5>{{$flight->dpt_airport_id}} @lang('common.metar')</h5>
{{ Widget::Weather([
'icao' => $flight->dpt_airport_id,
]) }}
<br />
<h5>{{$flight->arr_airport_id}} @lang('frontend.global.metar')</h5>
<h5>{{$flight->arr_airport_id}} @lang('common.metar')</h5>
{{ Widget::Weather([
'icao' => $flight->arr_airport_id,
]) }}
@if ($flight->alt_airport_id)
<br />
<h5>{{$flight->alt_airport_id}} @lang('frontend.global.metar')</h5>
<h5>{{$flight->alt_airport_id}} @lang('common.metar')</h5>
{{ Widget::Weather([
'icao' => $flight->alt_airport_id,
]) }}