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

Cleanup info callouts into components

Browse Source
This commit is contained in:
Nabeel Shahzad 2018-02-22 14:21:00 -06:00
parent 67f6dfc2f4
commit 10b0798a30
10 changed files with 51 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
resources/views/admin/components/info.blade.php Normal file
View File

@ -0,0 +1,10 @@
<div>
<p style="float:left; margin-right: 10px; margin-left: 2px;">
<span style="font-size: 1.0em;">
<i class="fas fa-info-circle" style="color: #067ec1"></i>
</span>
</p>
<p class="category">
{{ $slot }}
</p>
</div>

28
resources/views/admin/fares/fields.blade.php
View File

@ -11,59 +11,51 @@
<div class="row"> <div class="row">
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
{!! Form::label('code', 'Code:') !!}&nbsp;<span class="required">*</span> {!! Form::label('code', 'Code:') !!}&nbsp;<span class="required">*</span>
<div class="callout callout-info"> @component('admin.components.info')
<i class="icon fa fa-info">&nbsp;&nbsp;</i>
How this fare class will show up on a ticket How this fare class will show up on a ticket
</div> @endcomponent
{!! Form::text('code', null, ['class' => 'form-control']) !!} {!! Form::text('code', null, ['class' => 'form-control']) !!}
<p class="text-danger">{{ $errors->first('code') }}</p> <p class="text-danger">{{ $errors->first('code') }}</p>
</div> </div>
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
{!! Form::label('name', 'Name:') !!}&nbsp;<span class="required">*</span> {!! Form::label('name', 'Name:') !!}&nbsp;<span class="required">*</span>
<div class="callout callout-info"> @component('admin.components.info')
<i class="icon fa fa-info">&nbsp;&nbsp;</i>
The fare class name, E.g, "Economy" or "First" The fare class name, E.g, "Economy" or "First"
</div> @endcomponent
{!! Form::text('name', null, ['class' => 'form-control']) !!} {!! Form::text('name', null, ['class' => 'form-control']) !!}
<p class="text-danger">{{ $errors->first('name') }}</p> <p class="text-danger">{{ $errors->first('name') }}</p>
</div> </div>
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
{!! Form::label('price', 'Price:') !!} {!! Form::label('price', 'Price:') !!}
<div class="callout callout-info"> @component('admin.components.info')
<i class="icon fa fa-info">&nbsp;&nbsp;</i>
This is the price of a ticket for a passenger This is the price of a ticket for a passenger
</div> @endcomponent
{!! Form::text('price', null, ['class' => 'form-control', 'placeholder' => 0]) !!} {!! Form::text('price', null, ['class' => 'form-control', 'placeholder' => 0]) !!}
<p class="text-danger">{{ $errors->first('price') }}</p> <p class="text-danger">{{ $errors->first('price') }}</p>
</div> </div>
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
{!! Form::label('cost', 'Cost:') !!} {!! Form::label('cost', 'Cost:') !!}
<div class="callout callout-info"> @component('admin.components.info')
<i class="icon fa fa-info">&nbsp;&nbsp;</i>
The operating cost The operating cost
</div> @endcomponent
{!! Form::text('cost', null, ['class' => 'form-control', 'placeholder' => 0]) !!} {!! Form::text('cost', null, ['class' => 'form-control', 'placeholder' => 0]) !!}
<p class="text-danger">{{ $errors->first('cost') }}</p> <p class="text-danger">{{ $errors->first('cost') }}</p>
</div> </div>
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
{!! Form::label('capacity', 'Capacity:') !!} {!! Form::label('capacity', 'Capacity:') !!}
<div class="callout callout-info"> @component('admin.components.info')
<i class="icon fa fa-info">&nbsp;&nbsp;</i>
The number of seats available in this class. The number of seats available in this class.
</div> @endcomponent
{!! Form::text('capacity', null, ['class' => 'form-control', 'placeholder' => 0]) !!} {!! Form::text('capacity', null, ['class' => 'form-control', 'placeholder' => 0]) !!}
<p class="text-danger">{{ $errors->first('capacity') }}</p> <p class="text-danger">{{ $errors->first('capacity') }}</p>
</div> </div>
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
{!! Form::label('notes', 'Notes:') !!} {!! Form::label('notes', 'Notes:') !!}
<div class="callout callout-info">
&nbsp;
</div>
{!! Form::text('notes', null, ['class' => 'form-control']) !!} {!! Form::text('notes', null, ['class' => 'form-control']) !!}
<p class="text-danger">{{ $errors->first('notes') }}</p> <p class="text-danger">{{ $errors->first('notes') }}</p>
</div> </div>

