From 8076c2d8c1b53c2dab31a517421aa1e7fbc34b8f Mon Sep 17 00:00:00 2001 From: Nabeel Shahzad Date: Mon, 12 Mar 2018 17:58:12 -0500 Subject: [PATCH] Fixing XSS vulnerability by using the proper output tags --- .../Installer/Resources/views/app.blade.php | 14 +-- .../views/errors/already-installed.blade.php | 6 +- .../views/flash/check_error.blade.php | 4 +- .../Resources/views/flash/dbtest.blade.php | 4 +- .../Resources/views/flash/message.blade.php | 2 +- .../views/install/index-start.blade.php | 6 +- .../steps/step1-requirements.blade.php | 18 ++-- .../views/install/steps/step2-db.blade.php | 28 +++--- .../install/steps/step2a-db_output.blade.php | 8 +- .../views/install/steps/step3-user.blade.php | 24 ++--- .../install/steps/step3a-completed.blade.php | 8 +- .../views/update/index-start.blade.php | 6 +- .../update/steps/step1-no-update.blade.php | 6 +- .../steps/step1-update-available.blade.php | 6 +- .../steps/step2-migrations-done.blade.php | 8 +- .../Resources/views/admin/index.blade.php | 4 +- .../Sample/Resources/views/index.blade.php | 2 +- .../stubs/modules/views/index-admin.stub | 4 +- resources/stubs/modules/views/index.stub | 2 +- .../views/admin/aircraft/create.blade.php | 4 +- resources/views/admin/aircraft/edit.blade.php | 4 +- .../views/admin/aircraft/expenses.blade.php | 42 ++++---- .../views/admin/aircraft/fields.blade.php | 28 +++--- .../views/admin/aircraft/index.blade.php | 4 +- .../views/admin/aircraft/script.blade.php | 6 +- resources/views/admin/aircraft/show.blade.php | 6 +- .../admin/aircraft/show_fields.blade.php | 14 +-- .../views/admin/aircraft/table.blade.php | 24 ++--- .../views/admin/airlines/create.blade.php | 4 +- resources/views/admin/airlines/edit.blade.php | 4 +- .../views/admin/airlines/fields.blade.php | 30 +++--- .../views/admin/airlines/index.blade.php | 2 +- resources/views/admin/airlines/show.blade.php | 2 +- .../admin/airlines/show_fields.blade.php | 28 +++--- .../views/admin/airlines/table.blade.php | 14 +-- .../views/admin/airports/create.blade.php | 4 +- resources/views/admin/airports/edit.blade.php | 6 +- .../views/admin/airports/expenses.blade.php | 42 ++++---- .../views/admin/airports/fields.blade.php | 48 +++++----- .../views/admin/airports/index.blade.php | 2 +- .../views/admin/airports/script.blade.php | 8 +- .../views/admin/airports/search.blade.php | 10 +- resources/views/admin/airports/show.blade.php | 12 +-- .../admin/airports/show_fields.blade.php | 4 +- .../views/admin/airports/table.blade.php | 22 ++--- resources/views/admin/app.blade.php | 16 ++-- .../views/admin/components/infobox.blade.php | 2 +- .../views/admin/dashboard/news.blade.php | 36 +++---- .../views/admin/expenses/create.blade.php | 4 +- resources/views/admin/expenses/edit.blade.php | 4 +- .../views/admin/expenses/fields.blade.php | 32 +++---- .../views/admin/expenses/index.blade.php | 2 +- .../views/admin/expenses/table.blade.php | 22 ++--- resources/views/admin/fares/create.blade.php | 4 +- resources/views/admin/fares/edit.blade.php | 4 +- resources/views/admin/fares/fields.blade.php | 34 +++---- resources/views/admin/fares/index.blade.php | 2 +- .../views/admin/fares/show_fields.blade.php | 24 ++--- resources/views/admin/fares/table.blade.php | 18 ++-- .../views/admin/finances/index.blade.php | 6 +- .../views/admin/finances/table.blade.php | 14 +-- .../views/admin/flash/check_error.blade.php | 4 +- resources/views/admin/flash/message.blade.php | 2 +- .../views/admin/flights/create.blade.php | 4 +- resources/views/admin/flights/edit.blade.php | 4 +- resources/views/admin/flights/fares.blade.php | 36 +++---- .../views/admin/flights/fields.blade.php | 78 +++++++-------- .../admin/flights/flight_fields.blade.php | 34 +++---- resources/views/admin/flights/index.blade.php | 2 +- .../views/admin/flights/scripts.blade.php | 4 +- .../views/admin/flights/search.blade.php | 20 ++-- resources/views/admin/flights/show.blade.php | 4 +- .../views/admin/flights/show_fields.blade.php | 40 ++++---- .../views/admin/flights/subfleets.blade.php | 30 +++--- resources/views/admin/flights/table.blade.php | 28 +++--- resources/views/admin/menu.blade.php | 26 ++--- .../views/admin/pirepfields/create.blade.php | 4 +- .../views/admin/pirepfields/edit.blade.php | 4 +- .../views/admin/pirepfields/fields.blade.php | 14 +-- .../views/admin/pirepfields/index.blade.php | 2 +- .../views/admin/pirepfields/show.blade.php | 4 +- .../admin/pirepfields/show_fields.blade.php | 20 ++-- .../views/admin/pirepfields/table.blade.php | 12 +-- .../views/admin/pireps/actions.blade.php | 18 ++-- .../views/admin/pireps/comments.blade.php | 32 +++---- resources/views/admin/pireps/create.blade.php | 4 +- resources/views/admin/pireps/edit.blade.php | 10 +- resources/views/admin/pireps/fares.blade.php | 10 +- .../views/admin/pireps/field_values.blade.php | 8 +- resources/views/admin/pireps/fields.blade.php | 96 +++++++++---------- .../views/admin/pireps/flight_log.blade.php | 4 +- resources/views/admin/pireps/index.blade.php | 6 +- .../views/admin/pireps/pirep_card.blade.php | 28 +++--- .../views/admin/pireps/scripts.blade.php | 4 +- .../views/admin/pireps/show_fields.blade.php | 34 +++---- .../views/admin/pireps/transactions.blade.php | 12 +-- resources/views/admin/ranks/create.blade.php | 4 +- resources/views/admin/ranks/edit.blade.php | 4 +- resources/views/admin/ranks/fields.blade.php | 40 ++++---- resources/views/admin/ranks/index.blade.php | 2 +- resources/views/admin/ranks/scripts.blade.php | 2 +- resources/views/admin/ranks/show.blade.php | 2 +- .../views/admin/ranks/show_fields.blade.php | 32 +++---- .../views/admin/ranks/subfleets.blade.php | 36 +++---- resources/views/admin/ranks/table.blade.php | 12 +-- .../views/admin/settings/table.blade.php | 26 ++--- resources/views/admin/sidebar.blade.php | 4 +- .../views/admin/subfleets/create.blade.php | 4 +- .../views/admin/subfleets/edit.blade.php | 4 +- .../views/admin/subfleets/expenses.blade.php | 42 ++++---- .../views/admin/subfleets/fares.blade.php | 42 ++++---- .../views/admin/subfleets/fields.blade.php | 24 ++--- .../views/admin/subfleets/index.blade.php | 2 +- .../views/admin/subfleets/ranks.blade.php | 38 ++++---- .../views/admin/subfleets/script.blade.php | 10 +- .../admin/subfleets/show_fields.blade.php | 20 ++-- .../views/admin/subfleets/table.blade.php | 18 ++-- resources/views/admin/users/create.blade.php | 4 +- resources/views/admin/users/edit.blade.php | 4 +- resources/views/admin/users/fields.blade.php | 64 ++++++------- resources/views/admin/users/index.blade.php | 4 +- resources/views/admin/users/search.blade.php | 24 ++--- resources/views/admin/users/table.blade.php | 20 ++-- .../views/emails/admin/registered.blade.php | 6 +- .../emails/user/new_login_details.blade.php | 4 +- resources/views/emails/user/pending.blade.php | 2 +- .../views/emails/user/registered.blade.php | 2 +- .../views/emails/user/rejected.blade.php | 2 +- resources/views/layouts/default/app.blade.php | 20 ++-- .../layouts/default/auth/layout.blade.php | 8 +- .../layouts/default/auth/login.blade.php | 2 +- .../layouts/default/auth/register.blade.php | 18 ++-- .../views/layouts/default/auth/toc.blade.php | 14 +-- .../layouts/default/dashboard/index.blade.php | 8 +- .../layouts/default/flash/message.blade.php | 2 +- .../layouts/default/flash/modal.blade.php | 2 +- .../layouts/default/flights/map.blade.php | 4 +- .../layouts/default/flights/scripts.blade.php | 2 +- .../layouts/default/flights/search.blade.php | 14 +-- .../layouts/default/flights/show.blade.php | 14 +-- .../layouts/default/flights/table.blade.php | 16 ++-- .../views/layouts/default/home.blade.php | 8 +- resources/views/layouts/default/nav.blade.php | 32 +++---- .../layouts/default/pireps/create.blade.php | 4 +- .../layouts/default/pireps/edit.blade.php | 4 +- .../layouts/default/pireps/fares.blade.php | 8 +- .../layouts/default/pireps/fields.blade.php | 80 ++++++++-------- .../layouts/default/pireps/index.blade.php | 2 +- .../layouts/default/pireps/map.blade.php | 8 +- .../default/pireps/pirep_card.blade.php | 22 ++--- .../layouts/default/pireps/scripts.blade.php | 4 +- .../layouts/default/pireps/show.blade.php | 30 +++--- .../layouts/default/profile/edit.blade.php | 4 +- .../layouts/default/profile/fields.blade.php | 18 ++-- .../layouts/default/profile/index.blade.php | 30 +++--- .../layouts/default/users/table.blade.php | 18 ++-- .../default/widgets/latest_news.blade.php | 8 +- .../default/widgets/latest_pilots.blade.php | 4 +- .../default/widgets/latest_pireps.blade.php | 8 +- .../default/widgets/live_map.blade.php | 16 ++-- .../system/errors/database_error.blade.php | 10 +- .../system/errors/not_installed.blade.php | 12 +-- resources/views/system/scripts.blade.php | 2 +- .../views/vendor/datatables/print.blade.php | 6 +- .../vendor/mail/markdown/layout.blade.php | 8 +- 165 files changed, 1187 insertions(+), 1187 deletions(-) diff --git a/modules/Installer/Resources/views/app.blade.php b/modules/Installer/Resources/views/app.blade.php index e148da6c..30ff3501 100644 --- a/modules/Installer/Resources/views/app.blade.php +++ b/modules/Installer/Resources/views/app.blade.php @@ -14,10 +14,10 @@ - - - - + + + + {{----}}

- - + +

@@ -69,7 +69,7 @@ {{----}} - + {{----}} {{----}} diff --git a/modules/Installer/Resources/views/errors/already-installed.blade.php b/modules/Installer/Resources/views/errors/already-installed.blade.php index 5977847d..0952813f 100644 --- a/modules/Installer/Resources/views/errors/already-installed.blade.php +++ b/modules/Installer/Resources/views/errors/already-installed.blade.php @@ -3,9 +3,9 @@ @section('content')

phpVMS already installed!

phpVMS has already been installed! Please remove the modules/Installer folder.

- {!! Form::open(['url' => '/', 'method' => 'get']) !!} + {{ Form::open(['url' => '/', 'method' => 'get']) }}

- {!! Form::submit('Go to your site >>', ['class' => 'btn btn-success']) !!} + {{ Form::submit('Go to your site >>', ['class' => 'btn btn-success']) }}

