From 10b0798a30b9403f7002156f94621ac4dbe47dee Mon Sep 17 00:00:00 2001 From: Nabeel Shahzad Date: Thu, 22 Feb 2018 14:21:00 -0600 Subject: [PATCH] Cleanup info callouts into components --- .../views/admin/components/info.blade.php | 10 +++++ resources/views/admin/fares/fields.blade.php | 28 +++++-------- resources/views/admin/fares/table.blade.php | 2 +- resources/views/admin/flights/fares.blade.php | 5 +-- .../views/admin/flights/subfleets.blade.php | 5 ++- .../views/admin/pirepfields/table.blade.php | 5 +-- resources/views/admin/ranks/edit.blade.php | 3 ++ .../views/admin/subfleets/fares.blade.php | 11 ++--- .../views/admin/subfleets/ranks.blade.php | 5 +-- .../views/admin/subfleets/show.blade.php | 41 +++++++------------ 10 files changed, 51 insertions(+), 64 deletions(-) create mode 100644 resources/views/admin/components/info.blade.php diff --git a/resources/views/admin/components/info.blade.php b/resources/views/admin/components/info.blade.php new file mode 100644 index 00000000..b5fed94d --- /dev/null +++ b/resources/views/admin/components/info.blade.php @@ -0,0 +1,10 @@ +
+

+ + + +

+

+ {{ $slot }} +

+
diff --git a/resources/views/admin/fares/fields.blade.php b/resources/views/admin/fares/fields.blade.php index fc35349b..9ae26663 100644 --- a/resources/views/admin/fares/fields.blade.php +++ b/resources/views/admin/fares/fields.blade.php @@ -11,59 +11,51 @@
{!! Form::label('code', 'Code:') !!} * -
-    + @component('admin.components.info') How this fare class will show up on a ticket -
+ @endcomponent {!! Form::text('code', null, ['class' => 'form-control']) !!}

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

{!! Form::label('name', 'Name:') !!} * -
-    + @component('admin.components.info') The fare class name, E.g, "Economy" or "First" -
+ @endcomponent {!! Form::text('name', null, ['class' => 'form-control']) !!}

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

{!! Form::label('price', 'Price:') !!} -
-    + @component('admin.components.info') This is the price of a ticket for a passenger -
+ @endcomponent {!! Form::text('price', null, ['class' => 'form-control', 'placeholder' => 0]) !!}

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

{!! Form::label('cost', 'Cost:') !!} -
-    + @component('admin.components.info') The operating cost -
+ @endcomponent {!! Form::text('cost', null, ['class' => 'form-control', 'placeholder' => 0]) !!}

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

{!! Form::label('capacity', 'Capacity:') !!} -
-    + @component('admin.components.info') The number of seats available in this class. -
+ @endcomponent {!! Form::text('capacity', null, ['class' => 'form-control', 'placeholder' => 0]) !!}

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

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

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

diff --git a/resources/views/admin/fares/table.blade.php b/resources/views/admin/fares/table.blade.php index 7ec9a733..ba24ec45 100644 --- a/resources/views/admin/fares/table.blade.php +++ b/resources/views/admin/fares/table.blade.php @@ -11,7 +11,7 @@ @foreach($fares as $fare) - {!! $fare->code !!} + {!! $fare->code !!} {!! $fare->name !!} {!! $fare->price !!} {!! $fare->cost !!} diff --git a/resources/views/admin/flights/fares.blade.php b/resources/views/admin/flights/fares.blade.php index b80cf57f..060d262d 100644 --- a/resources/views/admin/flights/fares.blade.php +++ b/resources/views/admin/flights/fares.blade.php @@ -1,15 +1,14 @@

fares

-

-    + @component('admin.components.info') Fares assigned to the current flight. These can be overridden, otherwise, the values used come from the subfleet of the aircraft that the flight is filed with. Only assign the fares you want to override. They can be set as a monetary amount, or a percentage. Read documentation about finances. -

+ @endcomponent

assigned subfleets

-
- + @component('admin.components.info') + The subfleets that are assigned to this flight. + @endcomponent
diff --git a/resources/views/admin/pirepfields/table.blade.php b/resources/views/admin/pirepfields/table.blade.php index a4009108..1ddb32e6 100644 --- a/resources/views/admin/pirepfields/table.blade.php +++ b/resources/views/admin/pirepfields/table.blade.php @@ -1,10 +1,9 @@
-

-    + @component('admin.components.info') PIREP fields are only shown for manual PIREPs. -

+ @endcomponent
Type
diff --git a/resources/views/admin/ranks/edit.blade.php b/resources/views/admin/ranks/edit.blade.php index b3154cd9..3052cf0b 100644 --- a/resources/views/admin/ranks/edit.blade.php +++ b/resources/views/admin/ranks/edit.blade.php @@ -13,6 +13,9 @@

subfleets

+ @component('admin.components.info') + These are the subfleets this rank is allowed to use + @endcomponent
@include('admin.ranks.subfleets') diff --git a/resources/views/admin/subfleets/fares.blade.php b/resources/views/admin/subfleets/fares.blade.php index 5a8e7b05..28bfac8b 100644 --- a/resources/views/admin/subfleets/fares.blade.php +++ b/resources/views/admin/subfleets/fares.blade.php @@ -1,16 +1,13 @@ -{{--
--}}

fares

-

-    + @component('admin.components.info') Fares assigned to the current subfleet. These can be overridden, otherwise, the value used is the default, which comes from the fare. -

+ @endcomponent

-
+
@@ -64,7 +61,6 @@ {!! Form::select('fare_id', $avail_fares, null, [ 'placeholder' => 'Select Fare', 'class' => 'ac-fare-dropdown form-control input-lg select2', - ]) !!} {!! Form::button(' add', @@ -75,4 +71,3 @@ -{{----}} diff --git a/resources/views/admin/subfleets/ranks.blade.php b/resources/views/admin/subfleets/ranks.blade.php index 532b7549..ad6d880f 100644 --- a/resources/views/admin/subfleets/ranks.blade.php +++ b/resources/views/admin/subfleets/ranks.blade.php @@ -1,10 +1,9 @@

ranks

-

-    + @component('admin.components.info') These ranks are allowed to fly aircraft in this subfleet -

+ @endcomponent

name
diff --git a/resources/views/admin/subfleets/show.blade.php b/resources/views/admin/subfleets/show.blade.php index efd6e828..391a3e99 100644 --- a/resources/views/admin/subfleets/show.blade.php +++ b/resources/views/admin/subfleets/show.blade.php @@ -1,33 +1,22 @@ @extends('admin.app') +@section('title', "$subfleet->name") @section('content') -
-

{!! $subfleet->name !!}

-
-
-
-
-
- @include('admin.subfleets.show_fields') -
-
+
+
+ @include('admin.subfleets.show_fields')
-
-
-
-
-

fares

-
-
-    - Fares assigned to the current subfleet. These can be overridden, - otherwise, the value used is the default, which comes from the fare. -
- @include('admin.subfleets.fares') -
-
-
-
+
+ +
+
+

fares

+ @component('admin.components.info') + Fares assigned to the current subfleet. These can be overridden, + otherwise, the value used is the default, which comes from the fare. + @endcomponent + + @include('admin.subfleets.fares')
@endsection