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

- fixed an error on finance in admin panel

Browse Source 
- flight ident now use this format: VA IATA(if empty ICAO) + Flight Number + - + Flight Code (without C) + - + Flight Leg (without L)
- added function __trans_choice in helpers.php for translation
- fixed error in flight edit/insert panel not showing/inserting Tuesday in days
- fixed an error occurring when metar retrieved is empty
- edited now-ui-kit.css to align login fields correctly
- added /public/assets/frontend/js/core/jquery-3.3.1.min.js to fix a missed resource error in authentication pages
- added translations file for en and it locales
- translated all the frontend templates
This commit is contained in:
lordwilbur
2018-05-16 08:47:31 +02:00
committed by Nabeel Shahzad
parent 77a2fd70c3
commit ba8a819c7d
58 changed files with 1126 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
resources/views/layouts/default/dashboard/index.blade.php
View File

@@ -1,5 +1,5 @@
@extends('app')
@section('title', 'dashboard')
@section('title', __('Dashboard'))
@section('content')
<div class="row">
@@ -14,7 +14,7 @@
<i class="fas fa-plane icon"></i>
</div>
<h3 class="header">{{ $user->flights }}</h3>
<h5 class="description">{{ str_plural('flight', $user->flights) }}</h5>
<h5 class="description">{{ __trans_choice('Flight', $user->flights) }}</h5>
</div>
</div>
</div>
@@ -26,11 +26,10 @@
<i class="far fa-clock icon"></i>
</div>
<h3 class="header">{{ \App\Facades\Utils::minutesToTimeString($user->flight_time, false)}}</h3>
<h5 class="description">total hours</h5>
<h5 class="description">{{ __('Total Hours') }}</h5>
</div>
</div>
</div>
<div class="col-sm-3">
<div class="card card-primary text-white dashboard-box">
<div class="card-block text-center">
@@ -38,7 +37,7 @@
<i class="fas fa-money-bill-alt icon"></i>
</div>
<h3 class="header">{{ $user->journal->balance }}</h3>
<h5 class="description">your balance</h5>
<h5 class="description">{{ __('Your Balance') }}</h5>
</div>
</div>
</div>
@@ -54,28 +53,25 @@
@else
<h3 class="header">{{ $user->home_airport_id }}</h3>
@endif
<h5 class="description">current airport</h5>
<h5 class="description">{{ __('Current Airport') }}</h5>
</div>
</div>
</div>
</div>
@if($last_pirep === null)
<div class="card">
<div class="nav nav-tabs" role="tablist" style="background: #067ec1; color: #FFF;">
Your Last Report
{{ __('Your Last Report') }}
</div>
@if($last_pirep === null)
<div class="card-block" style="text-align:center;">
No reports yet. <a href="{{ route('frontend.pireps.create') }}">File one now.</a>
{{ __('No reports yet.') }} <a href="{{ route('frontend.pireps.create') }}">{{ __('File one now.') }}</a>
</div>
</div>
@else
<div class="nav nav-tabs" role="tablist" style="background: #067ec1; color: #FFF;">
Your Last Report
</div>
@include('pireps.pirep_card', ['pirep' => $last_pirep])
@endif
</div>
{{ Widget::latestNews(['count' => 1]) }}
@@ -85,7 +81,7 @@
<div class="col-sm-4">
<div class="card">
<div class="nav nav-tabs" role="tablist" style="background: #067ec1; color: #FFF;">
Weather at {{ $current_airport }}
{{ __('Weather at :ICAO', ['ICAO' => $current_airport]) }}
</div>
<div class="card-block">
<!-- Tab panes -->
@@ -97,7 +93,7 @@
<div class="card">
<div class="nav nav-tabs" role="tablist" style="background: #067ec1; color: #FFF;">
Recent Reports
{{ __('Recent Reports') }}
</div>
<div class="card-block">
<!-- Tab panes -->
@@ -109,7 +105,7 @@
<div class="card">
<div class="nav nav-tabs" role="tablist" style="background: #067ec1; color: #FFF;">
Newest Pilots
{{ __('Newest Pilots') }}
</div>
<div class="card-block">
<!-- Tab panes -->