- {!! Form::close() !!} + {{ Form::close() }} @endsection diff --git a/modules/Installer/Resources/views/flash/check_error.blade.php b/modules/Installer/Resources/views/flash/check_error.blade.php index ac154f9c..cc67ffc0 100644 --- a/modules/Installer/Resources/views/flash/check_error.blade.php +++ b/modules/Installer/Resources/views/flash/check_error.blade.php @@ -1,6 +1,6 @@ @if($errors->has($field)) -

{!! $errors->first($field); !!}

+

{{ $errors->first($field) }}

{{----}} @endif diff --git a/modules/Installer/Resources/views/flash/dbtest.blade.php b/modules/Installer/Resources/views/flash/dbtest.blade.php index 710dbec1..70a9694b 100644 --- a/modules/Installer/Resources/views/flash/dbtest.blade.php +++ b/modules/Installer/Resources/views/flash/dbtest.blade.php @@ -1,8 +1,8 @@ - @endforeach diff --git a/modules/Installer/Resources/views/install/index-start.blade.php b/modules/Installer/Resources/views/install/index-start.blade.php index e657f9f6..d1be531c 100644 --- a/modules/Installer/Resources/views/install/index-start.blade.php +++ b/modules/Installer/Resources/views/install/index-start.blade.php @@ -4,9 +4,9 @@ @section('content')

phpvms installer

Press continue to start

- {!! Form::open(['route' => 'installer.step1', 'method' => 'post']) !!} + {{ Form::open(['route' => 'installer.step1', 'method' => 'post']) }}

- {!! Form::submit('Start >>', ['class' => 'btn btn-success']) !!} + {{ Form::submit('Start >>', ['class' => 'btn btn-success']) }}

- {!! Form::close() !!} + {{ Form::close() }} @endsection diff --git a/modules/Installer/Resources/views/install/steps/step1-requirements.blade.php b/modules/Installer/Resources/views/install/steps/step1-requirements.blade.php index d84f6a97..55de0ad7 100644 --- a/modules/Installer/Resources/views/install/steps/step1-requirements.blade.php +++ b/modules/Installer/Resources/views/install/steps/step1-requirements.blade.php @@ -3,11 +3,11 @@ @section('content')
- {!! Form::open(['route' => 'installer.step2', 'method' => 'GET']) !!} + {{ Form::open(['route' => 'installer.step2', 'method' => 'GET']) }} - + @foreach($extensions as $ext) - + @foreach($directories as $dir) - +

php version

PHP Version: {!! $php['version'] !!}PHP Version: {{ $php['version'] }} @if($php['passed'] === true) OK! @@ -20,7 +20,7 @@

php extensions

{!! $ext['ext'] !!}{{ $ext['ext'] }} @if($ext['passed'] === true) OK! @@ -34,7 +34,7 @@

directory permissions

{!! $dir['dir'] !!}{{ $dir['dir'] }} @if($dir['passed'] === true) OK! @@ -47,12 +47,12 @@
@if($passed === true)

- {!! Form::submit('Database Setup >>', ['class' => 'btn btn-success']) !!} + {{ Form::submit('Database Setup >>', ['class' => 'btn btn-success']) }}

@endif - {{--{!! $php_version !!} - {!! $extensions !!} - {!! $passed !!}--}} - {!! Form::close() !!} + {{--{{ $php_version }} + {{ $extensions }} + {{ $passed }}--}} + {{ Form::close() }}
@endsection diff --git a/modules/Installer/Resources/views/install/steps/step2-db.blade.php b/modules/Installer/Resources/views/install/steps/step2-db.blade.php index 04deaee8..2f714c65 100644 --- a/modules/Installer/Resources/views/install/steps/step2-db.blade.php +++ b/modules/Installer/Resources/views/install/steps/step2-db.blade.php @@ -2,7 +2,7 @@ @section('title', 'Database Setup') @section('content')
- {!! Form::open(['route' => 'installer.envsetup', 'method' => 'POST']) !!} + {{ Form::open(['route' => 'installer.envsetup', 'method' => 'POST']) }} @@ -13,7 +13,7 @@ @@ -22,7 +22,7 @@ @@ -35,7 +35,7 @@ @@ -45,7 +45,7 @@ @@ -54,7 +54,7 @@ @@ -63,7 +63,7 @@ @@ -72,7 +72,7 @@ @@ -81,14 +81,14 @@ @@ -101,7 +101,7 @@ @@ -110,9 +110,9 @@
Site Name
- {!! Form::input('text', 'site_name', 'phpvms', ['class' => 'form-control']) !!} + {{ Form::input('text', 'site_name', 'phpvms', ['class' => 'form-control']) }}
Site URL
- {!! Form::input('text', 'site_url', Request::root(), ['class' => 'form-control']) !!} + {{ Form::input('text', 'site_url', Request::root(), ['class' => 'form-control']) }}

Select Database Type
- {!! Form::select('db_conn', $db_types, null, ['class' => 'form-control', 'id' => 'db_conn']) !!} + {{ Form::select('db_conn', $db_types, null, ['class' => 'form-control', 'id' => 'db_conn']) }}
Database Host
- {!! Form::input('text', 'db_host', '127.0.0.1', ['class' => 'form-control']) !!} + {{ Form::input('text', 'db_host', '127.0.0.1', ['class' => 'form-control']) }}
Database Port
- {!! Form::input('text', 'db_port', '3306', ['class' => 'form-control']) !!} + {{ Form::input('text', 'db_port', '3306', ['class' => 'form-control']) }}
Database Name
- {!! Form::input('text', 'db_name', 'phpvms', ['class' => 'form-control']) !!} + {{ Form::input('text', 'db_name', 'phpvms', ['class' => 'form-control']) }}
Database User
- {!! Form::input('text', 'db_user', null, ['class' => 'form-control']) !!} + {{ Form::input('text', 'db_user', null, ['class' => 'form-control']) }}
Database Password
- {!! Form::input('text', 'db_pass', null, ['class' => 'form-control']) !!} + {{ Form::input('text', 'db_pass', null, ['class' => 'form-control']) }}
- {!! Form::submit('Test Database Credentials', ['class' => 'btn btn-info', 'id' => 'dbtest_button']) !!} + {{ Form::submit('Test Database Credentials', ['class' => 'btn btn-info', 'id' => 'dbtest_button']) }}
Database Prefix
- {!! Form::input('text', 'db_prefix', '', ['class' => 'form-control']) !!} + {{ Form::input('text', 'db_prefix', '', ['class' => 'form-control']) }}

Set this if you're sharing the database with another application.

- {!! Form::submit('Setup Database >>', ['class' => 'btn btn-success']) !!} + {{ Form::submit('Setup Database >>', ['class' => 'btn btn-success']) }}

