Format all blade templates to 2 spaces #530 (#531)

This commit is contained in:
Nabeel S
2020-02-01 13:05:56 -05:00
committed by GitHub
parent 06b47d97e0
commit 59d09c0cec
254 changed files with 7109 additions and 6992 deletions
@@ -28,7 +28,9 @@
href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css"> href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css">
<style> <style>
.table tr:first-child td { border-top: 0px; } .table tr:first-child td {
border-top: 0px;
}
@yield('css') @yield('css')
</style> </style>
</head> </head>
@@ -1,6 +1,6 @@
@if($errors->has($field)) @if($errors->has($field))
<p class="text-danger" style="margin-top: 10px;">{{ $errors->first($field) }}</p> <p class="text-danger" style="margin-top: 10px;">{{ $errors->first($field) }}</p>
{{--<div class="alert alert-danger" role="alert" style="margin-top: 10px;"> {{--<div class="alert alert-danger" role="alert" style="margin-top: 10px;">
{{ $errors->first($field) }} {{ $errors->first($field) }}
</div>--}} </div>--}}
@endif @endif
@@ -1,11 +1,11 @@
@foreach (session('flash_notification', collect())->toArray() as $message) @foreach (session('flash_notification', collect())->toArray() as $message)
<div class="alert alert-danger" role="alert"> <div class="alert alert-danger" role="alert">
<div class="container"> <div class="container">
<div class="alert-icon"> <div class="alert-icon">
<i class="now-ui-icons ui-2_like"></i> <i class="now-ui-icons ui-2_like"></i>
</div> </div>
{{ $message['message'] }} {{ $message['message'] }}
</div> </div>
</div> </div>
@endforeach @endforeach
{{ session()->forget('flash_notification') }} {{ session()->forget('flash_notification') }}
@@ -12,9 +12,11 @@
<ul> <ul>
<li>If you have more than 1000 PIREPs or flights, it's best to use the command-line importer! <li>If you have more than 1000 PIREPs or flights, it's best to use the command-line importer!
<a href="http://docs.phpvms.net/setup/importing-from-v2-v5" target="_blank">Click here</a> to <a href="http://docs.phpvms.net/setup/importing-from-v2-v5" target="_blank">Click here</a> to
see the documentation of how to use it.</li> see the documentation of how to use it.
</li>
<li><strong>THIS WILL WIPE OUT YOUR EXISTING DATA</strong> - this is required to make sure that things like <li><strong>THIS WILL WIPE OUT YOUR EXISTING DATA</strong> - this is required to make sure that things like
pilot IDs match up</li> pilot IDs match up
</li>
</ul> </ul>
</td> </td>
</tr> </tr>
@@ -28,7 +28,9 @@
href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css"> href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css">
<style> <style>
.table tr:first-child td { border-top: 0px; } .table tr:first-child td {
border-top: 0px;
}
@yield('css') @yield('css')
</style> </style>
</head> </head>
@@ -1,6 +1,6 @@
@if($errors->has($field)) @if($errors->has($field))
<p class="text-danger" style="margin-top: 10px;">{{ $errors->first($field) }}</p> <p class="text-danger" style="margin-top: 10px;">{{ $errors->first($field) }}</p>
{{--<div class="alert alert-danger" role="alert" style="margin-top: 10px;"> {{--<div class="alert alert-danger" role="alert" style="margin-top: 10px;">
{{ $errors->first($field) }} {{ $errors->first($field) }}
</div>--}} </div>--}}
@endif @endif
@@ -1,11 +1,11 @@
@foreach (session('flash_notification', []) as $message) @foreach (session('flash_notification', []) as $message)
<div class="alert alert-danger" role="alert"> <div class="alert alert-danger" role="alert">
<div class="container"> <div class="container">
<div class="alert-icon"> <div class="alert-icon">
<i class="now-ui-icons ui-2_like"></i> <i class="now-ui-icons ui-2_like"></i>
</div> </div>
{{ $message['message'] }} {{ $message['message'] }}
</div> </div>
</div> </div>
@endforeach @endforeach
{{ session()->forget('flash_notification') }} {{ session()->forget('flash_notification') }}
@@ -2,10 +2,12 @@
@section('title', 'Requirements Check') @section('title', 'Requirements Check')
@section('content') @section('content')
<div style="align-content: center;"> <div style="align-content: center;">
{{ Form::open(['route' => 'installer.step2', 'method' => 'GET']) }} {{ Form::open(['route' => 'installer.step2', 'method' => 'GET']) }}
<table class="table" width="25%"> <table class="table" width="25%">
<tr><td colspan="2"><h4>php version</h4></td></tr> <tr>
<td colspan="2"><h4>php version</h4></td>
</tr>
<tr> <tr>
<td>PHP Version: {{ $php['version'] }}</td> <td>PHP Version: {{ $php['version'] }}</td>
<td style="text-align:center;"> <td style="text-align:center;">
@@ -17,7 +19,9 @@
</td> </td>
</tr> </tr>
<tr><td colspan="2"><h4>php extensions</h4></td></tr> <tr>
<td colspan="2"><h4>php extensions</h4></td>
</tr>
@foreach($extensions as $ext) @foreach($extensions as $ext)
<tr> <tr>
<td>{{ $ext['ext'] }}</td> <td>{{ $ext['ext'] }}</td>
@@ -59,5 +63,5 @@
{{ $extensions }} {{ $extensions }}
{{ $passed }}--}} {{ $passed }}--}}
{{ Form::close() }} {{ Form::close() }}
</div> </div>
@endsection @endsection
@@ -1,7 +1,7 @@
@extends('installer::app') @extends('installer::app')
@section('title', 'Database Setup') @section('title', 'Database Setup')
@section('content') @section('content')
<div style="align-content: center;"> <div style="align-content: center;">
{{ Form::open(['route' => 'installer.envsetup', 'method' => 'POST']) }} {{ Form::open(['route' => 'installer.envsetup', 'method' => 'POST']) }}
<table class="table" width="25%"> <table class="table" width="25%">
@@ -113,17 +113,17 @@
{{ Form::submit('Setup Database >>', ['class' => 'btn btn-success']) }} {{ Form::submit('Setup Database >>', ['class' => 'btn btn-success']) }}
</p> </p>
{{ Form::close() }} {{ Form::close() }}
</div> </div>
@endsection @endsection
@section('scripts') @section('scripts')
<script> <script>
function changeForm(selected) { function changeForm(selected) {
$("tbody.settings_panel").hide(); $("tbody.settings_panel").hide();
$("tbody#" + selected + "_settings").show(); $("tbody#" + selected + "_settings").show();
} }
$(document).ready(() => { $(document).ready(() => {
const selValue = $("#db_conn option:selected").text(); const selValue = $("#db_conn option:selected").text();
changeForm(selValue); changeForm(selValue);
@@ -149,6 +149,6 @@ $(document).ready(() => {
$("#dbtest").html(data); $("#dbtest").html(data);
}) })
}) })
}); });
</script> </script>
@endsection @endsection
@@ -1,7 +1,7 @@
@extends('installer::app') @extends('installer::app')
@section('title', 'Database Setup Completed') @section('title', 'Database Setup Completed')
@section('content') @section('content')
<div style="align-content: center;"> <div style="align-content: center;">
{{ Form::open(['route' => 'installer.step3', 'method' => 'GET']) }} {{ Form::open(['route' => 'installer.step3', 'method' => 'GET']) }}
<pre class="lang-sh"> <pre class="lang-sh">
@@ -15,5 +15,5 @@
{{ Form::submit('Continue >>', ['class' => 'btn btn-success']) }} {{ Form::submit('Continue >>', ['class' => 'btn btn-success']) }}
</p> </p>
{{ Form::close() }} {{ Form::close() }}
</div> </div>
@endsection @endsection
@@ -2,8 +2,9 @@
@section('title', 'User Setup') @section('title', 'User Setup')
@section('content') @section('content')
<div class="row"><div class="col-md-12"> <div class="row">
<div style="align-content: center;"> <div class="col-md-12">
<div style="align-content: center;">
{{ Form::open(['route' => 'installer.usersetup', 'method' => 'POST']) }} {{ Form::open(['route' => 'installer.usersetup', 'method' => 'POST']) }}
<table class="table" width="25%"> <table class="table" width="25%">
@@ -97,7 +98,7 @@
<div class="form-group"> <div class="form-group">
{{ Form::hidden('telemetry', 0) }} {{ Form::hidden('telemetry', 0) }}
{{ Form::checkbox('telemetry', 1, true, ['class' => 'form-control']) }} {{ Form::checkbox('telemetry', 1, true, ['class' => 'form-control']) }}
<br /> <br/>
<p> <p>
Allows collection of analytics. They won't identify you, and helps us to track Allows collection of analytics. They won't identify you, and helps us to track
the PHP and database versions that are used, and help to figure out problems the PHP and database versions that are used, and help to figure out problems
@@ -112,7 +113,7 @@
{{ Form::submit('Complete Setup >>', ['class' => 'btn btn-success']) }} {{ Form::submit('Complete Setup >>', ['class' => 'btn btn-success']) }}
</p> </p>
{{ Form::close() }} {{ Form::close() }}
</div> </div>
</div> </div>
</div> </div>
@endsection @endsection
@@ -28,7 +28,9 @@
href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css"> href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css">
<style> <style>
.table tr:first-child td { border-top: 0px; } .table tr:first-child td {
border-top: 0px;
}
@yield('css') @yield('css')
</style> </style>
</head> </head>
@@ -1,6 +1,6 @@
@if($errors->has($field)) @if($errors->has($field))
<p class="text-danger" style="margin-top: 10px;">{{ $errors->first($field) }}</p> <p class="text-danger" style="margin-top: 10px;">{{ $errors->first($field) }}</p>
{{--<div class="alert alert-danger" role="alert" style="margin-top: 10px;"> {{--<div class="alert alert-danger" role="alert" style="margin-top: 10px;">
{{ $errors->first($field) }} {{ $errors->first($field) }}
</div>--}} </div>--}}
@endif @endif
@@ -1,11 +1,11 @@
@foreach (session('flash_notification', collect())->toArray() as $message) @foreach (session('flash_notification', collect())->toArray() as $message)
<div class="alert alert-danger" role="alert"> <div class="alert alert-danger" role="alert">
<div class="container"> <div class="container">
<div class="alert-icon"> <div class="alert-icon">
<i class="now-ui-icons ui-2_like"></i> <i class="now-ui-icons ui-2_like"></i>
</div> </div>
{{ $message['message'] }} {{ $message['message'] }}
</div> </div>
</div> </div>
@endforeach @endforeach
{{ session()->forget('flash_notification') }} {{ session()->forget('flash_notification') }}
@@ -6,7 +6,8 @@
<li><a href="{{ route('admin.aircraft.import') }}"><i class="ti-plus"></i>Import from CSV</a></li> <li><a href="{{ route('admin.aircraft.import') }}"><i class="ti-plus"></i>Import from CSV</a></li>
{{--<li><a href="{{ url('/admin/subfleets') }}"><i class="ti-files"></i>Subfleets</a></li>--}} {{--<li><a href="{{ url('/admin/subfleets') }}"><i class="ti-files"></i>Subfleets</a></li>--}}
<li><a href="{{ route('admin.aircraft.create') }}?subfleet={{$subfleet_id}}"> <li><a href="{{ route('admin.aircraft.create') }}?subfleet={{$subfleet_id}}">
<i class="ti-plus"></i>New Aircraft</a></li> <i class="ti-plus"></i>New Aircraft</a>
</li>
@endsection @endsection
@section('content') @section('content')
@@ -1,6 +1,6 @@
@section('scripts') @section('scripts')
<script> <script>
function setEditable() { function setEditable() {
const token = $('meta[name="csrf-token"]').attr('content'); const token = $('meta[name="csrf-token"]').attr('content');
const api_key = $('meta[name="api-key"]').attr('content'); const api_key = $('meta[name="api-key"]').attr('content');
@@ -49,9 +49,9 @@ function setEditable() {
} }
}); });
@endif @endif
} }
$(document).ready(function() { $(document).ready(function () {
setEditable(); setEditable();
@@ -65,6 +65,6 @@ $(document).ready(function() {
initPlugins(); initPlugins();
setEditable(); setEditable();
}); });
}); });
</script> </script>
@endsection @endsection
+13 -12
View File
@@ -1,22 +1,23 @@
@extends('admin.app') @extends('admin.app')
@section('content') @section('content')
<section class="content-header"> <section class="content-header">
<h1 class="pull-left">{{ $aircraft->name }}</h1> <h1 class="pull-left">{{ $aircraft->name }}</h1>
<h1 class="pull-right"> <h1 class="pull-right">
<a class="btn btn-primary pull-right" style="margin-top: -10px;margin-bottom: 5px" href="{{ route('admin.aircraft.edit', $aircraft->id) }}">Edit</a> <a class="btn btn-primary pull-right" style="margin-top: -10px;margin-bottom: 5px"
href="{{ route('admin.aircraft.edit', $aircraft->id) }}">Edit</a>
</h1> </h1>
</section> </section>
<section class="content"> <section class="content">
<div class="clearfix"></div> <div class="clearfix"></div>
<div class="row"> <div class="row">
@include('admin.aircraft.show_fields') @include('admin.aircraft.show_fields')
</div> </div>
</section> </section>
@endsection @endsection
@section('scripts') @section('scripts')
<script> <script>
$(document).ready(function() { $(document).ready(function () {
$(".ac-fare-dropdown").select2(); $(".ac-fare-dropdown").select2();
$('#aircraft_fares a').editable({ $('#aircraft_fares a').editable({
type: 'text', type: 'text',
@@ -24,8 +25,8 @@ $(document).ready(function() {
emptytext: 'default', emptytext: 'default',
url: '/admin/aircraft/{{ $aircraft->id }}/fares', url: '/admin/aircraft/{{ $aircraft->id }}/fares',
title: 'Enter override value', title: 'Enter override value',
ajaxOptions: { 'type': 'put'}, ajaxOptions: {'type': 'put'},
params: function(params) { params: function (params) {
return { return {
fare_id: params.pk, fare_id: params.pk,
name: params.name, name: params.name,
@@ -34,10 +35,10 @@ $(document).ready(function() {
} }
}); });
$(document).on('submit', 'form.rm_fare', function(event) { $(document).on('submit', 'form.rm_fare', function (event) {
event.preventDefault(); event.preventDefault();
$.pjax.submit(event, '#aircraft_fares_wrapper', {push: false}); $.pjax.submit(event, '#aircraft_fares_wrapper', {push: false});
}); });
}); });
</script> </script>
@endsection @endsection
@@ -1,17 +1,17 @@
@extends('admin.app') @extends('admin.app')
@section('title', "Edit \"$airline->name\"") @section('title', "Edit \"$airline->name\"")
@section('content') @section('content')
<div class="card border-blue-bottom"> <div class="card border-blue-bottom">
<div class="content"> <div class="content">
{{ Form::model($airline, ['route' => ['admin.airlines.update', $airline->id], 'method' => 'patch']) }} {{ Form::model($airline, ['route' => ['admin.airlines.update', $airline->id], 'method' => 'patch']) }}
@include('admin.airlines.fields') @include('admin.airlines.fields')
{{ Form::close() }} {{ Form::close() }}
</div> </div>
</div> </div>
<div class="card border-blue-bottom"> <div class="card border-blue-bottom">
<div class="content"> <div class="content">
@include('admin.common.file_upload', ['model' => $airline]) @include('admin.common.file_upload', ['model' => $airline])
</div> </div>
</div> </div>
@endsection @endsection
@@ -37,7 +37,7 @@
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
{{ Form::label('active', 'Active:') }} {{ Form::label('active', 'Active:') }}
<br /> <br/>
<label class="checkbox-inline"> <label class="checkbox-inline">
{{ Form::hidden('active', 0, false) }} {{ Form::hidden('active', 0, false) }}
{{ Form::checkbox('active', 1, null) }} {{ Form::checkbox('active', 1, null) }}
@@ -2,12 +2,12 @@
@section('title', 'Add Airport') @section('title', 'Add Airport')
@section('content') @section('content')
<div class="card border-blue-bottom"> <div class="card border-blue-bottom">
<div class="content"> <div class="content">
{{ Form::open(['route' => 'admin.airports.store', 'id' => 'airportForm']) }} {{ Form::open(['route' => 'admin.airports.store', 'id' => 'airportForm']) }}
@include('admin.airports.fields') @include('admin.airports.fields')
{{ Form::close() }} {{ Form::close() }}
</div> </div>
</div> </div>
@endsection @endsection
@include('admin.airports.script') @include('admin.airports.script')
@@ -1,5 +1,5 @@
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<!-- Icao Field --> <!-- Icao Field -->
<div class="row"> <div class="row">
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
@@ -97,5 +97,5 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
+10 -10
View File
@@ -1,8 +1,8 @@
@section('scripts') @section('scripts')
<script> <script>
'use strict'; 'use strict';
function setEditable() { function setEditable() {
const csrf_token = $('meta[name="csrf-token"]').attr('content'); const csrf_token = $('meta[name="csrf-token"]').attr('content');
const api_key = $('meta[name="api-key"]').attr('content'); const api_key = $('meta[name="api-key"]').attr('content');
@@ -51,9 +51,9 @@ function setEditable() {
} }
}); });
@endif @endif
} }
$(document).ready(function() { $(document).ready(function () {
const api_key = $('meta[name="api-key"]').attr('content'); const api_key = $('meta[name="api-key"]').attr('content');
const csrf_token = $('meta[name="csrf-token"]').attr('content'); const csrf_token = $('meta[name="csrf-token"]').attr('content');
@@ -72,7 +72,7 @@ $(document).ready(function() {
'X-CSRF-TOKEN': csrf_token 'X-CSRF-TOKEN': csrf_token
} }
}, },
params: function(params) { params: function (params) {
return { return {
_method: 'put', _method: 'put',
id: params.pk, id: params.pk,
@@ -82,10 +82,10 @@ $(document).ready(function() {
} }
}); });
$('a.airport_data_lookup').click(async function(e) { $('a.airport_data_lookup').click(async function (e) {
e.preventDefault(); e.preventDefault();
const icao = $("input#airport_icao").val(); const icao = $("input#airport_icao").val();
if(icao === '') { if (icao === '') {
return; return;
} }
@@ -121,6 +121,6 @@ $(document).ready(function() {
initPlugins(); initPlugins();
setEditable(); setEditable();
}); });
}); });
</script> </script>
@endsection @endsection
+10 -9
View File
@@ -1,13 +1,14 @@
@extends('admin.app') @extends('admin.app')
@section('content') @section('content')
<section class="content-header"> <section class="content-header">
<h1 class="pull-left">{{ $airport->name }} - {{ $airport->location }}</h1> <h1 class="pull-left">{{ $airport->name }} - {{ $airport->location }}</h1>
<h1 class="pull-right"> <h1 class="pull-right">
<a class="btn btn-primary pull-right" style="margin-top: -10px;margin-bottom: 5px" href="{{ route('admin.airports.edit', $airport->id) }}">Edit</a> <a class="btn btn-primary pull-right" style="margin-top: -10px;margin-bottom: 5px"
href="{{ route('admin.airports.edit', $airport->id) }}">Edit</a>
</h1> </h1>
</section> </section>
<section class="content"> <section class="content">
<div class="clearfix"></div> <div class="clearfix"></div>
<div class="row"> <div class="row">
@include('admin.airports.show_fields') @include('admin.airports.show_fields')
@@ -23,13 +24,13 @@
</div> </div>
</div> </div>
</div> </div>
</section> </section>
@endsection @endsection
@section('scripts') @section('scripts')
<script type="text/javascript"> <script type="text/javascript">
phpvms_render_airspace_map({ phpvms_render_airspace_map({
lat: {{ $airport->lat }}, lat: {{ $airport->lat }},
lon: {{ $airport->lon }}, lon: {{ $airport->lon }},
}); });
</script> </script>
@endsection @endsection
@@ -1,4 +1,3 @@
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
<div class="box box-solid"> <div class="box box-solid">
<div class="box-header with-border"> <div class="box-header with-border">
@@ -24,11 +24,13 @@
{{ $airport->ground_handling_cost }} {{ $airport->ground_handling_cost }}
</td> </td>
<td style="text-align: center;"> <td style="text-align: center;">
<a class="inline" href="#" data-pk="{{ $airport->id }}" data-name="fuel_jeta_cost">{{ $airport->fuel_jeta_cost }}</a> <a class="inline" href="#" data-pk="{{ $airport->id }}"
data-name="fuel_jeta_cost">{{ $airport->fuel_jeta_cost }}</a>
</td> </td>
<td style="text-align: right;"> <td style="text-align: right;">
{{ Form::open(['route' => ['admin.airports.destroy', $airport->id], 'method' => 'delete']) }} {{ Form::open(['route' => ['admin.airports.destroy', $airport->id], 'method' => 'delete']) }}
<a href="{{ route('admin.airports.edit', [$airport->id]) }}" class='btn btn-sm btn-success btn-icon'><i class="fas fa-pencil-alt"></i></a> <a href="{{ route('admin.airports.edit', [$airport->id]) }}" class='btn btn-sm btn-success btn-icon'><i
class="fas fa-pencil-alt"></i></a>
{{ Form::button('<i class="fa fa-times"></i>', ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon', 'onclick' => "return confirm('Are you sure?')"]) }} {{ Form::button('<i class="fa fa-times"></i>', ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon', 'onclick' => "return confirm('Are you sure?')"]) }}
{{ Form::close() }} {{ Form::close() }}
</td> </td>
+2 -2
View File
@@ -1,12 +1,12 @@
@extends('admin.app') @extends('admin.app')
@section('title', "Edit \"$award->title\" Award") @section('title', "Edit \"$award->title\" Award")
@section('content') @section('content')
<div class="card border-blue-bottom"> <div class="card border-blue-bottom">
<div class="content"> <div class="content">
{{ Form::model($award, ['route' => ['admin.awards.update', $award->id], 'method' => 'patch']) }} {{ Form::model($award, ['route' => ['admin.awards.update', $award->id], 'method' => 'patch']) }}
@include('admin.awards.fields') @include('admin.awards.fields')
{{ Form::close() }} {{ Form::close() }}
</div> </div>
</div> </div>
@endsection @endsection
@include('admin.awards.scripts') @include('admin.awards.scripts')
@@ -1,18 +1,18 @@
@section('scripts') @section('scripts')
<script> <script>
@if(isset($award_descriptions)) @if(isset($award_descriptions))
const award_descriptions = {!! json_encode($award_descriptions) !!}; const award_descriptions = {!! json_encode($award_descriptions) !!};
@else @else
const award_descriptions = {}; const award_descriptions = {};
@endif @endif
const changeParamDescription = (award_class) => { const changeParamDescription = (award_class) => {
const descrip = award_descriptions[award_class]; const descrip = award_descriptions[award_class];
console.log('Found description: ', descrip); console.log('Found description: ', descrip);
$("p#ref_model_param_description").text(descrip); $("p#ref_model_param_description").text(descrip);
}; };
$(document).ready(() => { $(document).ready(() => {
const select_id = "select#award_class_select"; const select_id = "select#award_class_select";
console.log('award descriptions', award_descriptions); console.log('award descriptions', award_descriptions);
$(select_id).change((e) => { $(select_id).change((e) => {
@@ -24,7 +24,7 @@ $(document).ready(() => {
// on load // on load
const award_class = $(select_id + " option:selected").val(); const award_class = $(select_id + " option:selected").val();
changeParamDescription(award_class); changeParamDescription(award_class);
}); });
</script> </script>
@endsection @endsection
+1 -1
View File
@@ -16,7 +16,7 @@
<td> <td>
@if($award->image) @if($award->image)
<img src="{{ $award->image }}" name="{{ $award->name }}" alt="No Image Available" /> <img src="{{ $award->image }}" name="{{ $award->name }}" alt="No Image Available"/>
@else @else
- -
@endif @endif
@@ -31,7 +31,7 @@
{{ Form::close() }} {{ Form::close() }}
</div> </div>
</div> </div>
<hr /> <hr/>
@endforeach @endforeach
<div class="content"> <div class="content">
<div class="header"> <div class="header">
File diff suppressed because one or more lines are too long
@@ -1,11 +1,11 @@
@extends('admin.app') @extends('admin.app')
@section('title', "Edit \"$expense->name\"") @section('title', "Edit \"$expense->name\"")
@section('content') @section('content')
<div class="card border-blue-bottom"> <div class="card border-blue-bottom">
<div class="content"> <div class="content">
{{ Form::model($expense, ['route' => ['admin.expenses.update', $expense->id], 'method' => 'patch']) }} {{ Form::model($expense, ['route' => ['admin.expenses.update', $expense->id], 'method' => 'patch']) }}
@include('admin.expenses.fields') @include('admin.expenses.fields')
{{ Form::close() }} {{ Form::close() }}
</div> </div>
</div> </div>
@endsection @endsection
@@ -8,7 +8,7 @@
@endsection @endsection
@section('content') @section('content')
<div class="card border-blue-bottom"> <div class="card border-blue-bottom">
<div class="content"> <div class="content">
@if(!filled($expenses)) @if(!filled($expenses))
<p class="text-center"> <p class="text-center">
@@ -18,6 +18,6 @@
@include('admin.expenses.table') @include('admin.expenses.table')
@endif @endif
</div> </div>
</div> </div>
@endsection @endsection
+2 -2
View File
@@ -1,11 +1,11 @@
@extends('admin.app') @extends('admin.app')
@section('title', "Edit \"$fare->name\"") @section('title', "Edit \"$fare->name\"")
@section('content') @section('content')
<div class="card border-blue-bottom"> <div class="card border-blue-bottom">
<div class="content"> <div class="content">
{{ Form::model($fare, ['route' => ['admin.fares.update', $fare->id], 'method' => 'patch']) }} {{ Form::model($fare, ['route' => ['admin.fares.update', $fare->id], 'method' => 'patch']) }}
@include('admin.fares.fields') @include('admin.fares.fields')
{{ Form::close() }} {{ Form::close() }}
</div> </div>
</div> </div>
@endsection @endsection
+19 -19
View File
@@ -5,75 +5,75 @@
so you can create default values that will apply to most of your subfleets, and change so you can create default values that will apply to most of your subfleets, and change
them where they will differ. them where they will differ.
</div> </div>
<br /> <br/>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
{{ Form::label('code', 'Code:') }}&nbsp;<span class="required">*</span> {{ Form::label('code', 'Code:') }}&nbsp;<span class="required">*</span>
@component('admin.components.info') @component('admin.components.info')
How this fare class will show up on a ticket How this fare class will show up on a ticket
@endcomponent @endcomponent
{{ Form::text('code', null, ['class' => 'form-control']) }} {{ Form::text('code', null, ['class' => 'form-control']) }}
<p class="text-danger">{{ $errors->first('code') }}</p> <p class="text-danger">{{ $errors->first('code') }}</p>
</div> </div>
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
{{ Form::label('name', 'Name:') }}&nbsp;<span class="required">*</span> {{ Form::label('name', 'Name:') }}&nbsp;<span class="required">*</span>
@component('admin.components.info') @component('admin.components.info')
The fare class name, E.g, "Economy" or "First" The fare class name, E.g, "Economy" or "First"
@endcomponent @endcomponent
{{ Form::text('name', null, ['class' => 'form-control']) }} {{ Form::text('name', null, ['class' => 'form-control']) }}
<p class="text-danger">{{ $errors->first('name') }}</p> <p class="text-danger">{{ $errors->first('name') }}</p>
</div> </div>
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
{{ Form::label('price', 'Price:') }} {{ Form::label('price', 'Price:') }}
@component('admin.components.info') @component('admin.components.info')
This is the price of a ticket for a passenger This is the price of a ticket for a passenger
@endcomponent @endcomponent
{{ Form::text('price', null, ['class' => 'form-control', 'placeholder' => 0]) }} {{ Form::text('price', null, ['class' => 'form-control', 'placeholder' => 0]) }}
<p class="text-danger">{{ $errors->first('price') }}</p> <p class="text-danger">{{ $errors->first('price') }}</p>
</div> </div>
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
{{ Form::label('cost', 'Cost:') }} {{ Form::label('cost', 'Cost:') }}
@component('admin.components.info') @component('admin.components.info')
The operating cost The operating cost
@endcomponent @endcomponent
{{ Form::number('cost', null, ['class' => 'form-control', 'placeholder' => 0, 'step' => '0.01']) }} {{ Form::number('cost', null, ['class' => 'form-control', 'placeholder' => 0, 'step' => '0.01']) }}
<p class="text-danger">{{ $errors->first('cost') }}</p> <p class="text-danger">{{ $errors->first('cost') }}</p>
</div> </div>
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
{{ Form::label('capacity', 'Capacity:') }} {{ Form::label('capacity', 'Capacity:') }}
@component('admin.components.info') @component('admin.components.info')
The number of seats available in this class. The number of seats available in this class.
@endcomponent @endcomponent
{{ Form::number('capacity', null, ['class' => 'form-control', 'min' => 0]) }} {{ Form::number('capacity', null, ['class' => 'form-control', 'min' => 0]) }}
<p class="text-danger">{{ $errors->first('capacity') }}</p> <p class="text-danger">{{ $errors->first('capacity') }}</p>
</div> </div>
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
{{ Form::label('notes', 'Notes:') }} {{ Form::label('notes', 'Notes:') }}
{{ Form::text('notes', null, ['class' => 'form-control']) }} {{ Form::text('notes', null, ['class' => 'form-control']) }}
<p class="text-danger">{{ $errors->first('notes') }}</p> <p class="text-danger">{{ $errors->first('notes') }}</p>
</div> </div>
<!-- Active Field --> <!-- Active Field -->
<div class="form-group col-sm-12"> <div class="form-group col-sm-12">
{{ Form::label('active', 'Active:') }} {{ Form::label('active', 'Active:') }}
<label class="checkbox-inline"> <label class="checkbox-inline">
{{ Form::hidden('active', 0, false) }} {{ Form::hidden('active', 0, false) }}
{{ Form::checkbox('active', 1, null) }} {{ Form::checkbox('active', 1, null) }}
</label> </label>
</div> </div>
<!-- Submit Field --> <!-- Submit Field -->
<div class="form-group col-sm-12"> <div class="form-group col-sm-12">
<div class="pull-right"> <div class="pull-right">
{{ Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) }} {{ Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) }}
<a href="{{ route('admin.fares.index') }}" class="btn btn-warn">Cancel</a> <a href="{{ route('admin.fares.index') }}" class="btn btn-warn">Cancel</a>
</div> </div>
</div> </div>
</div> </div>
+2 -2
View File
@@ -1,9 +1,9 @@
@extends('admin.app') @extends('admin.app')
@section('content') @section('content')
<div class="card border-blue-bottom"> <div class="card border-blue-bottom">
<div class="content"> <div class="content">
@include('admin.fares.show_fields') @include('admin.fares.show_fields')
</div> </div>
</div> </div>
@endsection @endsection
@@ -1,12 +1,12 @@
@section('scripts') @section('scripts')
<script> <script>
$(document).ready(() => { $(document).ready(() => {
const select_id = "select#month_select"; const select_id = "select#month_select";
$(select_id).change((e) => { $(select_id).change((e) => {
const date = $(select_id + " option:selected").val(); const date = $(select_id + " option:selected").val();
const location = window.location.toString().split('?')[0]; const location = window.location.toString().split('?')[0];
window.location = location + '?month='+date; window.location = location + '?month=' + date;
}); });
}); });
</script> </script>
@endsection @endsection
@@ -1,4 +1,3 @@
@foreach($transaction_groups as $group) @foreach($transaction_groups as $group)
<h3>{{ $group['airline']->icao }} - {{ $group['airline']->name }}</h3> <h3>{{ $group['airline']->icao }} - {{ $group['airline']->name }}</h3>
@@ -1,6 +1,6 @@
@if($errors->has($field)) @if($errors->has($field))
<p class="text-danger" style="margin-top: 10px;">{{ $errors->first($field) }}</p> <p class="text-danger" style="margin-top: 10px;">{{ $errors->first($field) }}</p>
{{--<div class="alert alert-danger" role="alert" style="margin-top: 10px;"> {{--<div class="alert alert-danger" role="alert" style="margin-top: 10px;">
{{ $errors->first($field) }} {{ $errors->first($field) }}
</div>--}} </div>--}}
@endif @endif
@@ -19,7 +19,8 @@
<button type="button" <button type="button"
class="close" class="close"
data-dismiss="alert" data-dismiss="alert"
aria-hidden="true">&times;</button> aria-hidden="true">&times;
</button>
{{ $message['message'] }} {{ $message['message'] }}
@@ -1,11 +1,11 @@
@extends('admin.app') @extends('admin.app')
@section('title', 'Editing ' . $field->name) @section('title', 'Editing ' . $field->name)
@section('content') @section('content')
<div class="card border-blue-bottom"> <div class="card border-blue-bottom">
<div class="content"> <div class="content">
{{ Form::model($field, ['route' => ['admin.flightfields.update', $field->id], 'method' => 'patch']) }} {{ Form::model($field, ['route' => ['admin.flightfields.update', $field->id], 'method' => 'patch']) }}
@include('admin.flightfields.fields') @include('admin.flightfields.fields')
{{ Form::close() }} {{ Form::close() }}
</div> </div>
</div> </div>
@endsection @endsection
@@ -30,5 +30,5 @@
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>
</table> </table>
</div> </div>
@@ -62,7 +62,7 @@
@endforeach @endforeach
</tbody> </tbody>
</table> </table>
<hr /> <hr/>
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">
<div class="text-right"> <div class="text-right">
@@ -1,5 +1,5 @@
<div id="flight_fields_wrapper"> <div id="flight_fields_wrapper">
<h3>custom fields</h3><br /> <h3>custom fields</h3><br/>
<table class="table table-responsive" id="flight-fields-table"> <table class="table table-responsive" id="flight-fields-table">
@if(count($flight->field_values)) @if(count($flight->field_values))
<thead> <thead>
@@ -1,8 +1,7 @@
@section('scripts') @section('scripts')
<script> <script>
const setEditable = () => const setEditable = () => {
{
const api_key = $('meta[name="api-key"]').attr('content'); const api_key = $('meta[name="api-key"]').attr('content');
const csrf_token = $('meta[name="csrf-token"]').attr('content'); const csrf_token = $('meta[name="csrf-token"]').attr('content');
@@ -28,9 +27,9 @@ const setEditable = () =>
} }
} }
}); });
}; };
const setFieldsEditable = () => { const setFieldsEditable = () => {
const api_key = $('meta[name="api-key"]').attr('content'); const api_key = $('meta[name="api-key"]').attr('content');
const csrf_token = $('meta[name="csrf-token"]').attr('content'); const csrf_token = $('meta[name="csrf-token"]').attr('content');
@@ -55,9 +54,9 @@ const setFieldsEditable = () => {
} }
} }
}); });
}; };
$(document).ready(function () { $(document).ready(function () {
$("select#days_of_week").select2(); $("select#days_of_week").select2();
setEditable(); setEditable();
@@ -116,6 +115,6 @@ $(document).ready(function () {
$("#distance").val(response.data.distance.nmi); $("#distance").val(response.data.distance.nmi);
}); });
}); });
</script> </script>
@endsection @endsection
+9 -9
View File
@@ -1,14 +1,14 @@
@extends('admin.app') @extends('admin.app')
@section('content') @section('content')
<section class="content-header"> <section class="content-header">
<h1 class="pull-left">{{ $flight->airline->code }}{{ $flight->flight_number }}</h1> <h1 class="pull-left">{{ $flight->airline->code }}{{ $flight->flight_number }}</h1>
<h1 class="pull-right"> <h1 class="pull-right">
<a class="btn btn-primary pull-right" style="margin-top: -10px;margin-bottom: 5px" <a class="btn btn-primary pull-right" style="margin-top: -10px;margin-bottom: 5px"
href="{{ route('admin.flights.edit', $flight->id) }}">Edit</a> href="{{ route('admin.flights.edit', $flight->id) }}">Edit</a>
</h1> </h1>
</section> </section>
<section class="content"> <section class="content">
<div class="clearfix"></div> <div class="clearfix"></div>
<div class="row"> <div class="row">
@include('admin.flights.show_fields') @include('admin.flights.show_fields')
@@ -25,11 +25,11 @@
</div> </div>
</div> </div>
</div> </div>
</section> </section>
@endsection @endsection
@section('scripts') @section('scripts')
<script> <script>
$(document).ready(function () { $(document).ready(function () {
$(".select2_dropdown").select2(); $(".select2_dropdown").select2();
$(document).on('submit', 'form.pjax_form', function (event) { $(document).on('submit', 'form.pjax_form', function (event) {
@@ -37,9 +37,9 @@ $(document).ready(function () {
$.pjax.submit(event, '#subfleet_flight_wrapper', {push: false}); $.pjax.submit(event, '#subfleet_flight_wrapper', {push: false});
}); });
$(document).on('pjax:complete', function() { $(document).on('pjax:complete', function () {
$(".select2_dropdown").select2(); $(".select2_dropdown").select2();
}); });
}); });
</script> </script>
@endsection @endsection
@@ -1,5 +1,5 @@
<div class="content table-responsive table-full-width"> <div class="content table-responsive table-full-width">
<table class="table table-hover" id="flights-table"> <table class="table table-hover" id="flights-table">
<thead> <thead>
<th>Flight #</th> <th>Flight #</th>
<th>Dep</th> <th>Dep</th>
@@ -39,12 +39,13 @@
</td> </td>
<td style="text-align: right;"> <td style="text-align: right;">
{{ Form::open(['route' => ['admin.flights.destroy', $flight->id], 'method' => 'delete']) }} {{ Form::open(['route' => ['admin.flights.destroy', $flight->id], 'method' => 'delete']) }}
<a href="{{ route('admin.flights.edit', [$flight->id]) }}" class='btn btn-sm btn-success btn-icon'><i class="fas fa-pencil-alt"></i></a> <a href="{{ route('admin.flights.edit', [$flight->id]) }}" class='btn btn-sm btn-success btn-icon'><i
class="fas fa-pencil-alt"></i></a>
{{ Form::button('<i class="fa fa-times"></i>', ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon', 'onclick' => "return confirm('Are you sure?')"]) }} {{ Form::button('<i class="fa fa-times"></i>', ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon', 'onclick' => "return confirm('Are you sure?')"]) }}
{{ Form::close() }} {{ Form::close() }}
</td> </td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>
</table> </table>
</div> </div>
-1
View File
@@ -1,4 +1,3 @@
<li> <li>
<a href="{{ url('/admin/dashboard') }}"><i class="pe-7s-display1"></i>dashboard</a> <a href="{{ url('/admin/dashboard') }}"><i class="pe-7s-display1"></i>dashboard</a>
</li> </li>
@@ -6,7 +6,7 @@
<li class="page-item"><a class="page-link" href="{{ $paginator->previousPageUrl() }}" rel="prev">&laquo;</a></li> <li class="page-item"><a class="page-link" href="{{ $paginator->previousPageUrl() }}" rel="prev">&laquo;</a></li>
@endif @endif
<!-- Pagination Elements --> <!-- Pagination Elements -->
@foreach ($elements as $element) @foreach ($elements as $element)
<!-- "Three Dots" Separator --> <!-- "Three Dots" Separator -->
@if (is_string($element)) @if (is_string($element))
@@ -25,7 +25,7 @@
@endif @endif
@endforeach @endforeach
<!-- Next Page Link --> <!-- Next Page Link -->
@if ($paginator->hasMorePages()) @if ($paginator->hasMorePages())
<li class="page-item"><a class="page-link" href="{{ $paginator->nextPageUrl() }}" rel="next">&raquo;</a></li> <li class="page-item"><a class="page-link" href="{{ $paginator->nextPageUrl() }}" rel="next">&raquo;</a></li>
@else @else
@@ -6,7 +6,7 @@
<li><a href="{{ $paginator->previousPageUrl() }}" rel="prev">&laquo;</a></li> <li><a href="{{ $paginator->previousPageUrl() }}" rel="prev">&laquo;</a></li>
@endif @endif
<!-- Pagination Elements --> <!-- Pagination Elements -->
@foreach ($elements as $element) @foreach ($elements as $element)
<!-- "Three Dots" Separator --> <!-- "Three Dots" Separator -->
@if (is_string($element)) @if (is_string($element))
@@ -25,7 +25,7 @@
@endif @endif
@endforeach @endforeach
<!-- Next Page Link --> <!-- Next Page Link -->
@if ($paginator->hasMorePages()) @if ($paginator->hasMorePages())
<li><a href="{{ $paginator->nextPageUrl() }}" rel="next">&raquo;</a></li> <li><a href="{{ $paginator->nextPageUrl() }}" rel="next">&raquo;</a></li>
@else @else
@@ -6,7 +6,7 @@
<li class="page-item"><a class="page-link" href="{{ $paginator->previousPageUrl() }}" rel="prev">&laquo;</a></li> <li class="page-item"><a class="page-link" href="{{ $paginator->previousPageUrl() }}" rel="prev">&laquo;</a></li>
@endif @endif
<!-- Next Page Link --> <!-- Next Page Link -->
@if ($paginator->hasMorePages()) @if ($paginator->hasMorePages())
<li class="page-item"><a class="page-link" href="{{ $paginator->nextPageUrl() }}" rel="next">&raquo;</a></li> <li class="page-item"><a class="page-link" href="{{ $paginator->nextPageUrl() }}" rel="next">&raquo;</a></li>
@else @else
@@ -6,7 +6,7 @@
<li><a href="{{ $paginator->previousPageUrl() }}" rel="prev">&laquo;</a></li> <li><a href="{{ $paginator->previousPageUrl() }}" rel="prev">&laquo;</a></li>
@endif @endif
<!-- Next Page Link --> <!-- Next Page Link -->
@if ($paginator->hasMorePages()) @if ($paginator->hasMorePages())
<li><a href="{{ $paginator->nextPageUrl() }}" rel="next">&raquo;</a></li> <li><a href="{{ $paginator->nextPageUrl() }}" rel="next">&raquo;</a></li>
@else @else
@@ -1,11 +1,11 @@
@extends('admin.app') @extends('admin.app')
@section('title', 'Editing ' . $field->name) @section('title', 'Editing ' . $field->name)
@section('content') @section('content')
<div class="card border-blue-bottom"> <div class="card border-blue-bottom">
<div class="content"> <div class="content">
{{ Form::model($field, ['route' => ['admin.pirepfields.update', $field->id], 'method' => 'patch']) }} {{ Form::model($field, ['route' => ['admin.pirepfields.update', $field->id], 'method' => 'patch']) }}
@include('admin.pirepfields.fields') @include('admin.pirepfields.fields')
{{ Form::close() }} {{ Form::close() }}
</div> </div>
</div> </div>
@endsection @endsection
@@ -35,5 +35,5 @@
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>
</table> </table>
</div> </div>
@@ -33,7 +33,8 @@
<form action="{{ route('admin.pireps.edit', [$pirep->id]) }}"> <form action="{{ route('admin.pireps.edit', [$pirep->id]) }}">
<button type="submit" <button type="submit"
class='btn btn-info'> class='btn btn-info'>
<i class="fas fa-pencil-alt"></i>&nbsp;&nbsp;Edit</button> <i class="fas fa-pencil-alt"></i>&nbsp;&nbsp;Edit
</button>
</form> </form>
</td> </td>
@endif @endif
+4 -3
View File
@@ -2,7 +2,7 @@
@section('title', 'Edit ' . $pirep->ident ) @section('title', 'Edit ' . $pirep->ident )
@section('content') @section('content')
<div class="content"> <div class="content">
<div class="card border-blue-bottom"> <div class="card border-blue-bottom">
<div class="content"> <div class="content">
@@ -47,14 +47,15 @@
<div class="pull-right"> <div class="pull-right">
<button id="recalculate-finances" <button id="recalculate-finances"
class="btn btn-success" class="btn btn-success"
data-pirep-id="{{ $pirep->id }}">Recalcuate Finances</button> data-pirep-id="{{ $pirep->id }}">Recalcuate Finances
</button>
</div> </div>
<h4>transactions</h4> <h4>transactions</h4>
@include('admin.pireps.transactions') @include('admin.pireps.transactions')
</div> </div>
</div> </div>
</div> </div>
@endsection @endsection
@include('admin.pireps.scripts') @include('admin.pireps.scripts')
+2 -2
View File
@@ -1,5 +1,5 @@
@if($aircraft) @if($aircraft)
<table class="table table-hover table-responsive"> <table class="table table-hover table-responsive">
<thead> <thead>
<th>Fare</th> <th>Fare</th>
<th>Count</th> <th>Count</th>
@@ -26,5 +26,5 @@
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>
</table> </table>
@endif @endif
@@ -1,5 +1,5 @@
@if(count($pirep->acars_logs) > 0) @if(count($pirep->acars_logs) > 0)
<div class="col-12"> <div class="col-12">
<table class="table table-hover" id="users-table"> <table class="table table-hover" id="users-table">
<tbody> <tbody>
@foreach($pirep->acars_logs as $log) @foreach($pirep->acars_logs as $log)
@@ -10,5 +10,5 @@
@endforeach @endforeach
</tbody> </tbody>
</table> </table>
</div> </div>
@endif @endif
@@ -1,5 +1,5 @@
<div id="pirep_{{ $pirep->id }}_container"> <div id="pirep_{{ $pirep->id }}_container">
<div class="card border-blue-bottom pirep_card_container"> <div class="card border-blue-bottom pirep_card_container">
<div class="card-block" style="min-height: 0px"> <div class="card-block" style="min-height: 0px">
<div class="row"> <div class="row">
<div class="col-sm-2 text-center"> <div class="col-sm-2 text-center">
@@ -80,5 +80,5 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@@ -1,6 +1,6 @@
@section('scripts') @section('scripts')
<script> <script>
const changeStatus = async (values, fn) => { const changeStatus = async (values, fn) => {
console.log('Changing PIREP ' + values.pirep_id + ' to state ' + values.new_status); console.log('Changing PIREP ' + values.pirep_id + ' to state ' + values.new_status);
const opts = { const opts = {
@@ -11,9 +11,9 @@ const changeStatus = async (values, fn) => {
const response = await phpvms.request(opts); const response = await phpvms.request(opts);
fn(response.data); fn(response.data);
}; };
$(document).ready(() => { $(document).ready(() => {
const select_id = "select#aircraft_select"; const select_id = "select#aircraft_select";
const destContainer = $('#fares_container'); const destContainer = $('#fares_container');
@@ -83,6 +83,6 @@ $(document).ready(() => {
}); });
}); });
}); });
</script> </script>
@endsection @endsection
@@ -1,5 +1,5 @@
<div class="col-12"> <div class="col-12">
@if(count($journal['transactions']) > 0) @if(count($journal['transactions']) > 0)
<table class="table table-hover" id="users-table"> <table class="table table-hover" id="users-table">
<tbody> <tbody>
@foreach($journal['transactions'] as $entry) @foreach($journal['transactions'] as $entry)
+2 -2
View File
@@ -1,12 +1,12 @@
@extends('admin.app') @extends('admin.app')
@section('Add Rank') @section('Add Rank')
@section('content') @section('content')
<div class="card border-blue-bottom"> <div class="card border-blue-bottom">
<div class="content"> <div class="content">
{{ Form::open(['route' => 'admin.ranks.store', 'class' => 'add_rank', 'method'=>'POST']) }} {{ Form::open(['route' => 'admin.ranks.store', 'class' => 'add_rank', 'method'=>'POST']) }}
@include('admin.ranks.fields') @include('admin.ranks.fields')
{{ Form::close() }} {{ Form::close() }}
</div> </div>
</div> </div>
@endsection @endsection
@include('admin.ranks.scripts') @include('admin.ranks.scripts')
+4 -4
View File
@@ -1,15 +1,15 @@
@extends('admin.app') @extends('admin.app')
@section('title', "Edit \"$rank->name\"") @section('title', "Edit \"$rank->name\"")
@section('content') @section('content')
<div class="card border-blue-bottom"> <div class="card border-blue-bottom">
<div class="content"> <div class="content">
{{ Form::model($rank, ['route' => ['admin.ranks.update', $rank->id], 'method' => 'patch']) }} {{ Form::model($rank, ['route' => ['admin.ranks.update', $rank->id], 'method' => 'patch']) }}
@include('admin.ranks.fields') @include('admin.ranks.fields')
{{ Form::close() }} {{ Form::close() }}
</div> </div>
</div> </div>
<div class="card border-blue-bottom"> <div class="card border-blue-bottom">
<div class="content"> <div class="content">
<div class="header"> <div class="header">
<h3>subfleets</h3> <h3>subfleets</h3>
@@ -22,6 +22,6 @@
@include('admin.ranks.subfleets') @include('admin.ranks.subfleets')
</div> </div>
</div> </div>
</div> </div>
@endsection @endsection
@include('admin.ranks.scripts') @include('admin.ranks.scripts')
@@ -1,6 +1,6 @@
@section('scripts') @section('scripts')
<script> <script>
function setEditable() { function setEditable() {
const token = $('meta[name="csrf-token"]').attr('content'); const token = $('meta[name="csrf-token"]').attr('content');
const api_key = $('meta[name="api-key"]').attr('content'); const api_key = $('meta[name="api-key"]').attr('content');
@@ -28,9 +28,9 @@ function setEditable() {
} }
}); });
@endif @endif
} }
$(document).ready(function () { $(document).ready(function () {
setEditable(); setEditable();
@@ -43,6 +43,6 @@ $(document).ready(function () {
initPlugins(); initPlugins();
setEditable(); setEditable();
}); });
}); });
</script> </script>
@endsection @endsection
@@ -42,7 +42,7 @@
@endforeach @endforeach
</tbody> </tbody>
</table> </table>
<hr /> <hr/>
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<div class="input-group input-group-lg pull-right"> <div class="input-group input-group-lg pull-right">
+4 -4
View File
@@ -1,17 +1,17 @@
@extends('admin.app') @extends('admin.app')
@section('title', "Edit \"$role->display_name\"") @section('title', "Edit \"$role->display_name\"")
@section('content') @section('content')
<div class="card border-blue-bottom"> <div class="card border-blue-bottom">
<div class="content"> <div class="content">
{{ Form::model($role, ['route' => ['admin.roles.update', $role->id], 'method' => 'patch']) }} {{ Form::model($role, ['route' => ['admin.roles.update', $role->id], 'method' => 'patch']) }}
@include('admin.roles.fields') @include('admin.roles.fields')
{{ Form::close() }} {{ Form::close() }}
</div> </div>
</div> </div>
<div class="card border-blue-bottom"> <div class="card border-blue-bottom">
<div class="content"> <div class="content">
@include('admin.roles.users') @include('admin.roles.users')
</div> </div>
</div> </div>
@endsection @endsection
+2 -1
View File
@@ -30,7 +30,8 @@
<label class="checkbox-inline"> <label class="checkbox-inline">
{{ Form::hidden('permissions[]', false) }} {{ Form::hidden('permissions[]', false) }}
{{ Form::checkbox('permissions[]', $p->id) }} {{ Form::checkbox('permissions[]', $p->id) }}
{{ Form::label('permissions[]', $p->display_name) }} - <span class="description">{{$p->description}}</span> {{ Form::label('permissions[]', $p->display_name) }} - <span
class="description">{{$p->description}}</span>
</label> </label>
</div> </div>
@endforeach @endforeach
@@ -1,14 +1,14 @@
@section('scripts') @section('scripts')
<script> <script>
$(document).ready(function() { $(document).ready(function () {
$('#settings a').editable({ $('#settings a').editable({
type: 'text', type: 'text',
mode: 'inline', mode: 'inline',
emptytext: 'default', emptytext: 'default',
url: '/admin/settings/update', url: '/admin/settings/update',
title: 'Enter override value', title: 'Enter override value',
ajaxOptions: { 'type': 'put'}, ajaxOptions: {'type': 'put'},
params: function(params) { params: function (params) {
return { return {
fare_id: params.pk, fare_id: params.pk,
name: params.name, name: params.name,
@@ -17,14 +17,14 @@ $(document).ready(function() {
} }
}); });
$(document).on('submit', 'form.rm_fare', function(event) { $(document).on('submit', 'form.rm_fare', function (event) {
event.preventDefault(); event.preventDefault();
$.pjax.submit(event, '#aircraft_fares_wrapper', {push: false}); $.pjax.submit(event, '#aircraft_fares_wrapper', {push: false});
}); });
$(document).on('pjax:complete', function() { $(document).on('pjax:complete', function () {
initPlugins(); initPlugins();
}); });
}); });
</script> </script>
@endsection @endsection
+1 -1
View File
@@ -17,7 +17,7 @@
@include('admin.menu') @include('admin.menu')
</ul> </ul>
<br /> <br/>
<div class="row"> <div class="row">
<div class="col-xs-12 text-center"> <div class="col-xs-12 text-center">
@@ -7,7 +7,7 @@
The pay can be set as a fixed amount, or a percentage of the default rate The pay can be set as a fixed amount, or a percentage of the default rate
@endcomponent @endcomponent
</div> </div>
<br /> <br/>
<table id="aircraft_fares" class="table table-hover"> <table id="aircraft_fares" class="table table-hover">
@if(count($subfleet->fares)) @if(count($subfleet->fares))
<thead> <thead>
@@ -52,7 +52,7 @@
@endforeach @endforeach
</tbody> </tbody>
</table> </table>
<hr /> <hr/>
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">
<div class="text-right"> <div class="text-right">
@@ -6,7 +6,7 @@
set as a fixed amount, or a percentage of the rank's base payrate set as a fixed amount, or a percentage of the rank's base payrate
@endcomponent @endcomponent
</div> </div>
<br /> <br/>
<table id="subfleet_ranks" class="table table-hover"> <table id="subfleet_ranks" class="table table-hover">
@if(count($subfleet->ranks)) @if(count($subfleet->ranks))
<thead> <thead>
@@ -49,7 +49,7 @@
@endforeach @endforeach
</tbody> </tbody>
</table> </table>
<hr /> <hr/>
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">
<div class="text-right"> <div class="text-right">
@@ -1,6 +1,6 @@
@section('scripts') @section('scripts')
<script> <script>
function setEditable() { function setEditable() {
const token = $('meta[name="csrf-token"]').attr('content'); const token = $('meta[name="csrf-token"]').attr('content');
const api_key = $('meta[name="api-key"]').attr('content'); const api_key = $('meta[name="api-key"]').attr('content');
@@ -95,13 +95,13 @@ function setEditable() {
} }
} }
}); });
} }
$(document).ready(function() { $(document).ready(function () {
setEditable(); setEditable();
$(document).on('submit', 'form.rm_fare', function(event) { $(document).on('submit', 'form.rm_fare', function (event) {
event.preventDefault(); event.preventDefault();
console.log(event); console.log(event);
$.pjax.submit(event, '#aircraft_fares_wrapper', {push: false}); $.pjax.submit(event, '#aircraft_fares_wrapper', {push: false});
@@ -120,10 +120,10 @@ $(document).ready(function() {
$.pjax.submit(event, '#subfleet-expenses-wrapper', {push: false}); $.pjax.submit(event, '#subfleet-expenses-wrapper', {push: false});
}); });
$(document).on('pjax:complete', function() { $(document).on('pjax:complete', function () {
initPlugins(); initPlugins();
setEditable(); setEditable();
}); });
}); });
</script> </script>
@endsection @endsection
@@ -1,5 +1,5 @@
<div class="content table-responsive table-full-width"> <div class="content table-responsive table-full-width">
<table class="table table-hover table-responsive" id="subfleets-table"> <table class="table table-hover table-responsive" id="subfleets-table">
<thead> <thead>
<th>Name</th> <th>Name</th>
<th>Airline</th> <th>Airline</th>
@@ -32,5 +32,5 @@
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>
</table> </table>
</div> </div>
+4 -4
View File
@@ -1,15 +1,15 @@
@extends('admin.app') @extends('admin.app')
@section('title', 'Edit '. $user->name) @section('title', 'Edit '. $user->name)
@section('content') @section('content')
<div class="card border-blue-bottom"> <div class="card border-blue-bottom">
<div class="content"> <div class="content">
{{ Form::model($user, ['route' => ['admin.users.update', $user->id], 'method' => 'patch']) }} {{ Form::model($user, ['route' => ['admin.users.update', $user->id], 'method' => 'patch']) }}
@include('admin.users.fields') @include('admin.users.fields')
{{ Form::close() }} {{ Form::close() }}
</div> </div>
</div> </div>
<div class="card border-blue-bottom"> <div class="card border-blue-bottom">
<div class="content"> <div class="content">
<div class="header"> <div class="header">
<h3>PIREPs</h3> <h3>PIREPs</h3>
@@ -23,5 +23,5 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@endsection @endsection
+2 -2
View File
@@ -28,7 +28,7 @@
<div class="row"> <div class="row">
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
<div class="form-group"> <div class="form-group">
{{ Form::label('country', 'Country:') }} <br /> {{ Form::label('country', 'Country:') }} <br/>
{{ Form::select('country', $countries, null, ['class' => 'select2' ]) }} {{ Form::select('country', $countries, null, ['class' => 'select2' ]) }}
<p class="text-danger">{{ $errors->first('country') }}</p> <p class="text-danger">{{ $errors->first('country') }}</p>
</div> </div>
@@ -47,7 +47,7 @@
{{ Form::label('home_airport_id', 'Home Airport:') }} {{ Form::label('home_airport_id', 'Home Airport:') }}
{{ Form::select('home_airport_id', $airports, null , ['class' => 'form-control select2']) }} {{ Form::select('home_airport_id', $airports, null , ['class' => 'form-control select2']) }}
<p class="text-danger">{{ $errors->first('home_airport_id') }}</p> <p class="text-danger">{{ $errors->first('home_airport_id') }}</p>
<br /><br /> <br/><br/>
{{ Form::label('curr_airport_id', 'Current Airport:') }} {{ Form::label('curr_airport_id', 'Current Airport:') }}
{{ Form::select('curr_airport_id', $airports, null , ['class' => 'form-control select2']) }} {{ Form::select('curr_airport_id', $airports, null , ['class' => 'form-control select2']) }}
<p class="text-danger">{{ $errors->first('curr_airport_id') }}</p> <p class="text-danger">{{ $errors->first('curr_airport_id') }}</p>
+2 -2
View File
@@ -1,10 +1,10 @@
@extends('admin.app') @extends('admin.app')
@section('title', 'Edit '. $user->name) @section('title', 'Edit '. $user->name)
@section('content') @section('content')
<div class="card"> <div class="card">
<div class="content"> <div class="content">
@include('admin.users.fields') @include('admin.users.fields')
</div> </div>
</div> </div>
@endsection @endsection
@@ -2,7 +2,7 @@
@section('title', $airport->full_name) @section('title', $airport->full_name)
@section('content') @section('content')
<div class="row" style="margin-bottom: 30px;"> <div class="row" style="margin-bottom: 30px;">
<div class="col-12"> <div class="col-12">
<h2>{{ $airport->full_name }}</h2> <h2>{{ $airport->full_name }}</h2>
</div> </div>
@@ -23,8 +23,8 @@
'lon' => $airport->lon, 'lon' => $airport->lon,
]) }} ]) }}
</div> </div>
</div> </div>
<div class="row"> <div class="row">
{{-- There are files uploaded and a user is logged in--}} {{-- There are files uploaded and a user is logged in--}}
@if(count($airport->files) > 0 && Auth::check()) @if(count($airport->files) > 0 && Auth::check())
<div class="col-12"> <div class="col-12">
@@ -32,9 +32,9 @@
@include('downloads.table', ['files' => $airport->files]) @include('downloads.table', ['files' => $airport->files])
</div> </div>
@endif @endif
</div> </div>
<div class="row"> <div class="row">
<div class="col-6"> <div class="col-6">
<h5>@lang('flights.inbound')</h5> <h5>@lang('flights.inbound')</h5>
@if(!$inbound_flights) @if(!$inbound_flights)
@@ -104,5 +104,5 @@
</table> </table>
@endif @endif
</div> </div>
</div> </div>
@endsection @endsection
@@ -1 +1,2 @@
{{ __('Click here to reset your password') }}: <a href="{{ $link = url('password/reset', $token).'?email='.urlencode($user->getEmailForPasswordReset()) }}"> {{ $link }} </a> {{ __('Click here to reset your password') }}: <a
href="{{ $link = url('password/reset', $token).'?email='.urlencode($user->getEmailForPasswordReset()) }}"> {{ $link }} </a>
@@ -1,16 +1,16 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8"/>
<link rel="apple-touch-icon" sizes="76x76" href="/assets/frontend/img/apple-icon.png"> <link rel="apple-touch-icon" sizes="76x76" href="/assets/frontend/img/apple-icon.png">
<link rel="icon" type="image/png" href="/assets/frontend/img/favicon.png"> <link rel="icon" type="image/png" href="/assets/frontend/img/favicon.png">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
<title>@yield('title') - {{ config('app.name') }}</title> <title>@yield('title') - {{ config('app.name') }}</title>
<meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no' name='viewport' /> <meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no'
<link href="https://fonts.googleapis.com/css?family=Montserrat:400,700,200" rel="stylesheet" /> name='viewport'/>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css" /> <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700,200" rel="stylesheet"/>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css"/>
<link href="{{ public_asset('/assets/frontend/css/bootstrap.min.css') }}" rel="stylesheet"/> <link href="{{ public_asset('/assets/frontend/css/bootstrap.min.css') }}" rel="stylesheet"/>
<link href="{{ public_mix('/assets/frontend/css/now-ui-kit.css') }}" rel="stylesheet"/> <link href="{{ public_mix('/assets/frontend/css/now-ui-kit.css') }}" rel="stylesheet"/>
<link href="{{ public_asset('/assets/frontend/css/styles.css') }}" rel="stylesheet"/> <link href="{{ public_asset('/assets/frontend/css/styles.css') }}" rel="stylesheet"/>
@@ -32,7 +32,8 @@
&copy; &copy;
<script> <script>
document.write(new Date().getFullYear()) document.write(new Date().getFullYear())
</script>, powered by </script>
, powered by
<a href="http://www.phpvms.net" target="_blank">phpvms</a>. Now-UI by <a href="http://www.phpvms.net" target="_blank">phpvms</a>. Now-UI by
<a href="https://www.creative-tim.com" target="_blank">Creative Tim</a> <a href="https://www.creative-tim.com" target="_blank">Creative Tim</a>
</div> </div>
@@ -3,7 +3,7 @@
<!-- Main Content --> <!-- Main Content -->
@section('content') @section('content')
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-md-8 col-md-offset-2"> <div class="col-md-8 col-md-offset-2">
<div class="panel panel-default"> <div class="panel panel-default">
@@ -44,5 +44,5 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@endsection @endsection
@@ -2,7 +2,7 @@
@section('title', __('Reset Password')) @section('title', __('Reset Password'))
@section('content') @section('content')
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-md-8 col-md-offset-2"> <div class="col-md-8 col-md-offset-2">
<div class="panel panel-default"> <div class="panel panel-default">
@@ -21,7 +21,8 @@
<label for="email" class="col-md-4 control-label">{{ __('Email Address') }}</label> <label for="email" class="col-md-4 control-label">{{ __('Email Address') }}</label>
<div class="col-md-6"> <div class="col-md-6">
<input id="email" type="email" class="form-control" name="email" value="{{ $email or old('email') }}" required autofocus> <input id="email" type="email" class="form-control" name="email" value="{{ $email or old('email') }}"
required autofocus>
@if ($errors->has('email')) @if ($errors->has('email'))
<span class="help-block"> <span class="help-block">
@@ -70,5 +71,5 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@endsection @endsection
@@ -2,7 +2,7 @@
@section('title', __('auth.registrationpending')) @section('title', __('auth.registrationpending'))
@section('content') @section('content')
<div class="row"> <div class="row">
<div class="col-md-12 " style="text-align: center;"> <div class="col-md-12 " style="text-align: center;">
<div class="flex-center position-ref full-height"> <div class="flex-center position-ref full-height">
<div class="title m-b-md"> <div class="title m-b-md">
@@ -10,5 +10,5 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@endsection() @endsection()
@@ -2,11 +2,11 @@
@section('title', __('auth.register')) @section('title', __('auth.register'))
@section('content') @section('content')
<div class="row"> <div class="row">
<div class="col-sm-3"></div> <div class="col-sm-3"></div>
<div class="col-sm-6"> <div class="col-sm-6">
{{ Form::open(['url' => '/register', 'class' => 'form-signin']) }} {{ Form::open(['url' => '/register', 'class' => 'form-signin']) }}
<div class="panel periodic-login"> <div class="panel periodic-login">
<div class="panel-body"> <div class="panel-body">
@@ -87,7 +87,8 @@
@if(config('captcha.enabled')) @if(config('captcha.enabled'))
<label for="g-recaptcha-response" class="control-label">@lang('auth.fillcaptcha')</label> <label for="g-recaptcha-response" class="control-label">@lang('auth.fillcaptcha')</label>
<div class="input-group form-group-no-border {{ $errors->has('g-recaptcha-response') ? 'has-danger' : '' }}"> <div
class="input-group form-group-no-border {{ $errors->has('g-recaptcha-response') ? 'has-danger' : '' }}">
{!! NoCaptcha::display(config('captcha.attributes')) !!} {!! NoCaptcha::display(config('captcha.attributes')) !!}
</div> </div>
@if ($errors->has('g-recaptcha-response')) @if ($errors->has('g-recaptcha-response'))
@@ -97,7 +98,7 @@
<div> <div>
@include('auth.toc') @include('auth.toc')
<br /> <br/>
</div> </div>
<table> <table>
@@ -138,17 +139,17 @@
</div> </div>
</div> </div>
{{ Form::close() }} {{ Form::close() }}
</div> </div>
<div class="col-sm-4"></div> <div class="col-sm-4"></div>
</div> </div>
@endsection @endsection
@section('scripts') @section('scripts')
{!! NoCaptcha::renderJs(config('app.locale')) !!} {!! NoCaptcha::renderJs(config('app.locale')) !!}
<script> <script>
$('#toc_accepted').click(function () { $('#toc_accepted').click(function () {
if ($(this).is(':checked')) { if ($(this).is(':checked')) {
console.log('toc accepted'); console.log('toc accepted');
$('#register_button').removeAttr('disabled'); $('#register_button').removeAttr('disabled');
@@ -156,6 +157,6 @@ $('#toc_accepted').click(function () {
console.log('toc not accepted'); console.log('toc not accepted');
$('#register_button').attr('disabled', 'true'); $('#register_button').attr('disabled', 'true');
} }
}); });
</script> </script>
@endsection @endsection
@@ -2,10 +2,10 @@
@section('title', __('auth.registrationsubmitted')) @section('title', __('auth.registrationsubmitted'))
@section('content') @section('content')
<div class="container registered-page"> <div class="container registered-page">
<h3>@lang('auth.registrationconfirmation')</h3> <h3>@lang('auth.registrationconfirmation')</h3>
<p> <p>
@lang('auth.confirmationmessage') @lang('auth.confirmationmessage')
</p> </p>
</div> </div>
@endsection @endsection
@@ -2,7 +2,7 @@
@section('title', __('auth.registrationdenied')) @section('title', __('auth.registrationdenied'))
@section('content') @section('content')
<div class="row"> <div class="row">
<div class="col-md-12 " style="text-align: center;"> <div class="col-md-12 " style="text-align: center;">
<div class="flex-center position-ref full-height"> <div class="flex-center position-ref full-height">
<div class="title m-b-md"> <div class="title m-b-md">
@@ -12,5 +12,5 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@endsection @endsection
@@ -2,7 +2,7 @@
@section('title', __('auth.accountsuspended')) @section('title', __('auth.accountsuspended'))
@section('content') @section('content')
<div class="row"> <div class="row">
<div class="col-md-12 " style="text-align: center;"> <div class="col-md-12 " style="text-align: center;">
<div class="flex-center position-ref full-height"> <div class="flex-center position-ref full-height">
<div class="title m-b-md"> <div class="title m-b-md">
@@ -12,5 +12,5 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@endsection @endsection
@@ -1,7 +1,7 @@
@extends('layouts.app') @extends('layouts.app')
@section('content') @section('content')
<div class="container"> <div class="container">
<div class="row justify-content-center"> <div class="row justify-content-center">
<div class="col-md-8"> <div class="col-md-8">
<div class="card"> <div class="card">
@@ -21,11 +21,12 @@
@csrf @csrf
<button type="submit" class="btn btn-link p-0 m-0 align-baseline"> <button type="submit" class="btn btn-link p-0 m-0 align-baseline">
{{ __('click here to request another') }} {{ __('click here to request another') }}
</button>. </button>
.
</form> </form>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@endsection @endsection
@@ -2,7 +2,7 @@
@section('title', __('common.dashboard')) @section('title', __('common.dashboard'))
@section('content') @section('content')
<div class="row"> <div class="row">
<div class="col-sm-8"> <div class="col-sm-8">
{{-- TOP BAR WITH BOXES --}} {{-- TOP BAR WITH BOXES --}}
@@ -66,7 +66,8 @@
</div> </div>
@if($last_pirep === null) @if($last_pirep === null)
<div class="card-body" style="text-align:center;"> <div class="card-body" style="text-align:center;">
@lang('dashboard.noreportsyet') <a href="{{ route('frontend.pireps.create') }}">@lang('dashboard.fileonenow')</a> @lang('dashboard.noreportsyet') <a
href="{{ route('frontend.pireps.create') }}">@lang('dashboard.fileonenow')</a>
</div> </div>
@else @else
@include('pireps.pirep_card', ['pirep' => $last_pirep]) @include('pireps.pirep_card', ['pirep' => $last_pirep])
@@ -115,5 +116,5 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@endsection @endsection
@@ -9,7 +9,8 @@
@if($file->description) @if($file->description)
- {{$file->description}} - {{$file->description}}
@endif @endif
<span style="margin-left: 20px">{{ $file->download_count.' '.trans_choice('common.download', $file->download_count) }}</span> <span
style="margin-left: 20px">{{ $file->download_count.' '.trans_choice('common.download', $file->download_count) }}</span>
</li> </li>
@endforeach @endforeach
</ul> </ul>
@@ -2,7 +2,7 @@
@section('title', trans_choice('common.flight', 2)) @section('title', trans_choice('common.flight', 2))
@section('content') @section('content')
<div class="row"> <div class="row">
@include('flash::message') @include('flash::message')
<div class="col-md-9"> <div class="col-md-9">
<h2>{{ $title ?? trans_choice('common.flight', 2) }}</h2> <h2>{{ $title ?? trans_choice('common.flight', 2) }}</h2>
@@ -12,12 +12,12 @@
@include('flights.nav') @include('flights.nav')
@include('flights.search') @include('flights.search')
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-12 text-center"> <div class="col-12 text-center">
{{ $flights->links('pagination.default') }} {{ $flights->links('pagination.default') }}
</div> </div>
</div> </div>
@endsection @endsection
@include('flights.scripts') @include('flights.scripts')
@@ -7,11 +7,11 @@
</div> </div>
@section('scripts') @section('scripts')
<script type="text/javascript"> <script type="text/javascript">
phpvms.map.render_route_map({ phpvms.map.render_route_map({
route_points: {!! json_encode($map_features['route_points']) !!}, route_points: {!! json_encode($map_features['route_points']) !!},
planned_route_line: {!! json_encode($map_features['planned_route_line']) !!}, planned_route_line: {!! json_encode($map_features['planned_route_line']) !!},
metar_wms: {!! json_encode(config('map.metar_wms')) !!}, metar_wms: {!! json_encode(config('map.metar_wms')) !!},
}); });
</script> </script>
@endsection @endsection
@@ -1,6 +1,6 @@
@section('scripts') @section('scripts')
<script> <script>
$(document).ready(function () { $(document).ready(function () {
$("button.save_flight").click(async function (e) { $("button.save_flight").click(async function (e) {
e.preventDefault(); e.preventDefault();
@@ -22,6 +22,6 @@ $(document).ready(function () {
alert('@lang("flights.bidremoved")'); alert('@lang("flights.bidremoved")');
} }
}); });
}); });
</script> </script>
@endsection @endsection
@@ -2,7 +2,7 @@
@section('title', trans_choice('common.flight', 1).' '.$flight->ident) @section('title', trans_choice('common.flight', 1).' '.$flight->ident)
@section('content') @section('content')
<div class="row"> <div class="row">
<div class="col-8"> <div class="col-8">
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
@@ -69,18 +69,18 @@
{{ Widget::Weather([ {{ Widget::Weather([
'icao' => $flight->dpt_airport_id, 'icao' => $flight->dpt_airport_id,
]) }} ]) }}
<br /> <br/>
<h5>{{$flight->arr_airport_id}} @lang('common.metar')</h5> <h5>{{$flight->arr_airport_id}} @lang('common.metar')</h5>
{{ Widget::Weather([ {{ Widget::Weather([
'icao' => $flight->arr_airport_id, 'icao' => $flight->arr_airport_id,
]) }} ]) }}
@if ($flight->alt_airport_id) @if ($flight->alt_airport_id)
<br /> <br/>
<h5>{{$flight->alt_airport_id}} @lang('common.metar')</h5> <h5>{{$flight->alt_airport_id}} @lang('common.metar')</h5>
{{ Widget::Weather([ {{ Widget::Weather([
'icao' => $flight->alt_airport_id, 'icao' => $flight->alt_airport_id,
]) }} ]) }}
@endif @endif
</div> </div>
</div> </div>
@endsection @endsection
@@ -37,7 +37,8 @@
</div> </div>
</div> </div>
<div class="footer text-center"> <div class="footer text-center">
<a href="{{ route('frontend.profile.show', [$user->id]) }}" class="btn btn-neutral btn-sm">@lang('common.profile')</a> <a href="{{ route('frontend.profile.show', [$user->id]) }}"
class="btn btn-neutral btn-sm">@lang('common.profile')</a>
</div> </div>
</div> </div>
@endforeach @endforeach
@@ -1,22 +1,22 @@
<?php <?php
if (! empty($greeting)) { if(!empty($greeting)) {
echo $greeting, "\n\n"; echo $greeting, "\n\n";
} else { } else {
echo $level == 'error' ? __('common.whoops').'!' : __('common.hello').',', "\n\n"; echo $level == 'error' ? __('common.whoops').'!' : __('common.hello').',', "\n\n";
} }
if (! empty($introLines)) { if(!empty($introLines)) {
echo implode("\n", $introLines), "\n\n"; echo implode("\n", $introLines), "\n\n";
} }
if (isset($actionText)) { if(isset($actionText)) {
echo "{$actionText}: {$actionUrl}", "\n\n"; echo "{$actionText}: {$actionUrl}", "\n\n";
} }
if (! empty($outroLines)) { if(!empty($outroLines)) {
echo implode("\n", $outroLines), "\n\n"; echo implode("\n", $outroLines), "\n\n";
} }
echo __('common.regards).',', "\n"; echo __('common.regards).', ', "\n";
echo config('app.name'), "\n"; echo config('app.name'), "\n";
@@ -6,7 +6,7 @@
<li class="page-item"><a class="page-link" href="{{ $paginator->previousPageUrl() }}" rel="prev">&laquo;</a></li> <li class="page-item"><a class="page-link" href="{{ $paginator->previousPageUrl() }}" rel="prev">&laquo;</a></li>
@endif @endif
<!-- Pagination Elements --> <!-- Pagination Elements -->
@foreach ($elements as $element) @foreach ($elements as $element)
<!-- "Three Dots" Separator --> <!-- "Three Dots" Separator -->
@if (is_string($element)) @if (is_string($element))
@@ -25,7 +25,7 @@
@endif @endif
@endforeach @endforeach
<!-- Next Page Link --> <!-- Next Page Link -->
@if ($paginator->hasMorePages()) @if ($paginator->hasMorePages())
<li class="page-item"><a class="page-link" href="{{ $paginator->nextPageUrl() }}" rel="next">&raquo;</a></li> <li class="page-item"><a class="page-link" href="{{ $paginator->nextPageUrl() }}" rel="next">&raquo;</a></li>
@else @else
@@ -6,7 +6,7 @@
<li class="page-item"><a class="page-link" href="{{ $paginator->previousPageUrl() }}" rel="prev">&laquo;</a></li> <li class="page-item"><a class="page-link" href="{{ $paginator->previousPageUrl() }}" rel="prev">&laquo;</a></li>
@endif @endif
<!-- Next Page Link --> <!-- Next Page Link -->
@if ($paginator->hasMorePages()) @if ($paginator->hasMorePages())
<li class="page-item"><a class="page-link" href="{{ $paginator->nextPageUrl() }}" rel="next">&raquo;</a></li> <li class="page-item"><a class="page-link" href="{{ $paginator->nextPageUrl() }}" rel="next">&raquo;</a></li>
@else @else
@@ -6,7 +6,7 @@
<li><a href="{{ $paginator->previousPageUrl() }}" rel="prev">&laquo;</a></li> <li><a href="{{ $paginator->previousPageUrl() }}" rel="prev">&laquo;</a></li>
@endif @endif
<!-- Next Page Link --> <!-- Next Page Link -->
@if ($paginator->hasMorePages()) @if ($paginator->hasMorePages())
<li><a href="{{ $paginator->nextPageUrl() }}" rel="next">&raquo;</a></li> <li><a href="{{ $paginator->nextPageUrl() }}" rel="next">&raquo;</a></li>
@else @else
@@ -2,7 +2,7 @@
@section('title', trans_choice('common.pirep', 2)) @section('title', trans_choice('common.pirep', 2))
@section('content') @section('content')
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div style="float:right;"> <div style="float:right;">
<a class="btn btn-info pull-right btn-lg" <a class="btn btn-info pull-right btn-lg"
@@ -13,11 +13,11 @@
@include('flash::message') @include('flash::message')
@include('pireps.table') @include('pireps.table')
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-12 text-center"> <div class="col-12 text-center">
{{ $pireps->links('pagination.default') }} {{ $pireps->links('pagination.default') }}
</div> </div>
</div> </div>
@endsection @endsection
@@ -7,14 +7,14 @@
</div> </div>
@section('scripts') @section('scripts')
<script type="text/javascript"> <script type="text/javascript">
phpvms.map.render_route_map({ phpvms.map.render_route_map({
pirep_uri: '{!! url('/api/pireps/'.$pirep->id.'/acars/geojson') !!}', pirep_uri: '{!! url('/api/pireps/'.$pirep->id.'/acars/geojson') !!}',
route_points: {!! json_encode($map_features['planned_rte_points']) !!}, route_points: {!! json_encode($map_features['planned_rte_points']) !!},
planned_route_line: {!! json_encode($map_features['planned_rte_line']) !!}, planned_route_line: {!! json_encode($map_features['planned_rte_line']) !!},
actual_route_line: {!! json_encode($map_features['actual_route_line']) !!}, actual_route_line: {!! json_encode($map_features['actual_route_line']) !!},
actual_route_points: {!! json_encode($map_features['actual_route_points']) !!}, actual_route_points: {!! json_encode($map_features['actual_route_points']) !!},
aircraft_icon: '{!! public_asset('/assets/img/acars/aircraft.png') !!}', aircraft_icon: '{!! public_asset('/assets/img/acars/aircraft.png') !!}',
}); });
</script> </script>
@endsection @endsection
@@ -3,7 +3,8 @@
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<p class="float-right"> <p class="float-right">
<a href="{{ route('frontend.pireps.edit', [$pirep->id]) }}" class="btn btn-sm btn-info">@lang('common.edit')</a> <a href="{{ route('frontend.pireps.edit', [$pirep->id]) }}"
class="btn btn-sm btn-info">@lang('common.edit')</a>
</p> </p>
<h5> <h5>
<a href="{{ route('frontend.pireps.show', [$pirep->id]) }}"> <a href="{{ route('frontend.pireps.show', [$pirep->id]) }}">
@@ -45,7 +46,8 @@
<tr> <tr>
<td nowrap><span class="title">@lang('common.aircraft')&nbsp;</span></td> <td nowrap><span class="title">@lang('common.aircraft')&nbsp;</span></td>
<td>{{ $pirep->aircraft->name }} <td>{{ $pirep->aircraft->name }}
({{ $pirep->aircraft->registration }})</td> ({{ $pirep->aircraft->registration }})
</td>
</tr> </tr>
@if($pirep->level) @if($pirep->level)
<tr> <tr>
@@ -63,4 +65,4 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>

Some files were not shown because too many files have changed in this diff Show More