2
resources/views/admin/fares/table.blade.php
View File

@ -11,7 +11,7 @@
<tbody> <tbody>
@foreach($fares as $fare) @foreach($fares as $fare)
<tr> <tr>
<td>{!! $fare->code !!}</td> <td><a href="{!! route('admin.fares.edit', [$fare->id]) !!}">{!! $fare->code !!}</a></td>
<td>{!! $fare->name !!}</td> <td>{!! $fare->name !!}</td>
<td>{!! $fare->price !!}</td> <td>{!! $fare->price !!}</td>
<td>{!! $fare->cost !!}</td> <td>{!! $fare->cost !!}</td>

5
resources/views/admin/flights/fares.blade.php
View File

@ -1,15 +1,14 @@
<div id="flight_fares_wrapper" class="dataTables_wrapper form-inline dt-bootstrap"> <div id="flight_fares_wrapper" class="dataTables_wrapper form-inline dt-bootstrap">
<div class="header"> <div class="header">
<h3>fares</h3> <h3>fares</h3>
<p class="category"> @component('admin.components.info')
<i class="icon fa fa-info">&nbsp;&nbsp;</i>
Fares assigned to the current flight. These can be overridden, otherwise, 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 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 filed with. Only assign the fares you want to override. They can be set as
a monetary amount, or a percentage. a monetary amount, or a percentage.
<a href="http://docs.phpvms.net/concepts/finances" <a href="http://docs.phpvms.net/concepts/finances"
target="_blank">Read documentation about finances</a>. target="_blank">Read documentation about finances</a>.
</p> @endcomponent
</div> </div>
<table id="flight_fares" <table id="flight_fares"

5
resources/views/admin/flights/subfleets.blade.php
View File

@ -1,7 +1,8 @@
<div id="subfleet_flight_wrapper"> <div id="subfleet_flight_wrapper">
<h3>assigned subfleets</h3> <h3>assigned subfleets</h3>
<br /> @component('admin.components.info')
The subfleets that are assigned to this flight.
@endcomponent
<table class="table table-responsive" id="aircrafts-table"> <table class="table table-responsive" id="aircrafts-table">
<thead> <thead>
<th>Type</th> <th>Type</th>

5
resources/views/admin/pirepfields/table.blade.php
View File

@ -1,10 +1,9 @@
<div class="content table-responsive table-full-width"> <div class="content table-responsive table-full-width">
<div class="header"> <div class="header">
<p class="category"> @component('admin.components.info')
<i class="icon fa fa-info">&nbsp;&nbsp;</i>
PIREP fields are only shown for manual PIREPs. PIREP fields are only shown for manual PIREPs.
</p> @endcomponent
</div> </div>
<table class="table table-hover table-responsive" id="pirepFields-table"> <table class="table table-hover table-responsive" id="pirepFields-table">

3
resources/views/admin/ranks/edit.blade.php
View File

@ -13,6 +13,9 @@
<div class="content"> <div class="content">
<div class="header"> <div class="header">
<h3>subfleets</h3> <h3>subfleets</h3>
@component('admin.components.info')
These are the subfleets this rank is allowed to use
@endcomponent
</div> </div>
<div class="row"> <div class="row">
@include('admin.ranks.subfleets') @include('admin.ranks.subfleets')

