From 6a4e89fc40f03aafb6b2c7c23107a19fad930460 Mon Sep 17 00:00:00 2001 From: Nabeel Shahzad Date: Sat, 30 Dec 2017 12:23:30 -0600 Subject: [PATCH] remove old adminlte references --- resources/views/admin/aircraft/create.blade.php | 8 +++----- resources/views/admin/aircraft/edit.blade.php | 4 +--- resources/views/admin/airlines/create.blade.php | 8 +++----- resources/views/admin/airlines/edit.blade.php | 2 +- resources/views/admin/airports/create.blade.php | 2 +- resources/views/admin/airports/edit.blade.php | 2 +- resources/views/admin/fares/create.blade.php | 6 ++---- resources/views/admin/fares/edit.blade.php | 3 +-- resources/views/admin/flash/message.blade.php | 11 +++++++++++ resources/views/admin/flights/create.blade.php | 2 +- resources/views/admin/flights/edit.blade.php | 2 +- resources/views/admin/pirep_fields/create.blade.php | 2 +- resources/views/admin/pirep_fields/edit.blade.php | 2 +- resources/views/admin/pireps/create.blade.php | 2 +- resources/views/admin/pireps/edit.blade.php | 2 +- resources/views/admin/ranks/create.blade.php | 2 +- resources/views/admin/ranks/edit.blade.php | 2 +- resources/views/admin/subfleets/create.blade.php | 2 +- resources/views/admin/subfleets/edit.blade.php | 2 +- resources/views/admin/users/create.blade.php | 2 +- resources/views/admin/users/edit.blade.php | 3 ++- 21 files changed, 37 insertions(+), 34 deletions(-) create mode 100644 resources/views/admin/flash/message.blade.php diff --git a/resources/views/admin/aircraft/create.blade.php b/resources/views/admin/aircraft/create.blade.php index 8d27dceb..c0111bec 100644 --- a/resources/views/admin/aircraft/create.blade.php +++ b/resources/views/admin/aircraft/create.blade.php @@ -1,13 +1,11 @@ @extends('admin.app') - +@section('title', 'Add Aircraft') @section('content')
-

- Aircraft -

+

Aircraft

- @include('adminlte-templates::common.errors') + @include('admin.flash.message')
diff --git a/resources/views/admin/aircraft/edit.blade.php b/resources/views/admin/aircraft/edit.blade.php index 8fbb46ab..c82078df 100644 --- a/resources/views/admin/aircraft/edit.blade.php +++ b/resources/views/admin/aircraft/edit.blade.php @@ -3,11 +3,9 @@ @section('content')
- @include('adminlte-templates::common.errors') + @include('admin.flash.message') {!! Form::model($aircraft, ['route' => ['admin.aircraft.update', $aircraft->id], 'method' => 'patch']) !!} - @include('admin.aircraft.fields') - {!! Form::close() !!}
diff --git a/resources/views/admin/airlines/create.blade.php b/resources/views/admin/airlines/create.blade.php index 0b1071af..08524876 100644 --- a/resources/views/admin/airlines/create.blade.php +++ b/resources/views/admin/airlines/create.blade.php @@ -1,13 +1,11 @@ @extends('admin.app') - +@section('title', 'Airlines') @section('content')
-

- Airlines -

+

Airlines

