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

admin styling updates/fixes

Browse Source
This commit is contained in:
Nabeel Shahzad
2017-08-24 13:37:54 -05:00
parent 4c61e6eafc
commit c233bc4f36
16 changed files with 273 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/Admin/PirepController.php
View File

@@ -41,8 +41,12 @@ class PirepController extends BaseController
*/
public function index(Request $request)
{
$this->pirepRepo->pushCriteria(new RequestCriteria($request));
$pireps = $this->pirepRepo->all();
$criterea = new RequestCriteria($request);
$this->pirepRepo->pushCriteria($criterea);
$pireps = $this->pirepRepo
->orderBy('created_at', 'desc')
->all();
return view('admin.pireps.index', [
'pireps' => $pireps
@@ -84,7 +88,7 @@ class PirepController extends BaseController
*/
public function show($id)
{
$pirep = $this->pirepRepo->findWithoutFail($id);
$pirep = $this->pirepRepo->find($id);
if (empty($pirep)) {
Flash::error('Pirep not found');

78
public/assets/admin/css/paper-dashboard.css
View File

@@ -1,17 +1,17 @@
/*!
=========================================================
* Paper Dashboard - v1.1.2
=========================================================
* Product Page: http://www.creative-tim.com/product/paper-dashboard
* Copyright 2017 Creative Tim (http://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/paper-dashboard/blob/master/LICENSE.md)
=========================================================
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
*/
/* light colors - used for select dropdown */
.ct-blue {
@@ -137,6 +137,12 @@ strong {
.chart-legend .text-danger, .chart-legend .text-danger:hover {
color: #EB5E28; }
.description,
.card-description,
.footer-big p {
color: #9A9A9A;
font-weight: 300; }
/* General overwrite */
body {
color: #66615b;
@@ -430,6 +436,51 @@ hr {
transition-timing-function: linear,linear;
-webkit-overflow-scrolling: touch; }
/* badges */
.badge {
border-radius: 8px;
padding: 4px 8px;
text-transform: uppercase;
font-size: 0.7142em;
line-height: 12px;
background-color: transparent;
border: 1px solid;
margin-bottom: 5px;
border-radius: 6px; }
.badge-icon {
padding: 0.4em 0.55em; }
.badge-icon i {
font-size: 0.8em; }
.badge-default {
border-color: #514d48;
color: #514d48; }
.badge-primary {
border-color: #7A9E9F;
color: #7A9E9F; }
.badge-info {
border-color: #68B3C8;
color: #68B3C8; }
.badge-success {
border-color: #7AC29A;
color: #7AC29A; }
.badge-warning {
border-color: #F3BB45;
color: #F3BB45; }
.badge-danger {
border-color: #EB5E28;
color: #EB5E28; }
.badge-neutral {
border-color: #FFFFFF;
color: #FFFFFF; }
.btn, .navbar .navbar-nav > li > a.btn {
border-radius: 20px;
box-sizing: border-box;
@@ -1167,6 +1218,7 @@ textarea.form-control {
margin: 0; }
.navbar .navbar-nav > li > a i {
position: relative;
margin-right: 5px;
top: 1px; }
.navbar .navbar-nav > li > a.btn {
margin: 15px 3px;
@@ -1459,13 +1511,23 @@ textarea.form-control {
overflow: visible; }
.card {
border: 0;
border-radius: 6px;
box-shadow: 0 2px 2px rgba(204, 197, 185, 0.5);
background-color: #FFFFFF;
color: #252422;
margin-bottom: 20px;
position: relative;
z-index: 1; }
z-index: 1;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
flex-direction: column;
background-color: #fff; }
.card .card-block {
flex: 1 1 auto;
padding: 1.25rem; }
.card a {
color: #f96332; }
.card .image {
width: 100%;
overflow: hidden;
@@ -1484,6 +1546,10 @@ textarea.form-control {
.card .description {
font-size: 16px;
color: #66615b; }
.card h5 {
font-size: 1.57em;
line-height: 1.4em;
margin-bottom: 15px; }
.card h6 {
font-size: 12px;
margin: 0; }

4
public/assets/admin/css/paper-dashboard.css.map
View File

File diff suppressed because one or more lines are too long

11
public/assets/admin/sass/paper-dashboard.scss
View File

@@ -1,17 +1,17 @@
/*!
=========================================================
* Paper Dashboard - v1.1.2
=========================================================
* Product Page: http://www.creative-tim.com/product/paper-dashboard
* Copyright 2017 Creative Tim (http://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/paper-dashboard/blob/master/LICENSE.md)
=========================================================
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
*/
@@ -23,6 +23,7 @@
// Core CSS
@import "paper/misc";
@import "paper/sidebar-and-main-panel";
@import "paper/badges";
@import "paper/buttons";
@import "paper/inputs";

47
public/assets/admin/sass/paper/_badges.scss Normal file
View File

@@ -0,0 +1,47 @@
/* badges */
.badge {
border-radius: 8px;
padding: 4px 8px;
text-transform: uppercase;
font-size: $font-size-mini;
line-height: 12px;
background-color: $transparent-bg;
border: $border;
margin-bottom: 5px;
border-radius: $border-radius-extreme;
}
.badge-icon {
padding: 0.4em 0.55em;
i {
font-size: 0.8em;
}
}
.badge-default {
@include badge-color($default-color);
}
.badge-primary {
@include badge-color($primary-color);
}
.badge-info {
@include badge-color($info-color);
}
.badge-success {
@include badge-color($success-color);
}
.badge-warning {
@include badge-color($warning-color);
}
.badge-danger {
@include badge-color($danger-color);
}
.badge-neutral {
@include badge-color($white-color);
}

21
public/assets/admin/sass/paper/_cards.scss
View File

@@ -1,4 +1,5 @@
.card{
border: 0;
border-radius: $border-radius-extreme;
box-shadow: 0 2px 2px rgba(204, 197, 185, 0.5);
background-color: #FFFFFF;
@@ -7,6 +8,20 @@
position: relative;
z-index: 1;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
flex-direction: column;
background-color: #fff;
.card-block {
flex: 1 1 auto;
padding: 1.25rem;
}
a {
color: #f96332;
}
.image{
width: 100%;
overflow: hidden;
@@ -32,6 +47,12 @@
color: $font-color;
}
h5 {
font-size: 1.57em;
line-height: 1.4em;
margin-bottom: 15px;
}
h6{
font-size: $font-size-small;
margin: 0;

5
public/assets/admin/sass/paper/_mixins.scss
View File

@@ -1,4 +1,4 @@
//Utilities
//Utilities
@import "mixins/transparency";
@import "mixins/vendor-prefixes";
@@ -6,6 +6,7 @@
//Components
@import "mixins/badges";
@import "mixins/buttons";
@import "mixins/inputs";
@import "mixins/labels";
@@ -14,4 +15,4 @@
@import "mixins/icons";
@import "mixins/cards";
@import "mixins/chartist";
@import "mixins/sidebar";
@import "mixins/sidebar";

1
public/assets/admin/sass/paper/_navbars.scss
View File

@@ -32,6 +32,7 @@
}
i{
position: relative;
margin-right: 5px;
top: 1px;
}
}

7
public/assets/admin/sass/paper/_typography.scss
View File

@@ -117,3 +117,10 @@ strong{
color: $danger-color;
}
}
.description,
.card-description,
.footer-big p {
color: $dark-gray;
font-weight: $font-weight-light;
}

9
public/assets/admin/sass/paper/_variables.scss
View File

@@ -114,6 +114,9 @@ $border-radius-btn-large: 50px !default;
// Cristina: am schimbat aici si s-au modificat inputurile
$margin-bottom: 0 0 10px 0 !default;
$border: 1px solid !default;
$border-radius-extra-small: 0.125rem !default;
$border-radius-tiny: 0.1875rem !default;
$border-radius-small: 3px !default;
$border-radius-base: 4px !default;
$border-radius-large: 6px !default;
@@ -126,6 +129,11 @@ $btn-round-radius: 30px !default;
$height-base: 40px !default;
$btn-icon-font-size: 24px !default;
$btn-icon-size: 56px !default;
$btn-icon-size-mini: 36px !default;
$btn-icon-font-size-mini: 14px !default;
$font-size-base: 14px !default;
$font-size-xs: 12px !default;
$font-size-small: 12px !default;
@@ -142,6 +150,7 @@ $font-size-h6: 0.9em !default;
$font-paragraph: 16px !default;
$font-size-navbar: 16px !default;
$font-size-small: 12px !default;
$font-size-mini: 0.7142em !default;
$font-weight-light: 300 !default;
$font-weight-normal: 400 !default;

4
public/assets/admin/sass/paper/mixins/_badges.scss Normal file
View File

@@ -0,0 +1,4 @@
@mixin badge-color($color) {
border-color: $color;
color: $color;
}

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

@@ -25,6 +25,18 @@
<link href="/assets/admin/css/themify-icons.css" rel="stylesheet">
<style type="text/css">
/*.card {
display: inline-block;
position: relative;
overflow: hidden;
width: 100%;
margin-bottom: 20px;
!*box-shadow: 0px 5px 25px 0px rgba(0, 0, 0, 0.2);*!
}*/
.border-blue-bottom {
border-bottom: 3px solid #067ec1;
}
@yield('css')
</style>

21
resources/views/admin/pireps/index.blade.php
View File

@@ -1,23 +1,8 @@
@extends('admin.app')
@section('title', 'Pilot Reports')
@section('content')
<section class="content-header">
<h1 class="pull-left">PIREPs</h1>
<h1 class="pull-right">
<a class="btn btn-primary pull-right" style="margin-top: -10px;margin-bottom: 5px" href="{!! route('admin.pireps.create') !!}">Add New</a>
</h1>
</section>
<div class="content">
<div class="clearfix"></div>
@include('flash::message')
<div class="clearfix"></div>
<div class="box box-primary">
<div class="box-body">
@include('admin.pireps.table')
</div>
</div>
</div>
@include('admin.pireps.table')
@endsection

24
resources/views/admin/pireps/show.blade.php
View File

@@ -1,23 +1,13 @@
@extends('admin.app')
@section('title', 'pilot report')
@section('actions')
<li><a href="#"><i class="ti-plus"></i>Accept</a></li>
<li><a href="#"><i class="ti-plus"></i>Reject</a></li>
@endsection
@section('content')
<section class="content-header"><h1>PIREP</h1></section>
<section class="content">
<div class="clearfix"></div>
<div class="row">
<div class="card">
@include('admin.pireps.show_fields')
@include('admin.pireps.field_values')
</div>
<div class="box box-primary">
<div class="box-body">
<div class="row">
<div class="col-xs-12">
<h3>fields</h3>
<div class="box-body">
@include('admin.pireps.field_values')
</div>
</div>
</div>
</div>
</div>
</section>
@endsection

9
resources/views/admin/pireps/show_fields.blade.php
View File

@@ -24,8 +24,6 @@
</div>
<div class="form-group col-sm-12">
<div class="box box-primary">
<div class="box-body">
@@ -41,7 +39,12 @@
{!! Form::label('flight_id', 'Flight Id:') !!}
<p>
<a href="{!! route('admin.flights.show', [$pirep->flight_id]) !!}" target="_blank">
{!! $pirep->flight->airline->code !!}{!! $pirep->flight->flight_number !!}
{!! $pirep->airline->code !!}
@if($pirep->flight_id)
{!! $pirep->flight->flight_number !!}
@else
{!! $pirep->flight_number !!}
@endif
</a>
</p>
</div>

66
resources/views/admin/pireps/table.blade.php
View File

@@ -1,3 +1,68 @@
@foreach($pireps as $pirep)
<div class="card border-blue-bottom">
<div class="card-block" style="min-height: 0px">
<div class="row">
<div class="col-sm-2 text-center">
<h5>
<a class="text-c"
href="{!! route('admin.pireps.show', [$pirep->id]) !!}">
{!! $pirep->airline->code !!}
@if($pirep->flight_id)
{!! $pirep->flight->flight_number !!}
@else
{!! $pirep->flight_number !!}
@endif
</a>
</h5>
<div>
@if($pirep->status == config('enums.pirep_status.PENDING'))
<div class="badge badge-warning">Pending</div>
@elseif($pirep->status == config('enums.pirep_status.ACCEPTED'))
<div class="badge badge-success">Accepted</div>
@else
<div class="badge badge-danger">Rejected</div>
@endif
</div>
</div>
<div class="col-sm-10">
<div class="row">
<div class="col-sm-4">
<div>
<span class="description">DEP&nbsp;</span>
{!! $pirep->dpt_airport->icao !!}&nbsp;
<span class="description">ARR&nbsp;</span>
{!! $pirep->arr_airport->icao !!}&nbsp;
</div>
<div><span class="description">Flight Time&nbsp;</span>
{!! Utils::secondsToTime($pirep->flight_time) !!}
</div>
<div><span class="description">Aircraft&nbsp;</span>
{!! $pirep->aircraft->registration !!}
({!! $pirep->aircraft->name !!})
</div>
<div>
<span class="description">Flight Level&nbsp;</span>
{!! $pirep->level !!}
</div>
<div>
<span class="description">File Date&nbsp;</span>
{!! $pirep->created_at !!}
</div>
</div>
<div class="col-sm-4">
<span class="description">more data&nbsp;</span>
</div>
<div class="col-sm-4">
<span class="description">more data&nbsp;</span>
</div>
</div>
</div>
</div>
</div>
</div>
@endforeach
{{--
<table class="table table-hover table-responsive" id="pireps-table">
<thead>
<th>Pilot</th>
@@ -42,3 +107,4 @@
@endforeach
</tbody>
</table>
--}}