11
resources/views/admin/subfleets/fares.blade.php
View File

@ -1,16 +1,13 @@
{{--<div class="row"> <div class="col-12">--}}
<div id="aircraft_fares_wrapper" class="dataTables_wrapper form-inline dt-bootstrap"> <div id="aircraft_fares_wrapper" class="dataTables_wrapper form-inline dt-bootstrap">
<div class="header"> <div class="header">
<h3>fares</h3> <h3>fares</h3>
<p class="category"> @component('admin.components.info')
<i class="icon fa fa-info">&nbsp;&nbsp;</i>
Fares assigned to the current subfleet. These can be overridden, Fares assigned to the current subfleet. These can be overridden,
otherwise, the value used is the default, which comes from the fare. otherwise, the value used is the default, which comes from the fare.
</p> @endcomponent
</div> </div>
<br /> <br />
<table id="aircraft_fares" <table id="aircraft_fares" class="table table-hover">
class="table table-hover dataTable">
<thead> <thead>
<tr> <tr>
<th>name</th> <th>name</th>
@ -64,7 +61,6 @@
{!! Form::select('fare_id', $avail_fares, null, [ {!! Form::select('fare_id', $avail_fares, null, [
'placeholder' => 'Select Fare', 'placeholder' => 'Select Fare',
'class' => 'ac-fare-dropdown form-control input-lg select2', 'class' => 'ac-fare-dropdown form-control input-lg select2',
]) ])
!!} !!}
{!! Form::button('<i class="glyphicon glyphicon-plus"></i> add', {!! Form::button('<i class="glyphicon glyphicon-plus"></i> add',
@ -75,4 +71,3 @@
</div> </div>
</div> </div>
</div> </div>
{{--</div></div>--}}

5
resources/views/admin/subfleets/ranks.blade.php
View File

@ -1,10 +1,9 @@
<div id="subfleet_ranks_wrapper" class="dataTables_wrapper form-inline dt-bootstrap"> <div id="subfleet_ranks_wrapper" class="dataTables_wrapper form-inline dt-bootstrap">
<div class="header"> <div class="header">
<h3>ranks</h3> <h3>ranks</h3>
<p class="category"> @component('admin.components.info')
<i class="icon fa fa-info">&nbsp;&nbsp;</i>
These ranks are allowed to fly aircraft in this subfleet These ranks are allowed to fly aircraft in this subfleet
</p> @endcomponent
</div> </div>
<br /> <br />
<table id="subfleet_ranks" class="table table-hover dataTable"> <table id="subfleet_ranks" class="table table-hover dataTable">

41
resources/views/admin/subfleets/show.blade.php
View File

@ -1,33 +1,22 @@
@extends('admin.app') @extends('admin.app')
@section('title', "$subfleet->name")
@section('content') @section('content')
<section class="content-header"> <div class="card border-blue-bottom">
<h1>{!! $subfleet->name !!}</h1> <div class="content">
</section> @include('admin.subfleets.show_fields')
<div class="content">
<div class="box box-primary">
<div class="box-body">
<div class="row" style="padding-left: 20px">
@include('admin.subfleets.show_fields')
</div>
</div>
</div> </div>
<div class="box box-primary"> </div>
<div class="box-body">
<div class="row"> <div class="card border-blue-bottom">
<div class="col-xs-12"> <div class="content">
<h3>fares</h3> <h3>fares</h3>
<div class="box-body"> @component('admin.components.info')
<div class="callout callout-info"> Fares assigned to the current subfleet. These can be overridden,
<i class="icon fa fa-info">&nbsp;&nbsp;</i> otherwise, the value used is the default, which comes from the fare.
Fares assigned to the current subfleet. These can be overridden, @endcomponent
otherwise, the value used is the default, which comes from the fare.
</div> @include('admin.subfleets.fares')
@include('admin.subfleets.fares')
</div>
</div>
</div>
</div>
</div> </div>
</div> </div>
@endsection @endsection