- @include('adminlte-templates::common.errors') + @include('admin.flash.message')
diff --git a/resources/views/admin/airlines/edit.blade.php b/resources/views/admin/airlines/edit.blade.php index e2404230..6e22fa32 100644 --- a/resources/views/admin/airlines/edit.blade.php +++ b/resources/views/admin/airlines/edit.blade.php @@ -3,7 +3,7 @@ @section('content')
- @include('adminlte-templates::common.errors') + @include('admin.flash.message') {!! Form::model($airline, ['route' => ['admin.airlines.update', $airline->id], 'method' => 'patch']) !!} @include('admin.airlines.fields') {!! Form::close() !!} diff --git a/resources/views/admin/airports/create.blade.php b/resources/views/admin/airports/create.blade.php index 7c0c3b0f..5f0b574d 100644 --- a/resources/views/admin/airports/create.blade.php +++ b/resources/views/admin/airports/create.blade.php @@ -3,7 +3,7 @@ @section('content')
- @include('adminlte-templates::common.errors') + @include('admin.flash.message') {!! Form::open(['route' => 'admin.airports.store', 'id' => 'airportForm']) !!} @include('admin.airports.fields') {!! Form::close() !!} diff --git a/resources/views/admin/airports/edit.blade.php b/resources/views/admin/airports/edit.blade.php index d23025a5..9f1188e0 100644 --- a/resources/views/admin/airports/edit.blade.php +++ b/resources/views/admin/airports/edit.blade.php @@ -3,7 +3,7 @@ @section('content')
- @include('adminlte-templates::common.errors') + @include('admin.flash.message') {!! Form::model($airport, ['route' => ['admin.airports.update', $airport->id], 'method' => 'patch', 'id' => 'airportForm']) !!} @include('admin.airports.fields') {!! Form::close() !!} diff --git a/resources/views/admin/fares/create.blade.php b/resources/views/admin/fares/create.blade.php index 43145702..b338d013 100644 --- a/resources/views/admin/fares/create.blade.php +++ b/resources/views/admin/fares/create.blade.php @@ -2,12 +2,10 @@ @section('content')
-

- Fare -

+

Fare

- @include('adminlte-templates::common.errors') + @include('admin.flash.message')
diff --git a/resources/views/admin/fares/edit.blade.php b/resources/views/admin/fares/edit.blade.php index dd2cf0c6..78252edd 100644 --- a/resources/views/admin/fares/edit.blade.php +++ b/resources/views/admin/fares/edit.blade.php @@ -1,10 +1,9 @@ @extends('admin.app') - @section('title', "Edit \"$fare->name\"") @section('content')
- @include('adminlte-templates::common.errors') + @include('admin.flash.message') {!! Form::model($fare, ['route' => ['admin.fares.update', $fare->id], 'method' => 'patch']) !!} @include('admin.fares.fields') {!! Form::close() !!} diff --git a/resources/views/admin/flash/message.blade.php b/resources/views/admin/flash/message.blade.php new file mode 100644 index 00000000..f21e829a --- /dev/null +++ b/resources/views/admin/flash/message.blade.php @@ -0,0 +1,11 @@ +@foreach (session('flash_notification', collect())->toArray() as $message) + +@endforeach +{{ session()->forget('flash_notification') }} diff --git a/resources/views/admin/flights/create.blade.php b/resources/views/admin/flights/create.blade.php index 8d1b7286..de047954 100644 --- a/resources/views/admin/flights/create.blade.php +++ b/resources/views/admin/flights/create.blade.php @@ -2,7 +2,7 @@ @section('title', 'Edit Flight') @section('content')
- @include('adminlte-templates::common.errors') + @include('admin.flash.message')
{!! Form::model($flight, ['route' => ['admin.flights.store']]) !!} @include('admin.flights.fields') diff --git a/resources/views/admin/flights/edit.blade.php b/resources/views/admin/flights/edit.blade.php index b30573fd..7a8aeaae 100644 --- a/resources/views/admin/flights/edit.blade.php +++ b/resources/views/admin/flights/edit.blade.php @@ -3,7 +3,7 @@ @section('title', 'Edit Flight') @section('content')
- @include('adminlte-templates::common.errors') + @include('admin.flash.message')
{!! Form::model($flight, ['route' => ['admin.flights.update', $flight->id], 'method' => 'patch']) !!} @include('admin.flights.fields') diff --git a/resources/views/admin/pirep_fields/create.blade.php b/resources/views/admin/pirep_fields/create.blade.php index e1cc06aa..2a468fc9 100644 --- a/resources/views/admin/pirep_fields/create.blade.php +++ b/resources/views/admin/pirep_fields/create.blade.php @@ -5,7 +5,7 @@

Add PIREP Field

- @include('adminlte-templates::common.errors') + @include('admin.flash.message')
diff --git a/resources/views/admin/pirep_fields/edit.blade.php b/resources/views/admin/pirep_fields/edit.blade.php index 87cdff50..0c85b333 100644 --- a/resources/views/admin/pirep_fields/edit.blade.php +++ b/resources/views/admin/pirep_fields/edit.blade.php @@ -5,7 +5,7 @@

