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

Bundle CSS changes (#421)

Browse Source 
* Bundle CSS changes

* Edit language

* Clickable flight IDs #419

* Fix dropdown menu going offscreen

* formatting
This commit is contained in:
Nabeel S
2019-10-29 13:03:04 -04:00
committed by GitHub
parent 1725ea5a9e
commit a2ea9b29ba
17 changed files with 234 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/assets/admin/js/app.js.map
View File

File diff suppressed because one or more lines are too long

2
public/assets/frontend/css/now-ui-kit.css
View File

File diff suppressed because one or more lines are too long

2
public/assets/frontend/css/now-ui-kit.css.map
View File

File diff suppressed because one or more lines are too long

22
public/assets/frontend/css/styles.css
View File

@@ -108,3 +108,25 @@
.m-b-md {
margin-bottom: 30px;
}
.my-bids {
display: flex;
justify-content: center;
align-items: center;
width: 50%;
margin: 15px;
padding: 10px;
border-radius: .1875rem;
background-color: #fa7a50;
}
.my-bids a {
color: #fff;
text-decoration: none;
text-align: center;
}
.search-form .form-control {
border-radius: 5px;
width: 250px;
}

2
public/assets/frontend/js/app.js.map
View File

File diff suppressed because one or more lines are too long

2
public/assets/installer/css/vendor.css
View File

File diff suppressed because one or more lines are too long

2
public/assets/installer/js/app.js.map
View File

File diff suppressed because one or more lines are too long

12
public/mix-manifest.json
View File

@@ -1,14 +1,14 @@
{
"/assets/frontend/js/app.js": "/assets/frontend/js/app.js?id=88270e919809fead277c",
"/assets/frontend/css/now-ui-kit.css": "/assets/frontend/css/now-ui-kit.css?id=b5787f0d0877f2b14e37",
"/assets/frontend/css/now-ui-kit.css": "/assets/frontend/css/now-ui-kit.css?id=20b82d8dbacf7e058df2",
"/assets/admin/css/vendor.min.css": "/assets/admin/css/vendor.min.css?id=9f24c5e6612e74065901",
"/assets/frontend/js/app.js.map": "/assets/frontend/js/app.js.map?id=8d8dd87c204912b948d8",
"/assets/frontend/css/now-ui-kit.css.map": "/assets/frontend/css/now-ui-kit.css.map?id=cb1b608aa71187b21c09",
"/assets/frontend/js/app.js.map": "/assets/frontend/js/app.js.map?id=0019c21255cb4eca716d",
"/assets/frontend/css/now-ui-kit.css.map": "/assets/frontend/css/now-ui-kit.css.map?id=fdc4f42ad9047d073145",
"/assets/admin/css/vendor.min.css.map": "/assets/admin/css/vendor.min.css.map?id=c266c31652dea865307c",
"/assets/admin/js/app.js": "/assets/admin/js/app.js?id=cd8b03d3b7bd54e960ca",
"/assets/admin/js/app.js.map": "/assets/admin/js/app.js.map?id=27b5a1474145c1c3bc18",
"/assets/admin/js/app.js.map": "/assets/admin/js/app.js.map?id=a43168e6da458119da61",
"/assets/installer/js/app.js": "/assets/installer/js/app.js?id=7eb8b66dce0064082abc",
"/assets/installer/js/app.js.map": "/assets/installer/js/app.js.map?id=fd03a7d60e4cfd02a2c0",
"/assets/installer/js/app.js.map": "/assets/installer/js/app.js.map?id=b277e94eb1368204a7d5",
"/assets/fonts/glyphicons-halflings-regular.woff2": "/assets/fonts/glyphicons-halflings-regular.woff2?id=349344e92fb16221dd56",
"/assets/admin/fonts/glyphicons-halflings-regular.woff2": "/assets/admin/fonts/glyphicons-halflings-regular.woff2?id=349344e92fb16221dd56",
"/assets/admin/img/clear.png": "/assets/admin/img/clear.png?id=63b3af84650a0145d61a",
@@ -19,7 +19,7 @@
"/assets/frontend/js/vendor.js": "/assets/frontend/js/vendor.js?id=7b2f95d32e095b2bbbfa",
"/assets/admin/css/vendor.css": "/assets/admin/css/vendor.css?id=3faf0c4cbfe14c8b99cf",
"/assets/admin/js/vendor.js": "/assets/admin/js/vendor.js?id=ad2f530d0b8e9bd6b6d3",
"/assets/installer/css/vendor.css": "/assets/installer/css/vendor.css?id=9ddcf58750fc5b40bd6c",
"/assets/installer/css/vendor.css": "/assets/installer/css/vendor.css?id=b484734ef5549fc2baae",
"/assets/installer/js/vendor.js": "/assets/installer/js/vendor.js?id=1b8dba4c184ce249e7fe",
"/assets/global/js/vendor.js": "/assets/global/js/vendor.js?id=666b04d3b318da723aff",
"/assets/global/css/vendor.css": "/assets/global/css/vendor.css?id=89afa5863f07a984ffeb"

8
resources/sass/now-ui/now-ui-kit/_phpvms.scss
View File

@@ -5,6 +5,10 @@
@include input-sm-padding($padding-small-vertical, $padding-small-horizontal);
@include input-base-padding($padding-small-vertical, $padding-small-horizontal);
a {
z-index: 99;
}
.form-container {
@extend .form-container;
@@ -26,6 +30,10 @@
padding: 8px;
}
.form-group .form-control {
border-radius: 5px;
}
&:focus {
border: 1px solid $brand-primary;
& + .input-group-addon,

4
resources/views/layouts/default/app.blade.php
View File

@@ -35,8 +35,8 @@
<!-- Navbar -->
<nav class="navbar navbar-expand-lg " style="background: #067ec1;">
<p class="navbar-brand text-white" data-placement="bottom" target="_blank">
<a href="{{ url('/') }}">
<img src="{{ public_asset('/assets/img/logo_blue_bg.svg') }}" width="135px" style=""/>
<a href="{{ url('/') }}" style="margin-left: 20px;">
<img src="{{ public_asset('/assets/img/logo_blue_bg.svg') }}" width="135px" />
</a>
</p>
<div class="collapse navbar-collapse justify-content-end" id="navigation">

22
resources/views/layouts/default/flights/nav.blade.php
View File

@@ -1,27 +1,7 @@
<div class="card">
<div class="card-block" style="min-height: 0px; display: flex; justify-content: center; align-items: center;">
<style>
.my-bids {
display: flex;
justify-content: center;
align-items: center;
width: 50%;
margin: 15px;
padding: 10px;
border-radius: .1875rem;
background-color: #fa7a50;
}
.my-bids a {
color: #fff;
text-decoration: none;
text-align: center;
}
</style>
<div class="form-group text-right btn-primary my-bids">
<a href="{{ route('frontend.flights.bids') }}">{{ trans_choice('flights.mybid', 2) }}</a>
</div>
</div>
</div>
</div>

58
resources/views/layouts/default/flights/search.blade.php
View File

@@ -1,38 +1,32 @@
<h3 class="description">@lang('flights.search')</h3>
<div class="card pull-right">
<div class="card-block" style="min-height: 0px">
<div class="form-group">
{{ Form::open([
'route' => 'frontend.flights.search',
'method' => 'GET',
'class'=>'form-inline'
]) }}
<style>
.form-group .form-control {
width: 250px;
border-radius: 5px;
}
</style>
<div style="margin-left: 5px;">
<p>@lang('flights.flightnumber')</p>
{{ Form::text('flight_number', null, ['class' => 'form-control']) }}
</div>
<div class="card-block" style="min-height: 0px">
<div class="form-group search-form">
{{ Form::open([
'route' => 'frontend.flights.search',
'method' => 'GET',
'class'=>'form-inline'
]) }}
<div style="margin-left: 5px;">
<p>@lang('flights.flightnumber')</p>
{{ Form::text('flight_number', null, ['class' => 'form-control']) }}
</div>
<div style="margin-top: 10px; margin-left: 5px;">
<p>@lang('airports.departure')</p>
{{ Form::select('dep_icao', $airports, null , ['class' => 'form-control']) }}
</div>
<div style="margin-top: 10px; margin-left: 5px;">
<p>@lang('airports.departure')</p>
{{ Form::select('dep_icao', $airports, null , ['class' => 'form-control']) }}
</div>
<div style="margin-top: 10px; margin-left: 5px;">
<p>@lang('airports.arrival')</p>
{{ Form::select('arr_icao', $airports, null , ['class' => 'form-control']) }}
</div>
<div style="margin-top: 10px; margin-left: 5px;">
<p>@lang('airports.arrival')</p>
{{ Form::select('arr_icao', $airports, null , ['class' => 'form-control']) }}
</div>
<div class="clear" style="margin-top: 10px; margin-left: 5px;">
{{ Form::submit(__('common.find'), ['class' => 'btn btn-primary']) }}&nbsp;
<a href="{{ route('frontend.flights.index') }}">@lang('common.reset')</a>
</div>
{{ Form::close() }}
</div>
<div class="clear" style="margin-top: 10px; margin-left: 5px;">
{{ Form::submit(__('common.find'), ['class' => 'btn btn-primary']) }}&nbsp;
<a href="{{ route('frontend.flights.index') }}">@lang('common.reset')</a>
</div>
{{ Form::close() }}
</div>
</div>
</div>
</div>

127
resources/views/layouts/default/flights/table.blade.php
View File

@@ -1,73 +1,70 @@
@foreach($flights as $flight)
<div class="card border-blue-bottom">
<div class="card border-blue-bottom">
<div class="card-body" style="min-height: 0">
<div class="row">
<div class="col-sm-9">
<h5>
<a class="text-c" href="{{ route('frontend.flights.show', [$flight->id]) }}">
{{ $flight->ident }}
</a>
</h5>
</div>
<div class="col-sm-3 text-right">
{{-- NOTE:
Don't remove the "save_flight" class, or the x-id attribute.
It will break the AJAX to save/delete
<div class="row">
<div class="col-sm-9">
<h5>
<a class="text-c" href="{{ route('frontend.flights.show', [$flight->id]) }}">
{{ $flight->ident }}
</a>
</h5>
</div>
<div class="col-sm-3 text-right">
{{-- NOTE:
Don't remove the "save_flight" class, or the x-id attribute.
It will break the AJAX to save/delete
"x-saved-class" is the class to add/remove if the bid exists or not
If you change it, remember to change it in the in-array line as well
--}}
@if (!setting('pilots.only_flights_from_current') || $flight->dpt_airport->icao == Auth::user()->current_airport->icao)
<button class="btn btn-round btn-icon btn-icon-mini
{{ in_array($flight->id, $saved, true) ? 'btn-info':'' }}
save_flight"
x-id="{{ $flight->id }}"
x-saved-class="btn-info"
type="button"
title="@lang('flights.addremovebid')"
>
<i class="fas fa-map-marker"></i>
</button>
@endif
</div>
"x-saved-class" is the class to add/remove if the bid exists or not
If you change it, remember to change it in the in-array line as well
--}}
@if (!setting('pilots.only_flights_from_current') || $flight->dpt_airport->icao == Auth::user()->current_airport->icao)
<button class="btn btn-round btn-icon btn-icon-mini save_flight
{{ in_array($flight->id, $saved, true) ? 'btn-info':'' }}"
x-id="{{ $flight->id }}"
x-saved-class="btn-info"
type="button"
title="@lang('flights.addremovebid')"
>
<i class="fas fa-map-marker"></i>
</button>
@endif
</div>
<div class="row">
<div class="col-sm-5">
{{--<table class="table-condensed"></table>--}}
<span class="title">{{ strtoupper(__('flights.dep')) }}&nbsp;</span>
{{ $flight->dpt_airport->name }}
(<a href="{{route('frontend.airports.show', [
'id' => $flight->dpt_airport->icao
])}}">{{$flight->dpt_airport->icao}}</a>)
@if($flight->dpt_time), {{ $flight->dpt_time }}@endif
<br />
<span class="title">{{ strtoupper(__('flights.arr')) }}&nbsp;</span>
{{ $flight->arr_airport->name }}
(<a href="{{route('frontend.airports.show', [
'id' => $flight->arr_airport->icao
])}}">{{$flight->arr_airport->icao}}</a>)
@if($flight->arr_time), {{ $flight->arr_time }}@endif
<br />
@if($flight->distance)
<span class="title">{{ strtoupper(__('common.distance')) }}&nbsp;</span>
{{ $flight->distance }} {{ setting('units.distance') }}
@endif
<br />
@if($flight->level)
<span class="title">{{ strtoupper(__('flights.level')) }}&nbsp;</span>
{{ $flight->level }} {{ setting('units.altitude') }}
@endif
</div>
<div class="col-sm-7">
<div class="row">
<div class="col-sm-12">
<span class="title">{{ strtoupper(__('flights.route')) }}&nbsp;</span>
{{ $flight->route }}
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-7">
{{--<table class="table-condensed"></table>--}}
<span class="title">{{ strtoupper(__('flights.dep')) }}&nbsp;</span>
{{ $flight->dpt_airport->name }}
(<a href="{{route('frontend.airports.show', [
'id' => $flight->dpt_airport->icao
])}}">{{$flight->dpt_airport->icao}}</a>)
@if($flight->dpt_time), {{ $flight->dpt_time }}@endif
<br/>
<span class="title">{{ strtoupper(__('flights.arr')) }}&nbsp;</span>
{{ $flight->arr_airport->name }}
(<a href="{{route('frontend.airports.show', [
'id' => $flight->arr_airport->icao
])}}">{{$flight->arr_airport->icao}}</a>)
@if($flight->arr_time), {{ $flight->arr_time }}@endif
<br/>
@if($flight->distance)
<span class="title">{{ strtoupper(__('common.distance')) }}&nbsp;</span>
{{ $flight->distance }} {{ setting('units.distance') }}
@endif
<br/>
@if($flight->level)
<span class="title">{{ strtoupper(__('flights.level')) }}&nbsp;</span>
{{ $flight->level }} {{ setting('units.altitude') }}
@endif
</div>
<div class="col-sm-5">
@if($flight->route)
<span class="title">{{ strtoupper(__('flights.route')) }}&nbsp;</span>
{{ $flight->route }}
@endif
</div>
</div>
</div>
</div>
</div>
@endforeach

