Bundle CSS changes (#421)

* 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

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>

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>

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