Edit "{!! $field->name !!}"

- @include('adminlte-templates::common.errors') + @include('admin.flash.message')
diff --git a/resources/views/admin/pireps/create.blade.php b/resources/views/admin/pireps/create.blade.php index 64338ea5..64319f94 100644 --- a/resources/views/admin/pireps/create.blade.php +++ b/resources/views/admin/pireps/create.blade.php @@ -7,7 +7,7 @@
- @include('adminlte-templates::common.errors') + @include('admin.flash.message')
diff --git a/resources/views/admin/pireps/edit.blade.php b/resources/views/admin/pireps/edit.blade.php index a421752f..acc67a3d 100644 --- a/resources/views/admin/pireps/edit.blade.php +++ b/resources/views/admin/pireps/edit.blade.php @@ -3,7 +3,7 @@ @section('title', 'Edit ' . $pirep->ident ) @section('content')
- @include('adminlte-templates::common.errors') + @include('admin.flash.message')
{!! Form::model($pirep, ['route' => ['admin.pireps.update', $pirep->id], 'method' => 'patch']) !!} diff --git a/resources/views/admin/ranks/create.blade.php b/resources/views/admin/ranks/create.blade.php index 9ecfc9e5..d1fdf4cc 100644 --- a/resources/views/admin/ranks/create.blade.php +++ b/resources/views/admin/ranks/create.blade.php @@ -2,7 +2,7 @@ @section('content')

Rank

- @include('adminlte-templates::common.errors') + @include('admin.flash.message')
diff --git a/resources/views/admin/ranks/edit.blade.php b/resources/views/admin/ranks/edit.blade.php index 7421c06c..dd6ba4d2 100644 --- a/resources/views/admin/ranks/edit.blade.php +++ b/resources/views/admin/ranks/edit.blade.php @@ -3,7 +3,7 @@ @section('content')
- @include('adminlte-templates::common.errors') + @include('admin.flash.message') {!! Form::model($rank, ['route' => ['admin.ranks.update', $rank->id], 'method' => 'patch']) !!} @include('admin.ranks.fields') {!! Form::close() !!} diff --git a/resources/views/admin/subfleets/create.blade.php b/resources/views/admin/subfleets/create.blade.php index efd4f7f3..08cdfa40 100644 --- a/resources/views/admin/subfleets/create.blade.php +++ b/resources/views/admin/subfleets/create.blade.php @@ -5,7 +5,7 @@

Add Subfleet

- @include('adminlte-templates::common.errors') + @include('admin.flash.message')
diff --git a/resources/views/admin/subfleets/edit.blade.php b/resources/views/admin/subfleets/edit.blade.php index ba715b3f..0d4d3b1a 100644 --- a/resources/views/admin/subfleets/edit.blade.php +++ b/resources/views/admin/subfleets/edit.blade.php @@ -2,7 +2,7 @@ @section('title', "Edit $subfleet->name") @section('content') - @include('adminlte-templates::common.errors') + @include('admin.flash.message')
{!! Form::model($subfleet, ['route' => ['admin.subfleets.update', $subfleet->id], 'method' => 'patch']) !!} diff --git a/resources/views/admin/users/create.blade.php b/resources/views/admin/users/create.blade.php index 0b1071af..338a5818 100644 --- a/resources/views/admin/users/create.blade.php +++ b/resources/views/admin/users/create.blade.php @@ -7,7 +7,7 @@
- @include('adminlte-templates::common.errors') + @include('admin.flash.message')
diff --git a/resources/views/admin/users/edit.blade.php b/resources/views/admin/users/edit.blade.php index 7ed71841..d0a0b5f0 100644 --- a/resources/views/admin/users/edit.blade.php +++ b/resources/views/admin/users/edit.blade.php @@ -1,9 +1,10 @@ @extends('admin.app') @section('title', "Edit \"$user->name\"") +@section('title', 'Edit '. $user->name) @section('content')
- @include('adminlte-templates::common.errors') + @include('admin.flash.message') {!! Form::model($user, ['route' => ['admin.users.update', $user->id], 'method' => 'patch']) !!} @include('admin.users.fields') {!! Form::close() !!}