168
resources/views/layouts/default/nav.blade.php
View File

@@ -1,111 +1,111 @@
<div class="nav-tabs-navigation">
<div class="nav-tabs-wrapper">
<ul class="navbar-nav align-middle">
<ul class="navbar-nav align-middle">
@if(Auth::check())
<li class="nav-item">
<a class="nav-link" href="{{ route('frontend.dashboard.index') }}">
<i class="fas fa-tachometer-alt"></i>
<p>@lang('common.dashboard')</p>
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{{ route('frontend.dashboard.index') }}">
<i class="fas fa-tachometer-alt"></i>
<p>@lang('common.dashboard')</p>
</a>
</li>
@endif
<li class="nav-item">
<a class="nav-link" href="{{ route('frontend.livemap.index') }}">
<i class="fas fa-globe"></i>
<p>@lang('common.livemap')</p>
</a>
<a class="nav-link" href="{{ route('frontend.livemap.index') }}">
<i class="fas fa-globe"></i>
<p>@lang('common.livemap')</p>
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{{ route('frontend.pilots.index') }}">
<i class="fas fa-users"></i>
<p>{{ trans_choice('common.pilot', 2) }}</p>
</a>
<a class="nav-link" href="{{ route('frontend.pilots.index') }}">
<i class="fas fa-users"></i>
<p>{{ trans_choice('common.pilot', 2) }}</p>
</a>
</li>
{{-- Show the module links that don't require being logged in --}}
@foreach($moduleSvc->getFrontendLinks($logged_in=false) as &$link)
<li class="nav-item">
<a class="nav-link" href="{{ url($link['url']) }}">
<i class="{{ $link['icon'] }}"></i>
<p>{{ ($link['title']) }}</p>
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{{ url($link['url']) }}">
<i class="{{ $link['icon'] }}"></i>
<p>{{ ($link['title']) }}</p>
</a>
</li>
@endforeach
@if(!Auth::check())
<li class="nav-item">
<a class="nav-link" href="{{ url('/login') }}">
<i class="fas fa-sign-in-alt"></i>
<p>@lang('common.login')</p>
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{{ url('/register') }}">
<i class="far fa-id-card"></i>
<p>@lang('common.register')</p>
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{{ url('/login') }}">
<i class="fas fa-sign-in-alt"></i>
<p>@lang('common.login')</p>
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{{ url('/register') }}">
<i class="far fa-id-card"></i>
<p>@lang('common.register')</p>
</a>
</li>
@else
<li class="nav-item">
<a class="nav-link" href="{{ route('frontend.flights.index') }}">
<i class="fab fa-avianex"></i>
<p>{{ trans_choice('common.flight', 2) }}</p>
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{{ route('frontend.pireps.index') }}">
<i class="fas fa-cloud-upload-alt"></i>
<p>{{ trans_choice('common.pirep', 2) }}</p>
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{{ route('frontend.downloads.index') }}">
<i class="fas fa-download"></i>
<p>{{ trans_choice('common.download', 2) }}</p>
</a>
</li>
{{-- Show the module links for being logged in --}}
@foreach($moduleSvc->getFrontendLinks($logged_in=true) as &$link)
<li class="nav-item">
<a class="nav-link" href="{{ route('frontend.flights.index') }}">
<i class="fab fa-avianex"></i>
<p>{{ trans_choice('common.flight', 2) }}</p>
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{{ route('frontend.pireps.index') }}">
<i class="fas fa-cloud-upload-alt"></i>
<p>{{ trans_choice('common.pirep', 2) }}</p>
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{{ route('frontend.downloads.index') }}">
<i class="fas fa-download"></i>
<p>{{ trans_choice('common.download', 2) }}</p>
</a>
<a class="nav-link" href="{{ url($link['url']) }}">
<i class="{{ $link['icon'] }}"></i>
<p>{{ ($link['title']) }}</p>
</a>
</li>
@endforeach
{{-- Show the module links for being logged in --}}
@foreach($moduleSvc->getFrontendLinks($logged_in=true) as &$link)
<li class="nav-item">
<a class="nav-link" href="{{ url($link['url']) }}">
<i class="{{ $link['icon'] }}"></i>
<p>{{ ($link['title']) }}</p>
</a>
</li>
@endforeach
<li class="nav-item dropdown ">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button"
data-toggle="dropdown" data-boundary="viewport" aria-haspopup="true" aria-expanded="false">
@if (Auth::user()->avatar == null)
<img src="{{ Auth::user()->gravatar(38) }}" style="height: 38px; width: 38px;">
@else
<img src="{{ Auth::user()->avatar->url }}" style="height: 38px; width: 38px;">
@endif
</a>
<div class="dropdown-menu dropdown-menu-right">
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@if (Auth::user()->avatar == null)
<img src="{{ Auth::user()->gravatar(38) }}" style=" height: 38px; width: 38px;">
@else
<img src="{{ Auth::user()->avatar->url }}" style="height: 38px; width: 38px;">
@endif
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
<a class="dropdown-item" href="{{ route('frontend.profile.index') }}">
<i class="far fa-user"></i>&nbsp;&nbsp;@lang('common.profile')
</a>
<a class="dropdown-item" href="{{ route('frontend.profile.index') }}">
<i class="far fa-user"></i>&nbsp;&nbsp;@lang('common.profile')
</a>
@role('admin')
<a class="dropdown-item" href="{{ url('/admin') }}">
<i class="fas fa-circle-notch"></i>&nbsp;&nbsp;@lang('common.administration')
</a>
@endrole
<a class="dropdown-item" href="{{ url('/logout') }}">
<i class="fas fa-sign-out-alt"></i>&nbsp;&nbsp;@lang('common.logout')
</a>
</div>
</li>
@role('admin')
<a class="dropdown-item" href="{{ url('/admin') }}">
<i class="fas fa-circle-notch"></i>&nbsp;&nbsp;@lang('common.administration')
</a>
@endrole
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="{{ url('/logout') }}">
<i class="fas fa-sign-out-alt"></i>&nbsp;&nbsp;@lang('common.logout')
</a>
</div>
</li>
@endif
</ul>
</ul>
</div>
</div>

5
resources/views/layouts/default/pireps/pirep_card.blade.php
View File

@@ -36,7 +36,7 @@
</div>
<div class="col-sm-10">
<div class="row">
<div class="col-sm-6">
<div class="col-sm-12">
<table class="table-condensed" width="100%">
<tr>
<td nowrap><span class="title">@lang('pireps.flighttime')&nbsp;</span></td>
@@ -59,9 +59,6 @@
</tr>
</table>
</div>
<div class="col-sm-6">
</div>
</div>
</div>
</div>

2
resources/views/layouts/default/pireps/table.blade.php
View File

@@ -61,7 +61,7 @@
class="btn btn-info btn-sm"
style="z-index: 9999"
title="@lang('common.edit')">
edit
@lang('common.edit')
</a>
@endif
</td>

29
resources/views/layouts/default/widgets/latest_pireps.blade.php
View File

@@ -1,16 +1,17 @@
<table>
@foreach($pireps as $p)
<tr>
<td style="padding-right: 10px;">
<span class="title">{{ $p->airline->code }}</span>
</td>
<td>
{{ $p->dpt_airport_id }}-
{{ $p->arr_airport_id }}&nbsp;
@if($p->aircraft)
{{ $p->aircraft->name }}
@endif
</td>
</tr>
@endforeach
@foreach($pireps as $p)
<tr>
<td style="padding-right: 10px;">
<span class="title">{{ $p->airline->code }}</span>
</td>
<td>
<a href="{{route('frontend.airports.show', [$p->dpt_airport_id])}}">{{$p->dpt_airport_id}}</a>
&nbsp;-&nbsp;
<a href="{{route('frontend.airports.show', [$p->arr_airport_id])}}">{{$p->arr_airport_id}}</a>&nbsp;
@if($p->aircraft)
{{ $p->aircraft->name }}
@endif
</td>
</tr>
@endforeach
</table>