- {!! Form::close() !!} + {{ Form::close() }}
@endsection @@ -143,7 +143,7 @@ $(document).ready(function() { db_pass: $("input[name=db_pass]").val(), }; - $.post("{!! route('installer.dbtest') !!}", opts, function(data) { + $.post("{{ route('installer.dbtest') }}", opts, function(data) { $("#dbtest").html(data); }) }) diff --git a/modules/Installer/Resources/views/install/steps/step2a-db_output.blade.php b/modules/Installer/Resources/views/install/steps/step2a-db_output.blade.php index 0daf3405..7a0d8eac 100644 --- a/modules/Installer/Resources/views/install/steps/step2a-db_output.blade.php +++ b/modules/Installer/Resources/views/install/steps/step2a-db_output.blade.php @@ -2,18 +2,18 @@ @section('title', 'Database Setup Completed') @section('content')
- {!! Form::open(['route' => 'installer.step3', 'method' => 'GET']) !!} + {{ Form::open(['route' => 'installer.step3', 'method' => 'GET']) }} 
         
         {{----}}
-        {!! $console_output !!}
+        {{ $console_output }}

- {!! Form::submit('Continue >>', ['class' => 'btn btn-success']) !!} + {{ Form::submit('Continue >>', ['class' => 'btn btn-success']) }}

- {!! Form::close() !!} + {{ Form::close() }}
@endsection diff --git a/modules/Installer/Resources/views/install/steps/step3-user.blade.php b/modules/Installer/Resources/views/install/steps/step3-user.blade.php index 035e1340..643c3189 100644 --- a/modules/Installer/Resources/views/install/steps/step3-user.blade.php +++ b/modules/Installer/Resources/views/install/steps/step3-user.blade.php @@ -4,7 +4,7 @@ @section('content')
- {!! Form::open(['route' => 'installer.usersetup', 'method' => 'POST']) !!} + {{ Form::open(['route' => 'installer.usersetup', 'method' => 'POST']) }} @@ -15,7 +15,7 @@ @@ -25,7 +25,7 @@ @@ -35,7 +35,7 @@ @@ -49,7 +49,7 @@ @@ -59,7 +59,7 @@ @@ -68,7 +68,7 @@ @@ -76,7 +76,7 @@ @@ -90,8 +90,8 @@

Airline ICAO
- {!! Form::input('text', 'airline_icao', null, ['class' => 'form-control']) !!} + {{ Form::input('text', 'airline_icao', null, ['class' => 'form-control']) }} @include('installer::flash/check_error', ['field' => 'airline_icao'])

Airline Name
- {!! Form::input('text', 'airline_name', null, ['class' => 'form-control']) !!} + {{ Form::input('text', 'airline_name', null, ['class' => 'form-control']) }} @include('installer::flash/check_error', ['field' => 'airline_name'])

Airline Country
- {!! Form::select('airline_country', $countries, null, ['class' => 'form-control select2' ]); !!} + {{ Form::select('airline_country', $countries, null, ['class' => 'form-control select2' ]) }} @include('installer::flash/check_error', ['field' => 'airline_country'])

Name
- {!! Form::input('text', 'name', null, ['class' => 'form-control']) !!} + {{ Form::input('text', 'name', null, ['class' => 'form-control']) }} @include('installer::flash/check_error', ['field' => 'name'])

Email
- {!! Form::input('text', 'email', null, ['class' => 'form-control']) !!} + {{ Form::input('text', 'email', null, ['class' => 'form-control']) }} @include('installer::flash/check_error', ['field' => 'email'])

Password

 - {!! Form::password('password', ['class' => 'form-control']) !!} + {{ Form::password('password', ['class' => 'form-control']) }} @include('installer::flash/check_error', ['field' => 'password'])

Password Confirm

 - {!! Form::password('password_confirmation', ['class' => 'form-control']) !!} + {{ Form::password('password_confirmation', ['class' => 'form-control']) }} @include('installer::flash/check_error', ['field' => 'password_confirmation'])

Analytics
- {!! Form::hidden('analytics', 0) !!} - {!! Form::checkbox('analytics', 1, true, ['class' => 'form-control']) !!} + {{ Form::hidden('analytics', 0) }} + {{ Form::checkbox('analytics', 1, true, ['class' => 'form-control']) }}

Allows collection of analytics. They won't identify you, and helps us to track @@ -105,9 +105,9 @@

- {!! Form::submit('Complete Setup >>', ['class' => 'btn btn-success']) !!} + {{ Form::submit('Complete Setup >>', ['class' => 'btn btn-success']) }}

- {!! Form::close() !!} + {{ Form::close() }}
diff --git a/modules/Installer/Resources/views/install/steps/step3a-completed.blade.php b/modules/Installer/Resources/views/install/steps/step3a-completed.blade.php index 8a20f19f..5a425cbd 100644 --- a/modules/Installer/Resources/views/install/steps/step3a-completed.blade.php +++ b/modules/Installer/Resources/views/install/steps/step3a-completed.blade.php @@ -3,7 +3,7 @@ @section('content')
- {!! Form::open(['route' => 'installer.complete', 'method' => 'GET']) !!} + {{ Form::open(['route' => 'installer.complete', 'method' => 'GET']) }}

Installer Completed!

@@ -11,10 +11,10 @@

Click the button to proceed to the login screen!

- {!! Form::submit('Install Complete! Continue to Log-In >>', + {{ Form::submit('Install Complete! Continue to Log-In >>', ['class' => 'btn btn-success']) - !!} + }}

- {!! Form::close() !!} + {{ Form::close() }}
@endsection diff --git a/modules/Installer/Resources/views/update/index-start.blade.php b/modules/Installer/Resources/views/update/index-start.blade.php index f99964d4..fefb0b7d 100644 --- a/modules/Installer/Resources/views/update/index-start.blade.php +++ b/modules/Installer/Resources/views/update/index-start.blade.php @@ -4,9 +4,9 @@ @section('content')

phpvms updater

Press continue to check if there are any updates available.

- {!! Form::open(['route' => 'update.step1', 'method' => 'post']) !!} + {{ Form::open(['route' => 'update.step1', 'method' => 'post']) }}

- {!! Form::submit('Start >>', ['class' => 'btn btn-success']) !!} + {{ Form::submit('Start >>', ['class' => 'btn btn-success']) }}

- {!! Form::close() !!} + {{ Form::close() }} @endsection diff --git a/modules/Installer/Resources/views/update/steps/step1-no-update.blade.php b/modules/Installer/Resources/views/update/steps/step1-no-update.blade.php index 64384d60..fd636611 100644 --- a/modules/Installer/Resources/views/update/steps/step1-no-update.blade.php +++ b/modules/Installer/Resources/views/update/steps/step1-no-update.blade.php @@ -4,10 +4,10 @@ @section('content')

phpvms updater

It seems like you're up to date!

- {!! Form::open(['route' => 'update.complete', 'method' => 'GET']) !!} + {{ Form::open(['route' => 'update.complete', 'method' => 'GET']) }}

- {!! Form::submit('Complete >>', ['class' => 'btn btn-success']) !!} + {{ Form::submit('Complete >>', ['class' => 'btn btn-success']) }}

- {!! Form::close() !!} + {{ Form::close() }} @endsection diff --git a/modules/Installer/Resources/views/update/steps/step1-update-available.blade.php b/modules/Installer/Resources/views/update/steps/step1-update-available.blade.php index 171e500b..0dc84d2f 100644 --- a/modules/Installer/Resources/views/update/steps/step1-update-available.blade.php +++ b/modules/Installer/Resources/views/update/steps/step1-update-available.blade.php @@ -4,9 +4,9 @@ @section('content')

phpvms updater

Updates have been found, click run to complete the update!.

- {!! Form::open(['route' => 'update.run_migrations', 'method' => 'post']) !!} + {{ Form::open(['route' => 'update.run_migrations', 'method' => 'post']) }}

- {!! Form::submit('Run >>', ['class' => 'btn btn-success']) !!} + {{ Form::submit('Run >>', ['class' => 'btn btn-success']) }}

- {!! Form::close() !!} + {{ Form::close() }} @endsection diff --git a/modules/Installer/Resources/views/update/steps/step2-migrations-done.blade.php b/modules/Installer/Resources/views/update/steps/step2-migrations-done.blade.php index f003c882..540705d4 100644 --- a/modules/Installer/Resources/views/update/steps/step2-migrations-done.blade.php +++ b/modules/Installer/Resources/views/update/steps/step2-migrations-done.blade.php @@ -2,17 +2,17 @@ @section('title', 'Update Completed') @section('content')
- {!! Form::open(['route' => 'update.complete', 'method' => 'GET']) !!} + {{ Form::open(['route' => 'update.complete', 'method' => 'GET']) }} 
         
-            {!! $console_output !!}
+            {{ $console_output }}

- {!! Form::submit('Complete >>', ['class' => 'btn btn-success']) !!} + {{ Form::submit('Complete >>', ['class' => 'btn btn-success']) }}

- {!! Form::close() !!} + {{ Form::close() }}
@endsection diff --git a/modules/Sample/Resources/views/admin/index.blade.php b/modules/Sample/Resources/views/admin/index.blade.php index ab445b21..50b536cd 100644 --- a/modules/Sample/Resources/views/admin/index.blade.php +++ b/modules/Sample/Resources/views/admin/index.blade.php @@ -3,7 +3,7 @@ @section('title', 'Sample') @section('actions')
  • - + Add New
    • @@ -12,7 +12,7 @@

    Admin Scaffold!

    -

    This view is loaded from module: {!! config('sample.name') !!}

    +

    This view is loaded from module: {{ config('sample.name') }}

    @endsection diff --git a/modules/Sample/Resources/views/index.blade.php b/modules/Sample/Resources/views/index.blade.php index 6198e2fb..a6ef647a 100644 --- a/modules/Sample/Resources/views/index.blade.php +++ b/modules/Sample/Resources/views/index.blade.php @@ -4,6 +4,6 @@

    Hello World

    - This view is loaded from module: {!! config('sample.name') !!} + This view is loaded from module: {{ config('sample.name') }}

    @endsection diff --git a/resources/stubs/modules/views/index-admin.stub b/resources/stubs/modules/views/index-admin.stub index 87155e77..49de37ed 100644 --- a/resources/stubs/modules/views/index-admin.stub +++ b/resources/stubs/modules/views/index-admin.stub @@ -3,7 +3,7 @@ @section('title', '$STUDLY_NAME$') @section('actions')
  • - + Add New
    • @@ -12,7 +12,7 @@

    Admin Scaffold!

    -

    This view is loaded from module: {!! config('$LOWER_NAME$.name') !!}

    +

    This view is loaded from module: {{ config('$LOWER_NAME$.name') }}

    @endsection diff --git a/resources/stubs/modules/views/index.stub b/resources/stubs/modules/views/index.stub index a8af9394..9408fbc9 100644 --- a/resources/stubs/modules/views/index.stub +++ b/resources/stubs/modules/views/index.stub @@ -4,6 +4,6 @@

    Hello World

    - This view is loaded from module: {!! config('$LOWER_NAME$.name') !!} + This view is loaded from module: {{ config('$LOWER_NAME$.name') }}

    @endsection diff --git a/resources/views/admin/aircraft/create.blade.php b/resources/views/admin/aircraft/create.blade.php index 27e8680b..268ba762 100644 --- a/resources/views/admin/aircraft/create.blade.php +++ b/resources/views/admin/aircraft/create.blade.php @@ -8,9 +8,9 @@ You must add a subfleet before you can add an aircraft!

    @else - {!! Form::open(['route' => 'admin.aircraft.store']) !!} + {{ Form::open(['route' => 'admin.aircraft.store']) }} @include('admin.aircraft.fields') - {!! Form::close() !!} + {{ Form::close() }} @endif diff --git a/resources/views/admin/aircraft/edit.blade.php b/resources/views/admin/aircraft/edit.blade.php index dcdc2179..bc3ab534 100644 --- a/resources/views/admin/aircraft/edit.blade.php +++ b/resources/views/admin/aircraft/edit.blade.php @@ -3,9 +3,9 @@ @section('content')
    - {!! Form::model($aircraft, ['route' => ['admin.aircraft.update', $aircraft->id], 'method' => 'patch']) !!} + {{ Form::model($aircraft, ['route' => ['admin.aircraft.update', $aircraft->id], 'method' => 'patch']) }} @include('admin.aircraft.fields') - {!! Form::close() !!} + {{ Form::close() }}
    diff --git a/resources/views/admin/aircraft/expenses.blade.php b/resources/views/admin/aircraft/expenses.blade.php index 0b83d41a..e6770734 100644 --- a/resources/views/admin/aircraft/expenses.blade.php +++ b/resources/views/admin/aircraft/expenses.blade.php @@ -11,7 +11,7 @@ @if(count($aircraft->expenses)) Name - Cost {!! currency(config('phpvms.currency')) !!} + Cost {{ currency(config('phpvms.currency')) }} Type @@ -22,33 +22,33 @@

    - {!! $expense->name !!} + {{ $expense->name }}

    - {!! $expense->amount !!} + {{ $expense->amount }}

    {!! \App\Models\Enums\ExpenseType::label($expense->type) !!} + data-pk="{{ $expense->id }}" + data-name="type">{{ \App\Models\Enums\ExpenseType::label($expense->type) }}

    - {!! Form::open(['url' => url('/admin/aircraft/'.$aircraft->id.'/expenses'), - 'method' => 'delete', 'class' => 'modify_expense form-inline']) !!} - {!! Form::hidden('expense_id', $expense->id) !!} - {!! Form::button('', ['type' => 'submit', + {{ Form::open(['url' => url('/admin/aircraft/'.$aircraft->id.'/expenses'), + 'method' => 'delete', 'class' => 'modify_expense form-inline']) }} + {{ Form::hidden('expense_id', $expense->id) }} + {{ Form::button('', ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon', 'onclick' => "return confirm('Are you sure?')", - ]) !!} - {!! Form::close() !!} + ]) }} + {{ Form::close() }} @endforeach @@ -58,14 +58,14 @@
    - {!! Form::open(['url' => url('/admin/aircraft/'.$aircraft->id.'/expenses'), - 'method' => 'post', 'class' => 'modify_expense form-inline']) !!} - {!! Form::input('text', 'name', null, ['class' => 'form-control input-sm', 'placeholder' => 'Name']) !!} - {!! Form::number('amount', null, ['class' => 'form-control input-sm', 'placeholder' => 'Amount']) !!} - {!! Form::select('type', \App\Models\Enums\ExpenseType::select(), null, ['class' => 'select2']) !!} - {!! Form::button(' Add', ['type' => 'submit', - 'class' => 'btn btn-success btn-small']) !!} - {!! Form::close() !!} + {{ Form::open(['url' => url('/admin/aircraft/'.$aircraft->id.'/expenses'), + 'method' => 'post', 'class' => 'modify_expense form-inline']) }} + {{ Form::input('text', 'name', null, ['class' => 'form-control input-sm', 'placeholder' => 'Name']) }} + {{ Form::number('amount', null, ['class' => 'form-control input-sm', 'placeholder' => 'Amount']) }} + {{ Form::select('type', \App\Models\Enums\ExpenseType::select(), null, ['class' => 'select2']) }} + {{ Form::button(' Add', ['type' => 'submit', + 'class' => 'btn btn-success btn-small']) }} + {{ Form::close() }}

    {{ $errors->first('name') }}

    {{ $errors->first('amount') }}

    diff --git a/resources/views/admin/aircraft/fields.blade.php b/resources/views/admin/aircraft/fields.blade.php index e7239668..28e33c05 100644 --- a/resources/views/admin/aircraft/fields.blade.php +++ b/resources/views/admin/aircraft/fields.blade.php @@ -1,43 +1,43 @@
    - {!! Form::label('subfleet_id', 'Subfleet:') !!} - {!! Form::select('subfleet_id', $subfleets, null, ['class' => 'form-control select2', 'placeholder' => 'Select Subfleet']) !!} + {{ Form::label('subfleet_id', 'Subfleet:') }} + {{ Form::select('subfleet_id', $subfleets, null, ['class' => 'form-control select2', 'placeholder' => 'Select Subfleet']) }}

    {{ $errors->first('subfleet_id') }}

    - {!! Form::label('name', 'Name:') !!} * - {!! Form::text('name', null, ['class' => 'form-control']) !!} + {{ Form::label('name', 'Name:') }} * + {{ Form::text('name', null, ['class' => 'form-control']) }}

    {{ $errors->first('name') }}

    - {!! Form::label('icao', 'ICAO:') !!} - {!! Form::text('icao', null, ['class' => 'form-control']) !!} + {{ Form::label('icao', 'ICAO:') }} + {{ Form::text('icao', null, ['class' => 'form-control']) }}

    {{ $errors->first('icao') }}

    - {!! Form::label('zfw', 'Zero Fuel Weight:') !!} - {!! Form::text('zfw', null, ['class' => 'form-control']) !!} + {{ Form::label('zfw', 'Zero Fuel Weight:') }} + {{ Form::text('zfw', null, ['class' => 'form-control']) }}

    {{ $errors->first('zfw') }}

    - {!! Form::label('registration', 'Registration:') !!} + {{ Form::label('registration', 'Registration:') }} {{--

    Enter the registration with the country prefix

    --}} - {!! Form::text('registration', null, ['class' => 'form-control']) !!} + {{ Form::text('registration', null, ['class' => 'form-control']) }}

    {{ $errors->first('registration') }}

    - {!! Form::label('status', 'Status:') !!} - {!! Form::select('status', $statuses, null, ['class' => 'form-control select2', 'placeholder' => 'Select Status']) !!} + {{ Form::label('status', 'Status:') }} + {{ Form::select('status', $statuses, null, ['class' => 'form-control select2', 'placeholder' => 'Select Status']) }}

    {{ $errors->first('subfleet_id') }}

    @@ -45,8 +45,8 @@
    - {!! Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) !!} - Cancel + {{ Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) }} + Cancel
    diff --git a/resources/views/admin/aircraft/index.blade.php b/resources/views/admin/aircraft/index.blade.php index 7473604f..53426925 100644 --- a/resources/views/admin/aircraft/index.blade.php +++ b/resources/views/admin/aircraft/index.blade.php @@ -3,12 +3,12 @@ @section('title', 'Aircraft') @section('actions')
  • - + Subfleets
  • - + New Aircraft
    • diff --git a/resources/views/admin/aircraft/script.blade.php b/resources/views/admin/aircraft/script.blade.php index 8e458421..66bb3459 100644 --- a/resources/views/admin/aircraft/script.blade.php +++ b/resources/views/admin/aircraft/script.blade.php @@ -4,7 +4,7 @@ function setEditable() { @if(isset($aircraft)) $('#expenses a.text').editable({ emptytext: '0', - url: '{!! url('/admin/aircraft/'.$aircraft->id.'/expenses') !!}', + url: '{{ url('/admin/aircraft/'.$aircraft->id.'/expenses') }}', title: 'Enter override value', ajaxOptions: {'type': 'put'}, params: function (params) { @@ -19,8 +19,8 @@ function setEditable() { $('#expenses a.dropdown').editable({ type: 'select', emptytext: '0', - source: {!! json_encode(list_to_editable(\App\Models\Enums\ExpenseType::select())) !!}, - url: '{!! url('/admin/aircraft/'.$aircraft->id.'/expenses') !!}', + source: {{ json_encode(list_to_editable(\App\Models\Enums\ExpenseType::select())) }}, + url: '{{ url('/admin/aircraft/'.$aircraft->id.'/expenses') }}', title: 'Enter override value', ajaxOptions: {'type': 'put'}, params: function (params) { diff --git a/resources/views/admin/aircraft/show.blade.php b/resources/views/admin/aircraft/show.blade.php index 75f8df21..a7f0960b 100644 --- a/resources/views/admin/aircraft/show.blade.php +++ b/resources/views/admin/aircraft/show.blade.php @@ -2,9 +2,9 @@ @section('content')
    -

    {!! $aircraft->name !!}

    +

    {{ $aircraft->name }}

    - Edit + Edit

    @@ -22,7 +22,7 @@ $(document).ready(function() { type: 'text', mode: 'inline', emptytext: 'default', - url: '/admin/aircraft/{!! $aircraft->id !!}/fares', + url: '/admin/aircraft/{{ $aircraft->id }}/fares', title: 'Enter override value', ajaxOptions: { 'type': 'put'}, params: function(params) { diff --git a/resources/views/admin/aircraft/show_fields.blade.php b/resources/views/admin/aircraft/show_fields.blade.php index 5227dba2..e8911488 100644 --- a/resources/views/admin/aircraft/show_fields.blade.php +++ b/resources/views/admin/aircraft/show_fields.blade.php @@ -2,12 +2,12 @@
    -

    {!! Form::label('airport_id', 'Location') !!}

    +

    {{ Form::label('airport_id', 'Location') }}

    @if($aircraft->airport) - {!! $aircraft->airport->icao !!}

    + {{ $aircraft->airport->icao }}

    @endif
    @@ -18,9 +18,9 @@
    {{----}} -

    {!! Form::label('name', 'Name') !!}

    +

    {{ Form::label('name', 'Name') }}

    -

    {!! $aircraft->name !!}

    +

    {{ $aircraft->name }}

    @@ -29,9 +29,9 @@
    {{----}} -

    {!! Form::label('registration', 'Registration') !!}

    +

    {{ Form::label('registration', 'Registration') }}

    -

    {!! $aircraft->registration !!}

    +

    {{ $aircraft->registration }}

    @@ -40,7 +40,7 @@
    {{----}} -

    {!! Form::label('active', 'Active:') !!}

    +

    {{ Form::label('active', 'Active:') }}

    @if ($aircraft->active == '1') yes @else no @endif

    diff --git a/resources/views/admin/aircraft/table.blade.php b/resources/views/admin/aircraft/table.blade.php index c1a25cda..4074d2d0 100644 --- a/resources/views/admin/aircraft/table.blade.php +++ b/resources/views/admin/aircraft/table.blade.php @@ -11,37 +11,37 @@ @foreach($aircraft as $ac) - {!! $ac->name !!} - {!! $ac->registration !!} + {{ $ac->name }} + {{ $ac->registration }} @if($ac->subfleet_id && $ac->subfleet) - - {!! $ac->subfleet->name !!} + + {{ $ac->subfleet->name }} @else - @endif - {!! $ac->airport_id !!} + {{ $ac->airport_id }} - {!! Utils::minutesToTimeString($ac->flight_hours) !!} + {{ Utils::minutesToTimeString($ac->flight_hours) }} @if($ac->status == \App\Models\Enums\AircraftStatus::ACTIVE) - {!! \App\Models\Enums\AircraftStatus::label($ac->status); !!} + {{ \App\Models\Enums\AircraftStatus::label($ac->status) }} @else - {!! \App\Models\Enums\AircraftStatus::label($ac->status) !!} + {{ \App\Models\Enums\AircraftStatus::label($ac->status) }} @endif - {!! Form::open(['route' => ['admin.aircraft.destroy', $ac->id], 'method' => 'delete']) !!} - + {{ Form::open(['route' => ['admin.aircraft.destroy', $ac->id], 'method' => 'delete']) }} + - {!! Form::button('', ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon', 'onclick' => "return confirm('Are you sure?')"]) !!} - {!! Form::close() !!} + {{ Form::button('', ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon', 'onclick' => "return confirm('Are you sure?')"]) }} + {{ Form::close() }} @endforeach diff --git a/resources/views/admin/airlines/create.blade.php b/resources/views/admin/airlines/create.blade.php index 42a16add..053590e4 100644 --- a/resources/views/admin/airlines/create.blade.php +++ b/resources/views/admin/airlines/create.blade.php @@ -3,9 +3,9 @@ @section('content')
    - {!! Form::open(['route' => 'admin.airlines.store']) !!} + {{ Form::open(['route' => 'admin.airlines.store']) }} @include('admin.airlines.fields') - {!! Form::close() !!} + {{ Form::close() }}
    @endsection diff --git a/resources/views/admin/airlines/edit.blade.php b/resources/views/admin/airlines/edit.blade.php index 66f758ee..7a82aa37 100644 --- a/resources/views/admin/airlines/edit.blade.php +++ b/resources/views/admin/airlines/edit.blade.php @@ -3,9 +3,9 @@ @section('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') - {!! Form::close() !!} + {{ Form::close() }}
    @endsection diff --git a/resources/views/admin/airlines/fields.blade.php b/resources/views/admin/airlines/fields.blade.php index 4b1c2d16..d90de55f 100644 --- a/resources/views/admin/airlines/fields.blade.php +++ b/resources/views/admin/airlines/fields.blade.php @@ -1,28 +1,28 @@
    - {!! Form::label('icao', 'Code:') !!} * - {!! Form::text('icao', null, ['class' => 'form-control']) !!} + {{ Form::label('icao', 'Code:') }} * + {{ Form::text('icao', null, ['class' => 'form-control']) }}

    {{ $errors->first('icao') }}

    - {!! Form::label('name', 'Name:') !!} * - {!! Form::text('name', null, ['class' => 'form-control']) !!} + {{ Form::label('name', 'Name:') }} * + {{ Form::text('name', null, ['class' => 'form-control']) }}

    {{ $errors->first('name') }}

    - {!! Form::label('iata', 'IATA:') !!} - {!! Form::text('iata', null, ['class' => 'form-control']) !!} + {{ Form::label('iata', 'IATA:') }} + {{ Form::text('iata', null, ['class' => 'form-control']) }}

    {{ $errors->first('iata') }}

    - {!! Form::label('logo', 'Logo URL:') !!} - {!! Form::text('logo', null, ['class' => 'form-control']) !!} + {{ Form::label('logo', 'Logo URL:') }} + {{ Form::text('logo', null, ['class' => 'form-control']) }}

    {{ $errors->first('logo') }}

    @@ -30,17 +30,17 @@
    - {!! Form::label('country', 'Country:') !!}
    - {!! Form::select('country', $countries, null, ['class' => 'form-control select2' ]); !!} + {{ Form::label('country', 'Country:') }}
    + {{ Form::select('country', $countries, null, ['class' => 'form-control select2' ]) }}

    {{ $errors->first('country') }}

    - {!! Form::label('active', 'Active:') !!} + {{ Form::label('active', 'Active:') }}
    @@ -48,8 +48,8 @@
    - {!! Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) !!} - Cancel + {{ Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) }} + Cancel
    diff --git a/resources/views/admin/airlines/index.blade.php b/resources/views/admin/airlines/index.blade.php index 5a921ed4..ade28abb 100644 --- a/resources/views/admin/airlines/index.blade.php +++ b/resources/views/admin/airlines/index.blade.php @@ -3,7 +3,7 @@ @section('title', 'Airlines') @section('actions')
  • - + Add New
    • diff --git a/resources/views/admin/airlines/show.blade.php b/resources/views/admin/airlines/show.blade.php index ccaaebb5..37a882cb 100644 --- a/resources/views/admin/airlines/show.blade.php +++ b/resources/views/admin/airlines/show.blade.php @@ -11,7 +11,7 @@
    @include('admin.airlines.show_fields') - Back + Back
    diff --git a/resources/views/admin/airlines/show_fields.blade.php b/resources/views/admin/airlines/show_fields.blade.php index 46bd93a4..70ec0f5c 100644 --- a/resources/views/admin/airlines/show_fields.blade.php +++ b/resources/views/admin/airlines/show_fields.blade.php @@ -1,40 +1,40 @@
    - {!! Form::label('icao', 'ICAO:') !!} -

    {!! $airlines->icao !!}

    + {{ Form::label('icao', 'ICAO:') }} +

    {{ $airlines->icao }}

    - {!! Form::label('iata', 'IATA:') !!} -

    {!! $airlines->iata !!}

    + {{ Form::label('iata', 'IATA:') }} +

    {{ $airlines->iata }}

    - {!! Form::label('name', 'Name:') !!} -

    {!! $airlines->name !!}

    + {{ Form::label('name', 'Name:') }} +

    {{ $airlines->name }}

    - {!! Form::label('logo', 'Logo URL:') !!} -

    {!! $airlines->logo !!}

    + {{ Form::label('logo', 'Logo URL:') }} +

    {{ $airlines->logo }}

    - {!! Form::label('active', 'Active:') !!} -

    {!! $airlines->active !!}

    + {{ Form::label('active', 'Active:') }} +

    {{ $airlines->active }}

    - {!! Form::label('created_at', 'Created At:') !!} -

    {!! show_datetime($airlines->created_at) !!}

    + {{ Form::label('created_at', 'Created At:') }} +

    {{ show_datetime($airlines->created_at) }}

    - {!! Form::label('updated_at', 'Updated At:') !!} -

    {!! show_datetime($airlines->updated_at) !!}

    + {{ Form::label('updated_at', 'Updated At:') }} +

    {{ show_datetime($airlines->updated_at) }}

    diff --git a/resources/views/admin/airlines/table.blade.php b/resources/views/admin/airlines/table.blade.php index a0e8d152..2c03eb24 100644 --- a/resources/views/admin/airlines/table.blade.php +++ b/resources/views/admin/airlines/table.blade.php @@ -10,12 +10,12 @@ @if(filled($al->country)) - +   @endif - {!! $al->code !!} + {{ $al->code }} - {!! $al->name !!} + {{ $al->name }} @if($al->active == 1) Active @@ -24,11 +24,11 @@ @endif - {!! Form::open(['route' => ['admin.airlines.destroy', $al->id], 'method' => 'delete']) !!} - ['admin.airlines.destroy', $al->id], 'method' => 'delete']) }} + - {!! Form::button('', ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon', 'onclick' => "return confirm('Are you sure?')"]) !!} - {!! Form::close() !!} + {{ Form::button('', ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon', 'onclick' => "return confirm('Are you sure?')"]) }} + {{ Form::close() }} @endforeach diff --git a/resources/views/admin/airports/create.blade.php b/resources/views/admin/airports/create.blade.php index 4bd9011a..97d656e5 100644 --- a/resources/views/admin/airports/create.blade.php +++ b/resources/views/admin/airports/create.blade.php @@ -4,9 +4,9 @@ @section('content')
    - {!! Form::open(['route' => 'admin.airports.store', 'id' => 'airportForm']) !!} + {{ Form::open(['route' => 'admin.airports.store', 'id' => 'airportForm']) }} @include('admin.airports.fields') - {!! Form::close() !!} + {{ Form::close() }}
    @endsection diff --git a/resources/views/admin/airports/edit.blade.php b/resources/views/admin/airports/edit.blade.php index 0f7b4319..d4cb35e2 100644 --- a/resources/views/admin/airports/edit.blade.php +++ b/resources/views/admin/airports/edit.blade.php @@ -3,13 +3,13 @@ @section('content')
    - {!! Form::model($airport, [ + {{ Form::model($airport, [ 'route' => ['admin.airports.update', $airport->id], 'method' => 'patch', 'id' => 'airportForm']) - !!} + }} @include('admin.airports.fields') - {!! Form::close() !!} + {{ Form::close() }}
    diff --git a/resources/views/admin/airports/expenses.blade.php b/resources/views/admin/airports/expenses.blade.php index fd15b8c1..a097c3ce 100644 --- a/resources/views/admin/airports/expenses.blade.php +++ b/resources/views/admin/airports/expenses.blade.php @@ -11,7 +11,7 @@ @if(count($airport->expenses)) Name - Cost {!! currency(config('phpvms.currency')) !!} + Cost {{ currency(config('phpvms.currency')) }} Type @@ -22,33 +22,33 @@

    - {!! $expense->name !!} + {{ $expense->name }}

    - {!! $expense->amount !!} + {{ $expense->amount }}

    {!! \App\Models\Enums\ExpenseType::label($expense->type) !!} + data-pk="{{ $expense->id }}" + data-name="type">{{ \App\Models\Enums\ExpenseType::label($expense->type) }}

    - {!! Form::open(['url' => url('/admin/airports/'.$airport->id.'/expenses'), - 'method' => 'delete', 'class' => 'modify_expense form-inline']) !!} - {!! Form::hidden('expense_id', $expense->id) !!} - {!! Form::button('', ['type' => 'submit', + {{ Form::open(['url' => url('/admin/airports/'.$airport->id.'/expenses'), + 'method' => 'delete', 'class' => 'modify_expense form-inline']) }} + {{ Form::hidden('expense_id', $expense->id) }} + {{ Form::button('', ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon', 'onclick' => "return confirm('Are you sure?')", - ]) !!} - {!! Form::close() !!} + ]) }} + {{ Form::close() }} @endforeach @@ -58,14 +58,14 @@
    - {!! Form::open(['url' => url('/admin/airports/'.$airport->id.'/expenses'), - 'method' => 'post', 'class' => 'modify_expense form-inline']) !!} - {!! Form::input('text', 'name', null, ['class' => 'form-control input-sm', 'placeholder' => 'Name']) !!} - {!! Form::number('amount', null, ['class' => 'form-control input-sm', 'placeholder' => 'Amount']) !!} - {!! Form::select('type', \App\Models\Enums\ExpenseType::select(), null, ['class' => 'select2']) !!} - {!! Form::button(' Add', ['type' => 'submit', - 'class' => 'btn btn-success btn-small']) !!} - {!! Form::close() !!} + {{ Form::open(['url' => url('/admin/airports/'.$airport->id.'/expenses'), + 'method' => 'post', 'class' => 'modify_expense form-inline']) }} + {{ Form::input('text', 'name', null, ['class' => 'form-control input-sm', 'placeholder' => 'Name']) }} + {{ Form::number('amount', null, ['class' => 'form-control input-sm', 'placeholder' => 'Amount']) }} + {{ Form::select('type', \App\Models\Enums\ExpenseType::select(), null, ['class' => 'select2']) }} + {{ Form::button(' Add', ['type' => 'submit', + 'class' => 'btn btn-success btn-small']) }} + {{ Form::close() }}

    {{ $errors->first('name') }}

    {{ $errors->first('amount') }}

    diff --git a/resources/views/admin/airports/fields.blade.php b/resources/views/admin/airports/fields.blade.php index 5ec2a7d9..3e341bdd 100644 --- a/resources/views/admin/airports/fields.blade.php +++ b/resources/views/admin/airports/fields.blade.php @@ -3,17 +3,17 @@
    - {!! Form::label('icao', 'ICAO:') !!} * + {{ Form::label('icao', 'ICAO:') }} * Lookup - {!! Form::text('icao', null, [ + {{ Form::text('icao', null, [ 'id' => 'airport_icao', 'class' => 'form-control' - ]) !!} + ]) }}

    {{ $errors->first('icao') }}

    - {!! Form::label('iata', 'IATA:') !!} - {!! Form::text('iata', null, ['class' => 'form-control']) !!} + {{ Form::label('iata', 'IATA:') }} + {{ Form::text('iata', null, ['class' => 'form-control']) }}

    {{ $errors->first('iata') }}

    @@ -21,19 +21,19 @@
    - {!! Form::label('name', 'Name:') !!} * - {!! Form::text('name', null, ['class' => 'form-control']) !!} + {{ Form::label('name', 'Name:') }} * + {{ Form::text('name', null, ['class' => 'form-control']) }}

    {{ $errors->first('name') }}

    - {!! Form::label('lat', 'Latitude:') !!} * - {!! Form::number('lat', null, ['class' => 'form-control', 'step' => '0.000001', 'rv-value' => 'airport.lat']) !!} + {{ Form::label('lat', 'Latitude:') }} * + {{ Form::number('lat', null, ['class' => 'form-control', 'step' => '0.000001', 'rv-value' => 'airport.lat']) }}

    {{ $errors->first('lat') }}

    - {!! Form::label('lon', 'Longitude:') !!} * - {!! Form::number('lon', null, ['class' => 'form-control', 'step' => '0.000001', 'rv-value' => 'airport.lon']) !!} + {{ Form::label('lon', 'Longitude:') }} * + {{ Form::number('lon', null, ['class' => 'form-control', 'step' => '0.000001', 'rv-value' => 'airport.lon']) }}

    {{ $errors->first('lon') }}

    @@ -41,28 +41,28 @@
    - {!! Form::label('country', 'Country:') !!} - {!! Form::text('country', null, ['class' => 'form-control']) !!} + {{ Form::label('country', 'Country:') }} + {{ Form::text('country', null, ['class' => 'form-control']) }}

    {{ $errors->first('country') }}

    - {!! Form::label('location', 'Location:') !!} - {!! Form::text('location', null, ['class' => 'form-control']) !!} + {{ Form::label('location', 'Location:') }} + {{ Form::text('location', null, ['class' => 'form-control']) }}

    {{ $errors->first('location') }}

    - {!! Form::label('timezone', 'Timezone:') !!} - {!! Form::select('timezone', $timezones, null, ['id' => 'timezone', 'class' => 'select2']); !!} + {{ Form::label('timezone', 'Timezone:') }} + {{ Form::select('timezone', $timezones, null, ['id' => 'timezone', 'class' => 'select2']) }}

    {{ $errors->first('timezone') }}

    - {!! Form::label('ground_handling_cost', 'Ground Handling Cost:') !!} - {!! Form::number('ground_handling_cost', null, ['class' => 'form-control']) !!} + {{ Form::label('ground_handling_cost', 'Ground Handling Cost:') }} + {{ Form::number('ground_handling_cost', null, ['class' => 'form-control']) }}

    {{ $errors->first('ground_handling_cost') }}

    @component('admin.components.info') @@ -79,15 +79,15 @@
    - {!! Form::label('hub', 'Hub:') !!} - {!! Form::hidden('hub', 0) !!} - {!! Form::checkbox('hub', null) !!} + {{ Form::label('hub', 'Hub:') }} + {{ Form::hidden('hub', 0) }} + {{ Form::checkbox('hub', null) }}
    - {!! Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) !!} - Cancel + {{ Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) }} + Cancel
    diff --git a/resources/views/admin/airports/index.blade.php b/resources/views/admin/airports/index.blade.php index bd0adf18..33794b16 100644 --- a/resources/views/admin/airports/index.blade.php +++ b/resources/views/admin/airports/index.blade.php @@ -3,7 +3,7 @@ @section('title', 'Airports') @section('actions')
  • - + Add New
    • diff --git a/resources/views/admin/airports/script.blade.php b/resources/views/admin/airports/script.blade.php index 76ec69d7..43f8c04a 100644 --- a/resources/views/admin/airports/script.blade.php +++ b/resources/views/admin/airports/script.blade.php @@ -4,7 +4,7 @@ function setEditable() { @if(isset($airport)) $('#airport-expenses a.text').editable({ emptytext: '0', - url: '{!! url('/admin/airports/'.$airport->id.'/expenses') !!}', + url: '{{ url('/admin/airports/'.$airport->id.'/expenses') }}', title: 'Enter override value', ajaxOptions: {'type': 'put'}, params: function (params) { @@ -19,8 +19,8 @@ function setEditable() { $('#airport-expenses a.dropdown').editable({ type: 'select', emptytext: '0', - source: {!! json_encode(list_to_editable(\App\Models\Enums\ExpenseType::select())) !!}, - url: '{!! url('/admin/airports/'.$airport->id.'/expenses') !!}', + source: {{ json_encode(list_to_editable(\App\Models\Enums\ExpenseType::select())) }}, + url: '{{ url('/admin/airports/'.$airport->id.'/expenses') }}', title: 'Enter override value', ajaxOptions: {'type': 'put'}, params: function (params) { @@ -54,7 +54,7 @@ $(document).ready(function() { type: 'text', mode: 'inline', emptytext: '0', - url: '{!! url('/admin/airports/fuel') !!}', + url: '{{ url('/admin/airports/fuel') }}', title: 'Enter price per unit of fuel', ajaxOptions: {'type': 'put'}, params: function(params) { diff --git a/resources/views/admin/airports/search.blade.php b/resources/views/admin/airports/search.blade.php index 6fd700c8..54c0c235 100644 --- a/resources/views/admin/airports/search.blade.php +++ b/resources/views/admin/airports/search.blade.php @@ -2,13 +2,13 @@
    - {!! Form::open(['route' => 'admin.airports.index', 'method' => 'GET', 'class'=>'form-inline pull-right']) !!} + {{ Form::open(['route' => 'admin.airports.index', 'method' => 'GET', 'class'=>'form-inline pull-right']) }} - {!! Form::label('icao', 'ICAO:') !!} - {!! Form::text('icao', null, ['class' => 'form-control']) !!} + {{ Form::label('icao', 'ICAO:') }} + {{ Form::text('icao', null, ['class' => 'form-control']) }}   - clear - {!! Form::close() !!} + clear + {{ Form::close() }}
    diff --git a/resources/views/admin/airports/show.blade.php b/resources/views/admin/airports/show.blade.php index e20ff75f..9be675c5 100644 --- a/resources/views/admin/airports/show.blade.php +++ b/resources/views/admin/airports/show.blade.php @@ -2,10 +2,10 @@ @section('content')
    -

    {!! $airport->name !!} - {!! $airport->location !!}

    +

    {{ $airport->name }} - {{ $airport->location }}

    - Edit -

    + Edit +
    @@ -26,10 +26,10 @@
    @endsection @section('scripts') - @endsection diff --git a/resources/views/admin/airports/show_fields.blade.php b/resources/views/admin/airports/show_fields.blade.php index a3f2968b..3a48f023 100644 --- a/resources/views/admin/airports/show_fields.blade.php +++ b/resources/views/admin/airports/show_fields.blade.php @@ -5,7 +5,7 @@

    ICAO

    -

    {!! $airport->icao !!}

    +

    {{ $airport->icao }}

    @@ -16,7 +16,7 @@

    Coordinates

    -

    {!! $airport->lat!!}/{!! $airport->lon !!}

    +

    {{ $airport->lat}}/{{ $airport->lon }}

    diff --git a/resources/views/admin/airports/table.blade.php b/resources/views/admin/airports/table.blade.php index 3f28ff90..31452068 100644 --- a/resources/views/admin/airports/table.blade.php +++ b/resources/views/admin/airports/table.blade.php @@ -14,31 +14,31 @@ @foreach($airports as $airport) - {!! $airport->icao !!} - {!! $airport->name !!} - {!! $airport->location !!} + {{ $airport->icao }} + {{ $airport->name }} + {{ $airport->location }} @if($airport->hub === true) Hub @endif - {!! $airport->ground_handling_cost !!} + {{ $airport->ground_handling_cost }} - {!! $airport->fuel_100ll_cost !!} + {{ $airport->fuel_100ll_cost }} - {!! $airport->fuel_jeta_cost !!} + {{ $airport->fuel_jeta_cost }} - {!! $airport->fuel_mogas_cost !!} + {{ $airport->fuel_mogas_cost }} - {!! Form::open(['route' => ['admin.airports.destroy', $airport->id], 'method' => 'delete']) !!} - - {!! Form::button('', ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon', 'onclick' => "return confirm('Are you sure?')"]) !!} - {!! Form::close() !!} + {{ Form::open(['route' => ['admin.airports.destroy', $airport->id], 'method' => 'delete']) }} + + {{ Form::button('', ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon', 'onclick' => "return confirm('Are you sure?')"]) }} + {{ Form::close() }} @endforeach diff --git a/resources/views/admin/app.blade.php b/resources/views/admin/app.blade.php index 1ff27bea..47ee5fb9 100644 --- a/resources/views/admin/app.blade.php +++ b/resources/views/admin/app.blade.php @@ -1,7 +1,7 @@ - @yield('title') - {!! config('app.name') !!} admin + @yield('title') - {{ config('app.name') }} admin @@ -9,9 +9,9 @@ - + - + @@ -31,9 +31,9 @@ - - - + + + - - + + + @yield('scripts') diff --git a/resources/views/layouts/default/auth/login.blade.php b/resources/views/layouts/default/auth/login.blade.php index ba9c6df7..4a2c99ef 100644 --- a/resources/views/layouts/default/auth/login.blade.php +++ b/resources/views/layouts/default/auth/login.blade.php @@ -7,7 +7,7 @@
    - +
    diff --git a/resources/views/layouts/default/auth/register.blade.php b/resources/views/layouts/default/auth/register.blade.php index f913f0dd..cbce2279 100644 --- a/resources/views/layouts/default/auth/register.blade.php +++ b/resources/views/layouts/default/auth/register.blade.php @@ -6,14 +6,14 @@
    -{!! Form::open(['url' => '/register', 'class' => 'form-signin']) !!} +{{ Form::open(['url' => '/register', 'class' => 'form-signin']) }}
    @@ -22,7 +22,7 @@
    -

    {!! \App\Facades\Utils::minutesToTimeString($user->flight_time, false)!!}

    +

    {{ \App\Facades\Utils::minutesToTimeString($user->flight_time, false)}}

    total hours
    @@ -35,7 +35,7 @@ @if($user->current_airport) -

    {!! $user->current_airport->icao !!}

    +

    {{ $user->current_airport->icao }}

    @else

    -

    @endif @@ -51,7 +51,7 @@ Your Last Report
    - No reports yet. File one now. + No reports yet. File one now.
    @else diff --git a/resources/views/layouts/default/flash/message.blade.php b/resources/views/layouts/default/flash/message.blade.php index 8a0a596f..80030ffb 100644 --- a/resources/views/layouts/default/flash/message.blade.php +++ b/resources/views/layouts/default/flash/message.blade.php @@ -13,7 +13,7 @@ @endif - {!! session('flash_notification.message') !!} + {{ session('flash_notification.message') }} @endif @endif diff --git a/resources/views/layouts/default/flash/modal.blade.php b/resources/views/layouts/default/flash/modal.blade.php index 41b821c4..a560c535 100644 --- a/resources/views/layouts/default/flash/modal.blade.php +++ b/resources/views/layouts/default/flash/modal.blade.php @@ -8,7 +8,7 @@
    -

    {!! $body !!}

    +

    {{ $body }}

    diff --git a/resources/views/layouts/default/flights/map.blade.php b/resources/views/layouts/default/flights/map.blade.php index f58403c9..46bf4815 100644 --- a/resources/views/layouts/default/flights/map.blade.php +++ b/resources/views/layouts/default/flights/map.blade.php @@ -12,8 +12,8 @@ @section('scripts') @endsection diff --git a/resources/views/layouts/default/flights/scripts.blade.php b/resources/views/layouts/default/flights/scripts.blade.php index 24295ce5..2ac014e5 100644 --- a/resources/views/layouts/default/flights/scripts.blade.php +++ b/resources/views/layouts/default/flights/scripts.blade.php @@ -12,7 +12,7 @@ $(document).ready(function () { 'flight_id': btn.attr('x-id') }, headers: { - 'x-api-key': "{!! Auth::user()->api_key !!}" + 'x-api-key': "{{ Auth::user()->api_key }}" } }; diff --git a/resources/views/layouts/default/flights/search.blade.php b/resources/views/layouts/default/flights/search.blade.php index b2abe773..912c7810 100644 --- a/resources/views/layouts/default/flights/search.blade.php +++ b/resources/views/layouts/default/flights/search.blade.php @@ -2,30 +2,30 @@
    - {!! Form::open(['route' => 'frontend.flights.search', 'method' => 'GET', 'class'=>'form-inline pull-right']) !!} + {{ Form::open(['route' => 'frontend.flights.search', 'method' => 'GET', 'class'=>'form-inline pull-right']) }}

    Flight Number

    - {!! Form::text('flight_number', null, ['class' => 'form-control']) !!} + {{ Form::text('flight_number', null, ['class' => 'form-control']) }}

    Departure Airport

    - {!! Form::select('dep_icao', $airports, null , ['class' => 'form-control']) !!} + {{ Form::select('dep_icao', $airports, null , ['class' => 'form-control']) }}

    Arrival Airport

    - {!! Form::select('arr_icao', $airports, null , ['class' => 'form-control']) !!} + {{ Form::select('arr_icao', $airports, null , ['class' => 'form-control']) }}

    - {!! Form::submit('find', ['class' => 'btn btn-primary']) !!}  - clear + {{ Form::submit('find', ['class' => 'btn btn-primary']) }}  + clear

    - {!! Form::close() !!} + {{ Form::close() }}
    diff --git a/resources/views/layouts/default/flights/show.blade.php b/resources/views/layouts/default/flights/show.blade.php index ac2c675f..c7b3746c 100644 --- a/resources/views/layouts/default/flights/show.blade.php +++ b/resources/views/layouts/default/flights/show.blade.php @@ -4,7 +4,7 @@ @section('content')
    -

    {!! $flight->ident !!} - {!! $flight->dpt_airport->full_name !!} to {!! $flight->arr_airport->full_name !!}

    +

    {{ $flight->ident }} - {{ $flight->dpt_airport->full_name }} to {{ $flight->arr_airport->full_name }}

    @@ -13,24 +13,24 @@ - + - + - + - + - +
    Departure{!! $flight->dpt_airport->icao !!} @ {!! $flight->dpt_time !!}{{ $flight->dpt_airport->icao }} @ {{ $flight->dpt_time }}
    Arrival{!! $flight->arr_airport->icao !!} @ {!! $flight->arr_time !!}{{ $flight->arr_airport->icao }} @ {{ $flight->arr_time }}
    Route Code/Leg:{!! $flight->route_code ?: '-' !!}/{!! $flight->route_leg ?: '-' !!}{{ $flight->route_code ?: '-' }}/{{ $flight->route_leg ?: '-' }}
    Alternate Airport @if($flight->alt_airport_id) - {!! $flight->alt_airport->full_name !!} + {{ $flight->alt_airport->full_name }} @else - @endif @@ -39,12 +39,12 @@
    Route{!! $flight->route !!}{{ $flight->route }}
    Notes{!! $flight->notes !!}{{ $flight->notes }}
    diff --git a/resources/views/layouts/default/flights/table.blade.php b/resources/views/layouts/default/flights/table.blade.php index ffe478b9..509c5c58 100644 --- a/resources/views/layouts/default/flights/table.blade.php +++ b/resources/views/layouts/default/flights/table.blade.php @@ -4,8 +4,8 @@
    - - {!! $flight->ident !!} + + {{ $flight->ident }}
    @@ -20,7 +20,7 @@
    --}}

    - {!! $user->name !!} + {{ $user->name }}

    + src="{{ $user->gravatar(123) }}">
    - Profile + Profile
    diff --git a/resources/views/layouts/default/nav.blade.php b/resources/views/layouts/default/nav.blade.php index bb45972f..22288c70 100644 --- a/resources/views/layouts/default/nav.blade.php +++ b/resources/views/layouts/default/nav.blade.php @@ -1,7 +1,7 @@
      @if(Auth::check())
    • - +

      Dashboard

       @@ -9,14 +9,14 @@ @endif
    • - +

      Live Map
    • - +

      Pilots

       @@ -25,22 +25,22 @@ {{-- Show the module links that don't require being logged in --}} @foreach($moduleSvc->getFrontendLinks($logged_in=false) as &$link)
    • - - -

      {!! $link['title'] !!}

      +       + +

      {{ $link['title'] }}
      • @endforeach @if(!Auth::check())
    • - +

      Login
    • - +

      Register

       @@ -49,19 +49,19 @@ @else
    • - +

      Flights
    • - +

      Flight Reports
    • - +

      Profile

       @@ -69,7 +69,7 @@ @role('admin')
    • - +

      Admin

       @@ -79,15 +79,15 @@ {{-- Show the module links for being logged in --}} @foreach($moduleSvc->getFrontendLinks($logged_in=true) as &$link)
    • - - -

      {!! $link['title'] !!}

      +       + +

      {{ $link['title'] }}
      • @endforeach
    • - +

      Log Out

       diff --git a/resources/views/layouts/default/pireps/create.blade.php b/resources/views/layouts/default/pireps/create.blade.php index f620daba..6ed4d3ce 100644 --- a/resources/views/layouts/default/pireps/create.blade.php +++ b/resources/views/layouts/default/pireps/create.blade.php @@ -6,11 +6,11 @@

      New Flight Report

      @include('flash::message') - {!! Form::open(['route' => 'frontend.pireps.store']) !!} + {{ Form::open(['route' => 'frontend.pireps.store']) }} @include("pireps.fields") - {!! Form::close() !!} + {{ Form::close() }}
      @endsection diff --git a/resources/views/layouts/default/pireps/edit.blade.php b/resources/views/layouts/default/pireps/edit.blade.php index 23a33101..40ddb190 100644 --- a/resources/views/layouts/default/pireps/edit.blade.php +++ b/resources/views/layouts/default/pireps/edit.blade.php @@ -5,11 +5,11 @@

      Edit Flight Report

      @include('flash::message') - {!! Form::model($pirep, ['route' => ['frontend.pireps.update', $pirep->id], 'method' => 'patch']) !!} + {{ Form::model($pirep, ['route' => ['frontend.pireps.update', $pirep->id], 'method' => 'patch']) }} @include("pireps.fields") - {!! Form::close() !!} + {{ Form::close() }}
      @endsection diff --git a/resources/views/layouts/default/pireps/fares.blade.php b/resources/views/layouts/default/pireps/fares.blade.php index 9d38943c..606d0e8c 100644 --- a/resources/views/layouts/default/pireps/fares.blade.php +++ b/resources/views/layouts/default/pireps/fares.blade.php @@ -9,14 +9,14 @@ @foreach($aircraft->subfleet->fares as $fare) - {!! $fare->name !!} ({!! $fare->code !!}) + {{ $fare->name }} ({{ $fare->code }}) @if($read_only) -

      {!! $pirep->{'fare_'.$fare->id} !!}

      - {!! Form::hidden('fare_'.$fare->id) !!} +

      {{ $pirep->{'fare_'.$fare->id} }}

      + {{ Form::hidden('fare_'.$fare->id) }} @else
      - {!! Form::number('fare_'.$fare->id, null, ['class' => 'form-control', 'min' => 0]) !!} + {{ Form::number('fare_'.$fare->id, null, ['class' => 'form-control', 'min' => 0]) }}
      @endif diff --git a/resources/views/layouts/default/pireps/fields.blade.php b/resources/views/layouts/default/pireps/fields.blade.php index f3881fc0..abd50bf9 100644 --- a/resources/views/layouts/default/pireps/fields.blade.php +++ b/resources/views/layouts/default/pireps/fields.blade.php @@ -28,13 +28,13 @@ flight reports that have been filed. You've been warned! Airline @if($read_only) -

      {!! $pirep->airline->name !!}

      - {!! Form::hidden('airline_id') !!} +

      {{ $pirep->airline->name }}

      + {{ Form::hidden('airline_id') }} @else
      - {!! Form::select('airline_id', $airline_list, null, [ + {{ Form::select('airline_id', $airline_list, null, [ 'class' => 'custom-select select2', - 'readonly' => $read_only]) !!} + 'readonly' => $read_only]) }}

      {{ $errors->first('airline_id') }}

      @endif @@ -45,27 +45,27 @@ flight reports that have been filed. You've been warned! Flight Number/Code/Leg @if($read_only) -

      {!! $pirep->ident !!} - {!! Form::hidden('flight_number') !!} - {!! Form::hidden('flight_code') !!} - {!! Form::hidden('flight_leg') !!} +

      {{ $pirep->ident }} + {{ Form::hidden('flight_number') }} + {{ Form::hidden('flight_code') }} + {{ Form::hidden('flight_leg') }}

      @else
      - {!! Form::text('flight_number', null, [ + {{ Form::text('flight_number', null, [ 'placeholder' => 'Flight Number', 'class' => 'form-control', - 'readonly' => $read_only]) !!} + 'readonly' => $read_only]) }} - {!! Form::text('route_code', null, [ + {{ Form::text('route_code', null, [ 'placeholder' => 'Code (optional)', 'class' => 'form-control', - 'readonly' => $read_only]) !!} + 'readonly' => $read_only]) }} - {!! Form::text('route_leg', null, [ + {{ Form::text('route_leg', null, [ 'placeholder' => 'Leg (optional)', 'class' => 'form-control', - 'readonly' => $read_only]) !!} + 'readonly' => $read_only]) }}

      {{ $errors->first('flight_number') }}

      {{ $errors->first('route_code') }}

      @@ -78,16 +78,16 @@ flight reports that have been filed. You've been warned! Aircraft @if($read_only) -

      {!! $pirep->aircraft->name !!}

      - {!! Form::hidden('aircraft_id') !!} +

      {{ $pirep->aircraft->name }}

      + {{ Form::hidden('aircraft_id') }} @else
      {{-- You probably don't want to change this ID if you want the fare select to work --}} - {!! Form::select('aircraft_id', $aircraft_list, null, [ + {{ Form::select('aircraft_id', $aircraft_list, null, [ 'id' => 'aircraft_select', 'class' => 'custom-select select2', 'readonly' => $read_only - ]) !!} + ]) }}

      {{ $errors->first('aircraft_id') }}

      @endif @@ -98,14 +98,14 @@ flight reports that have been filed. You've been warned! Origin Airport @if($read_only) -

      {!! $pirep->dpt_airport->id !!} - {!! $pirep->dpt_airport->name !!}

      - {!! Form::hidden('dpt_airport_id') !!} +

      {{ $pirep->dpt_airport->id }} - {{ $pirep->dpt_airport->name }}

      + {{ Form::hidden('dpt_airport_id') }} @else
      - {!! Form::select('dpt_airport_id', $airport_list, null, [ + {{ Form::select('dpt_airport_id', $airport_list, null, [ 'class' => 'custom-select select2', 'readonly' => $read_only - ]) !!} + ]) }}

      {{ $errors->first('dpt_airport_id') }}

      @endif @@ -116,15 +116,15 @@ flight reports that have been filed. You've been warned! Arrival Airport @if($read_only) -

      {!! $pirep->arr_airport->id !!} - - {!! $pirep->arr_airport->name !!}

      - {!! Form::hidden('arr_airport_id') !!} +

      {{ $pirep->arr_airport->id }} + - {{ $pirep->arr_airport->name }}

      + {{ Form::hidden('arr_airport_id') }} @else
      - {!! Form::select('arr_airport_id', $airport_list, null, [ + {{ Form::select('arr_airport_id', $airport_list, null, [ 'class' => 'custom-select select2', 'readonly' => $read_only - ]) !!} + ]) }}

      {{ $errors->first('arr_airport_id') }}

      @endif @@ -136,25 +136,25 @@ flight reports that have been filed. You've been warned! @if($read_only)

      - {!! $pirep->hours !!} hours, {!! $pirep->minutes !!} minutes - {!! Form::hidden('hours') !!} - {!! Form::hidden('minutes') !!} + {{ $pirep->hours }} hours, {{ $pirep->minutes }} minutes + {{ Form::hidden('hours') }} + {{ Form::hidden('minutes') }}

      @else
      - {!! Form::number('hours', null, [ + {{ Form::number('hours', null, [ 'class' => 'form-control', 'placeholder' => 'hours', 'min' => '0', 'readonly' => $read_only - ]) !!} + ]) }} - {!! Form::number('minutes', null, [ + {{ Form::number('minutes', null, [ 'class' => 'form-control', 'placeholder' => 'minutes', 'min' => 0, 'readonly' => $read_only - ]) !!} + ]) }}

      {{ $errors->first('hours') }}

      {{ $errors->first('minutes') }}

      @@ -168,16 +168,16 @@ flight reports that have been filed. You've been warned! @foreach($pirep_fields as $field) - {!! $field->name !!} + {{ $field->name }} @if($field->required === true) * @endif
      - {!! Form::text($field->slug, null, [ + {{ Form::text($field->slug, null, [ 'class' => 'form-control' - ]) !!} + ]) }}

      {{ $errors->first($field->slug) }}

      @@ -188,7 +188,7 @@ flight reports that have been filed. You've been warned! Route
      - {!! Form::textarea('route', null, ['class' => 'form-control', 'placeholder' => 'Route']) !!} + {{ Form::textarea('route', null, ['class' => 'form-control', 'placeholder' => 'Route']) }}

      {{ $errors->first('route') }}

      @@ -198,7 +198,7 @@ flight reports that have been filed. You've been warned!

      Notes

      - {!! Form::textarea('notes', null, ['class' => 'form-control', 'placeholder' => 'Notes']) !!} + {{ Form::textarea('notes', null, ['class' => 'form-control', 'placeholder' => 'Notes']) }}

      {{ $errors->first('notes') }}

      @@ -218,7 +218,7 @@ flight reports that have been filed. You've been warned!
      - {!! Form::submit('Save PIREP', ['class' => 'btn btn-primary']) !!} + {{ Form::submit('Save PIREP', ['class' => 'btn btn-primary']) }}
      diff --git a/resources/views/layouts/default/pireps/index.blade.php b/resources/views/layouts/default/pireps/index.blade.php index cb9f4d6c..16496f03 100644 --- a/resources/views/layouts/default/pireps/index.blade.php +++ b/resources/views/layouts/default/pireps/index.blade.php @@ -7,7 +7,7 @@
      File New PIREP + href="{{ route('frontend.pireps.create') }}">File New PIREP

      pilot reports

      @include('flash::message') diff --git a/resources/views/layouts/default/pireps/map.blade.php b/resources/views/layouts/default/pireps/map.blade.php index 30efe9c3..d4d6efd7 100644 --- a/resources/views/layouts/default/pireps/map.blade.php +++ b/resources/views/layouts/default/pireps/map.blade.php @@ -12,10 +12,10 @@ @section('scripts') @endsection diff --git a/resources/views/layouts/default/pireps/pirep_card.blade.php b/resources/views/layouts/default/pireps/pirep_card.blade.php index 6a27f323..3c055ed4 100644 --- a/resources/views/layouts/default/pireps/pirep_card.blade.php +++ b/resources/views/layouts/default/pireps/pirep_card.blade.php @@ -3,8 +3,8 @@
      - - {!! $pirep->ident !!} + + {{ $pirep->ident }}
      @@ -17,7 +17,7 @@ @else
      @endif - {!! PirepState::label($pirep->state) !!}
      + {{ PirepState::label($pirep->state) }}
      @@ -26,36 +26,36 @@ - + - + - + - + @if($pirep->level) - + @endif - +
      DEP {!! $pirep->dpt_airport_id !!}{{ $pirep->dpt_airport_id }}
      ARR {!! $pirep->arr_airport_id !!} {{ $pirep->arr_airport_id }} 
      Flight Time {!! Utils::minutesToTimeString($pirep->flight_time) !!}{{ Utils::minutesToTimeString($pirep->flight_time) }}
      Aircraft {!! $pirep->aircraft->name !!} - ({!! $pirep->aircraft->registration !!}){{ $pirep->aircraft->name }} + ({{ $pirep->aircraft->registration }})
      Flight Level {!! $pirep->level !!}{{ $pirep->level }}
      Filed On: {!! show_datetime($pirep->created_at) !!}{{ show_datetime($pirep->created_at) }}

      - edit + edit

      diff --git a/resources/views/layouts/default/pireps/scripts.blade.php b/resources/views/layouts/default/pireps/scripts.blade.php index 93d9d05f..92edbaff 100644 --- a/resources/views/layouts/default/pireps/scripts.blade.php +++ b/resources/views/layouts/default/pireps/scripts.blade.php @@ -9,10 +9,10 @@ console.log('aircraft select change: ', aircraft_id); $.ajax({ - url: "{!! url('/pireps/fares') !!}?aircraft_id=" + aircraft_id, + url: "{{ url('/pireps/fares') }}?aircraft_id=" + aircraft_id, type: 'GET', headers: { - 'x-api-key': '{!! Auth::user()->api_key !!}' + 'x-api-key': '{{ Auth::user()->api_key }}' }, success: (data) => { console.log('returned new fares', data); diff --git a/resources/views/layouts/default/pireps/show.blade.php b/resources/views/layouts/default/pireps/show.blade.php index f080e81d..89911671 100644 --- a/resources/views/layouts/default/pireps/show.blade.php +++ b/resources/views/layouts/default/pireps/show.blade.php @@ -4,7 +4,7 @@ @section('content')
      -

      {!! $pirep->ident !!}

      +

      {{ $pirep->ident }}

      @@ -24,47 +24,47 @@
      @endif - {!! PirepState::label($pirep->state) !!}
      + {{ PirepState::label($pirep->state) }} - source: {!! PirepSource::label($pirep->source) !!} + source: {{ PirepSource::label($pirep->source) }} Departure/Arrival - {!! $pirep->dpt_airport->icao !!} - {!! $pirep->dpt_airport->name !!} + {{ $pirep->dpt_airport->icao }} - {{ $pirep->dpt_airport->name }} to - {!! $pirep->arr_airport->icao !!} - {!! $pirep->arr_airport->name !!} + {{ $pirep->arr_airport->icao }} - {{ $pirep->arr_airport->name }} Flight Time - {!! Utils::minutesToTimeString($pirep->flight_time) !!} + {{ Utils::minutesToTimeString($pirep->flight_time) }} Filed Route - {!! $pirep->route !!} + {{ $pirep->route }} Notes - {!! $pirep->notes !!} + {{ $pirep->notes }} Filed On - {!! show_datetime($pirep->created_at) !!} + {{ show_datetime($pirep->created_at) }} @@ -88,8 +88,8 @@ @foreach($pirep->fields as $field) - {!! $field->name !!} - {!! $field->value !!} + {{ $field->name }} + {{ $field->value }} @endforeach @@ -114,8 +114,8 @@ @foreach($pirep->fares as $fare) - {!! $fare->fare->name !!} ({!! $fare->fare->code !!}) - {!! $fare->count !!} + {{ $fare->fare->name }} ({{ $fare->fare->code }}) + {{ $fare->count }} @endforeach @@ -137,8 +137,8 @@ @foreach($pirep->acars_logs as $log) - {!! show_datetime($log->created_at) !!} - {!! $log->log !!} + {{ show_datetime($log->created_at) }} + {{ $log->log }} @endforeach diff --git a/resources/views/layouts/default/profile/edit.blade.php b/resources/views/layouts/default/profile/edit.blade.php index 30a3bfd5..2da56d50 100644 --- a/resources/views/layouts/default/profile/edit.blade.php +++ b/resources/views/layouts/default/profile/edit.blade.php @@ -6,9 +6,9 @@

      edit your profile

      @include('flash::message') - {!! Form::model($user, ['route' => ['frontend.profile.update', $user->id], 'method' => 'patch']) !!} + {{ Form::model($user, ['route' => ['frontend.profile.update', $user->id], 'method' => 'patch']) }} @include("profile.fields") - {!! Form::close() !!} + {{ Form::close() }}
      @endsection diff --git a/resources/views/layouts/default/profile/fields.blade.php b/resources/views/layouts/default/profile/fields.blade.php index d70c014c..2513839e 100644 --- a/resources/views/layouts/default/profile/fields.blade.php +++ b/resources/views/layouts/default/profile/fields.blade.php @@ -5,7 +5,7 @@ Name
      - {!! Form::text('name', null, ['class' => 'form-control']) !!} + {{ Form::text('name', null, ['class' => 'form-control']) }}
      @if ($errors->has('name'))

      {{ $errors->first('name') }}

      @@ -17,7 +17,7 @@ Email
      - {!! Form::text('email', null, ['class' => 'form-control']) !!} + {{ Form::text('email', null, ['class' => 'form-control']) }}
      @if ($errors->has('email'))

      {{ $errors->first('email') }}

      @@ -29,7 +29,7 @@ Airline
      - {!! Form::select('airline_id', $airlines, null , ['class' => 'form-control select2']) !!} + {{ Form::select('airline_id', $airlines, null , ['class' => 'form-control select2']) }}
      @if ($errors->has('airline_id'))

      {{ $errors->first('airline_id') }}

      @@ -41,7 +41,7 @@ Home Airport
      - {!! Form::select('home_airport_id', $airports, null , ['class' => 'form-control select2']) !!} + {{ Form::select('home_airport_id', $airports, null , ['class' => 'form-control select2']) }}
      @if ($errors->has('home_airport_id'))

      {{ $errors->first('home_airport_id') }}

      @@ -53,7 +53,7 @@ Country
      - {!! Form::select('country', $countries, null, ['class' => 'form-control select2' ]); !!} + {{ Form::select('country', $countries, null, ['class' => 'form-control select2' ]) }}
      @if ($errors->has('country'))

      {{ $errors->first('country') }}

      @@ -65,7 +65,7 @@ Timezone
      - {!! Form::select('timezone', $timezones, null, ['class' => 'form-control select2' ]); !!} + {{ Form::select('timezone', $timezones, null, ['class' => 'form-control select2' ]) }}
      @if ($errors->has('timezone'))

      {{ $errors->first('timezone') }}

      @@ -77,7 +77,7 @@ Change Password
      - {!! Form::password('password', ['class' => 'form-control']) !!} + {{ Form::password('password', ['class' => 'form-control']) }}
      @if ($errors->has('password'))

      {{ $errors->first('password') }}

      @@ -85,7 +85,7 @@

      Confirm Password:

      - {!! Form::password('password_confirmation', ['class' => 'form-control']) !!} + {{ Form::password('password_confirmation', ['class' => 'form-control']) }}
      @if ($errors->has('password_confirmation'))

      {{ $errors->first('password_confirmation') }}

      @@ -96,7 +96,7 @@
      - {!! Form::submit('Update Profile', ['class' => 'btn btn-primary']) !!} + {{ Form::submit('Update Profile', ['class' => 'btn btn-primary']) }}
      diff --git a/resources/views/layouts/default/profile/index.blade.php b/resources/views/layouts/default/profile/index.blade.php index 9c836307..b4edd773 100644 --- a/resources/views/layouts/default/profile/index.blade.php +++ b/resources/views/layouts/default/profile/index.blade.php @@ -5,38 +5,38 @@
      - +
      -

      {!! $user->name !!}

      -
      -
      {!! $user->pilot_id !!}
      -
      {!! $user->rank->name !!}
      +

      {{ $user->name }}

      +
      +
      {{ $user->pilot_id }}
      +
      {{ $user->rank->name }}

      - {!! $user->airline->name !!} + {{ $user->airline->name }}

      @if($user->home_airport) @endif @if($user->current_airport) @endif @@ -53,10 +53,10 @@
      - new api key   - edit
      @@ -64,15 +64,15 @@ - + - + - +
      Email{!! $user->email !!}{{ $user->email }}
      API Key  don't share this!{!! $user->api_key !!}{{ $user->api_key }}
      Timezone{!! $user->timezone !!}{{ $user->timezone }}
      diff --git a/resources/views/layouts/default/users/table.blade.php b/resources/views/layouts/default/users/table.blade.php index 80f919ca..0297d5bd 100644 --- a/resources/views/layouts/default/users/table.blade.php +++ b/resources/views/layouts/default/users/table.blade.php @@ -14,30 +14,30 @@
      + src="{{ $user->gravatar(256) }}&s=256"/>
      - - {!! $user->name !!} + + {{ $user->name }} @if(filled($user->country)) - + @endif - {!! $user->airline->icao !!} + {{ $user->airline->icao }} @if($user->current_airport) - {!! $user->curr_airport_id !!} + {{ $user->curr_airport_id }} @else - @endif - {!! $user->flights !!} - {!! \App\Facades\Utils::minutesToTimeString($user->flight_time) !!} + {{ $user->flights }} + {{ \App\Facades\Utils::minutesToTimeString($user->flight_time) }} @endforeach diff --git a/resources/views/layouts/default/widgets/latest_news.blade.php b/resources/views/layouts/default/widgets/latest_news.blade.php index 0d9c0757..f7a071c9 100644 --- a/resources/views/layouts/default/widgets/latest_news.blade.php +++ b/resources/views/layouts/default/widgets/latest_news.blade.php @@ -10,11 +10,11 @@ @endif @foreach($news as $item) -

      {!! $item->subject !!}

      -

      {!! $item->user->name !!} - - {!! show_datetime($item->created_at) !!}

      +

      {{ $item->subject }}

      +

      {{ $item->user->name }} + - {{ show_datetime($item->created_at) }}

      - {!! $item->body !!} + {{ $item->body }} @endforeach
      diff --git a/resources/views/layouts/default/widgets/latest_pilots.blade.php b/resources/views/layouts/default/widgets/latest_pilots.blade.php index 6922b2c7..e937ec5e 100644 --- a/resources/views/layouts/default/widgets/latest_pilots.blade.php +++ b/resources/views/layouts/default/widgets/latest_pilots.blade.php @@ -9,9 +9,9 @@ @foreach($users as $u) - {!! $u->pilot_id !!} + {{ $u->pilot_id }} - {!! $u->name !!} + {{ $u->name }} @endforeach diff --git a/resources/views/layouts/default/widgets/latest_pireps.blade.php b/resources/views/layouts/default/widgets/latest_pireps.blade.php index 5d1db9aa..3716bd0b 100644 --- a/resources/views/layouts/default/widgets/latest_pireps.blade.php +++ b/resources/views/layouts/default/widgets/latest_pireps.blade.php @@ -9,12 +9,12 @@ @foreach($pireps as $p) - {!! $p->airline->code !!} + {{ $p->airline->code }} - {!! $p->dpt_airport_id !!}- - {!! $p->arr_airport_id !!}  - {!! $p->aircraft->name !!} + {{ $p->dpt_airport_id }}- + {{ $p->arr_airport_id }}  + {{ $p->aircraft->name }} @endforeach diff --git a/resources/views/layouts/default/widgets/live_map.blade.php b/resources/views/layouts/default/widgets/live_map.blade.php index 7769277b..b242788e 100644 --- a/resources/views/layouts/default/widgets/live_map.blade.php +++ b/resources/views/layouts/default/widgets/live_map.blade.php @@ -2,7 +2,7 @@

      flight map

      -
      +
      @@ -18,11 +18,11 @@ @foreach($pireps as $pirep) - - - + + + @endforeach @@ -33,9 +33,9 @@ @section('scripts') @endsection diff --git a/resources/views/system/errors/database_error.blade.php b/resources/views/system/errors/database_error.blade.php index af6f8287..cd36701e 100644 --- a/resources/views/system/errors/database_error.blade.php +++ b/resources/views/system/errors/database_error.blade.php @@ -14,9 +14,9 @@ - - - + + + {{----}}

      - - + +

      diff --git a/resources/views/system/errors/not_installed.blade.php b/resources/views/system/errors/not_installed.blade.php index f4b01460..88947ef2 100644 --- a/resources/views/system/errors/not_installed.blade.php +++ b/resources/views/system/errors/not_installed.blade.php @@ -12,9 +12,9 @@ - - - + + +
      {!! $pirep->ident !!}{!! $pirep->dpt_airport_id !!}{!! $pirep->arr_airport_id !!}{{ $pirep->ident }}{{ $pirep->dpt_airport_id }}{{ $pirep->arr_airport_id }} - {!! PirepStatus::label($pirep->status); !!} + {{ PirepStatus::label($pirep->status) }}