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

fixed admin route prefix problem and invalid validations

Browse Source
This commit is contained in:
Nabeel Shahzad
2017-06-11 15:37:57 -05:00
parent 8e6313492b
commit 38d8371e0b
13 changed files with 98 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
resources/views/admin/aircraft/fields.blade.php
View File

@@ -1,6 +1,6 @@
<!-- ICAO Field -->
<div class="form-group col-sm-6">
{!! Form::label('icao', 'ICAO:') !!}
{!! Form::label('icao', 'ICAO:') !!} (<a class="small" href="https://www.icao.int/publications/DOC8643/Pages/Search.aspx" target="_blank">find</a>)
{!! Form::text('icao', null, ['class' => 'form-control']) !!}
</div>
@@ -10,24 +10,24 @@
{!! Form::text('name', null, ['class' => 'form-control']) !!}
</div>
<!-- Full Name Field -->
<div class="form-group col-sm-6">
{!! Form::label('full_name', 'Full Name:') !!}
{!! Form::text('full_name', null, ['class' => 'form-control']) !!}
</div>
<!-- Registration Field -->
<div class="form-group col-sm-6">
{!! Form::label('registration', 'Registration:') !!}
{!! Form::text('registration', null, ['class' => 'form-control']) !!}
</div>
<!-- Tail Number Field -->
<div class="form-group col-sm-6">
{!! Form::label('tail_number', 'Tail Number:') !!}
{!! Form::text('tail_number', null, ['class' => 'form-control']) !!}
</div>
<!-- Active Field -->
<div class="form-group col-sm-6">
{!! Form::label('active', 'Active:') !!}
<label class="checkbox-inline">
{!! Form::hidden('active', false) !!}
{!! Form::checkbox('active', '1', null) !!} 1
{!! Form::checkbox('active', '1', true) !!}
</label>
</div>

24
resources/views/admin/aircraft/show_fields.blade.php
View File

@@ -1,47 +1,35 @@
<!-- Id Field -->
<div class="form-group">
{!! Form::label('id', 'ID:') !!}
<p>{!! $aircraft->id !!}</p>
</div>
<!-- Icao Field -->
<div class="form-group">
<div class="form-group col-sm-6">
{!! Form::label('icao', 'ICAO:') !!}
<p>{!! $aircraft->icao !!}</p>
</div>
<!-- Name Field -->
<div class="form-group">
<div class="form-group col-sm-6">
{!! Form::label('name', 'Name:') !!}
<p>{!! $aircraft->name !!}</p>
</div>
<!-- Full Name Field -->
<div class="form-group">
{!! Form::label('full_name', 'Full Name:') !!}
<p>{!! $aircraft->full_name !!}</p>
</div>
<!-- Registration Field -->
<div class="form-group">
<div class="form-group col-sm-6">
{!! Form::label('registration', 'Registration:') !!}
<p>{!! $aircraft->registration !!}</p>
</div>
<!-- Active Field -->
<div class="form-group">
<div class="form-group col-sm-6">
{!! Form::label('active', 'Active:') !!}
<p>{!! $aircraft->active !!}</p>
</div>
<!-- Created At Field -->
<div class="form-group">
<div class="form-group col-sm-6">
{!! Form::label('created_at', 'Created At:') !!}
<p>{!! $aircraft->created_at !!}</p>
</div>
<!-- Updated At Field -->
<div class="form-group">
<div class="form-group col-sm-6">
{!! Form::label('updated_at', 'Updated At:') !!}
<p>{!! $aircraft->updated_at !!}</p>
</div>

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

@@ -9,7 +9,7 @@
<tbody>
@foreach($aircraft as $ac)
<tr>
<td>{!! $ac->icao !!}</td>
<td><a href="{!! route('admin.aircraft.show', [$ac->id]) !!}">{!! $ac->icao !!}</a></td>
<td>{!! $ac->name !!}</td>
<td>{!! $ac->registration !!}</td>
<td>{!! $ac->active !!}</td>

38
resources/views/admin/app.blade.php
View File

@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="UTF-8">
<title>phpVMS Admin</title>
<title>phpvms4 admin</title>
<meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
<link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
@@ -17,7 +17,7 @@
@yield('css')
</head>
<body class="skin-blue sidebar-mini">
<body class="skin-blue-light sidebar">
@if (!Auth::guest())
<div class="wrapper">
<!-- Main Header -->
@@ -37,6 +37,40 @@
<!-- Navbar Right Menu -->
<div class="navbar-custom-menu">
<ul class="nav navbar-nav">
<!-- Tasks: style can be found in dropdown.less -->
<li class="dropdown tasks-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-flag-o"></i>
<span class="label label-danger">10</span>
</a>
<ul class="dropdown-menu">
<li class="header">10 PIREPs to approve</li>
<li>
<!-- inner menu: contains the actual data -->
<ul class="menu">
<li><!-- Task item -->
<a href="#">
<h3>
Design some buttons
<small class="pull-right">20%</small>
</h3>
<div class="progress xs">
<div class="progress-bar progress-bar-aqua" style="width: 20%" role="progressbar" aria-valuenow="20" aria-valuemin="0" aria-valuemax="100">
<span class="sr-only">20% Complete</span>
</div>
</div>
</a>
</li><!-- end task item -->
...
</ul>
</li>
<li class="footer">
<a href="#">View all tasks</a>
</li>
</ul>
</li>
<!-- User Account Menu -->
<li class="dropdown user user-menu">
<!-- Menu Toggle Button -->

16
resources/views/admin/dashboard.blade.php
View File

@@ -12,7 +12,21 @@
<div class="clearfix"></div>
<div class="box box-primary">
<div class="box-body">
wassup
<div class="col-md-3 col-sm-6 col-xs-12">
<div class="info-box bg-aqua">
<span class="info-box-icon"><i class="fa fa-bookmark-o"></i></span>
<div class="info-box-content">
<span class="info-box-text">pireps</span>
<span class="info-box-number">41,410</span>
{{--<div class="progress">
<div class="progress-bar" style="width: 100%"></div>
</div>--}}
<span class="progress-description">
20 to approve
</span>
</div><!-- /.info-box-content -->
</div><!-- /.info-box -->
</div>
</div>
</div>
</div>

19
resources/views/admin/menu.blade.php
View File

@@ -1,2 +1,17 @@
<li><a href="{!! url('/admin/airlines') !!}">airlines</a></li>
<li><a href="{!! url('/admin/aircraft') !!}">aircraft</a></li>
<li class="active">
<a href="{!! url('/admin/dashboard') !!}"><i class="fa fa-circle-o"></i>dashboard</a>
</li>
<li class="header">operations</li>
<li><a href="{!! url('/admin/pireps') !!}"><i class="fa fa-circle-o"></i>
pireps
<span data-toggle="tooltip" title="3 New" class="badge bg-light-blue pull-right">3</span>
</a>
</li>
<li><a href="{!! url('/admin/aircraft') !!}"><i class="fa fa-circle-o"></i>fleet</a></li>
<li><a href="{!! url('/admin/fares') !!}"><i class="fa fa-circle-o"></i>fares</a></li>
<li class="header">config</li>
<li><a href="{!! url('/admin/airlines') !!}"><i class="fa fa-circle-o"></i>airlines</a></li>
<li><a href="{!! url('/admin/airports') !!}"><i class="fa fa-circle-o"></i>airports</a></li>
<li><a href="{!! url('/admin/aircraftclasses') !!}"><i class="fa fa-circle-o"></i>aircraft classes</a></li>