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-21 09:53:08 -05: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
resources/views/layouts/default/profile/edit.blade.php
+2 -2
View File
@@ -1,10 +1,10 @@
@extends('app')
@section('title', 'edit profile')
@section('title', __('Edit Profile'))
@section('content')
<div class="row">
<div class="col-md-12">
<h2 class="description">edit your profile</h2>
<h2 class="description">{{ __('Edit Your Profile') }}</h2>
@include('flash::message')
{{ Form::model($user, ['route' => ['frontend.profile.update', $user->id], 'files' => true, 'method' => 'patch']) }}
@include("profile.fields")
resources/views/layouts/default/profile/fields.blade.php
+10 -10
View File
@@ -2,7 +2,7 @@
<div class="col-md-12">
<table class="table">
<tr>
<td>Name</td>
<td>{{ __('Name') }}</td>
<td>
<div class="input-group form-group-no-border{{ $errors->has('name') ? ' has-danger' : '' }}">
{{ Form::text('name', null, ['class' => 'form-control']) }}
@@ -14,7 +14,7 @@
</tr>
<tr>
<td>Email</td>
<td>{{ __('Email') }}</td>
<td>
<div class="input-group form-group-no-border{{ $errors->has('email') ? ' has-danger' : '' }}">
{{ Form::text('email', null, ['class' => 'form-control']) }}
@@ -26,7 +26,7 @@
</tr>
<tr>
<td>Airline</td>
<td>{{ __('Airline') }}</td>
<td>
<div class="input-group form-group-no-border{{ $errors->has('airline') ? ' has-danger' : '' }}">
{{ Form::select('airline_id', $airlines, null , ['class' => 'form-control select2']) }}
@@ -38,7 +38,7 @@
</tr>
<tr>
<td>Home Airport</td>
<td>{{ __('Home Airport') }}</td>
<td>
<div class="input-group form-group-no-border{{ $errors->has('home_airport_id') ? ' has-danger' : '' }}">
{{ Form::select('home_airport_id', $airports, null , ['class' => 'form-control select2']) }}
@@ -50,7 +50,7 @@
</tr>
<tr>
<td>Country</td>
<td>{{ __('Country') }}</td>
<td>
<div class="input-group form-group-no-border{{ $errors->has('country') ? ' has-danger' : '' }}">
{{ Form::select('country', $countries, null, ['class' => 'form-control select2' ]) }}
@@ -62,7 +62,7 @@
</tr>
<tr>
<td>Timezone</td>
<td>{{ __('Timezone') }}</td>
<td>
<div class="input-group form-group-no-border{{ $errors->has('timezone') ? ' has-danger' : '' }}">
{{ Form::select('timezone', $timezones, null, ['class' => 'form-control select2' ]) }}
@@ -74,7 +74,7 @@
</tr>
<tr>
<td>Change Password</td>
<td>{{ __('Change Password') }}</td>
<td>
<div class="input-group form-group-no-border{{ $errors->has('password') ? ' has-danger' : '' }}">
{{ Form::password('password', ['class' => 'form-control']) }}
@@ -83,7 +83,7 @@
<p class="text-danger">{{ $errors->first('password') }}</p>
@endif
<p>Confirm Password:</p>
<p>{{ __('Confirm Password') }}:</p>
<div class="input-group form-group-no-border{{ $errors->has('password_confirmation') ? ' has-danger' : '' }}">
{{ Form::password('password_confirmation', ['class' => 'form-control']) }}
</div>
@@ -92,7 +92,7 @@
@endif
</td>
</tr>
<td>Avatar</td>
<td>{{ __('Avatar') }}</td>
<td>
<div class="input-group form-group-no-border{{ $errors->has('avatar') ? ' has-danger' : '' }}">
{{ Form::file('avatar', null) }}
@@ -106,7 +106,7 @@
</table>
<div style="width: 100%; text-align: right; padding-top: 20px;">
{{ Form::submit('Update Profile', ['class' => 'btn btn-primary']) }}
{{ Form::submit(__('Update Profile'), ['class' => 'btn btn-primary']) }}
</div>
</div>
</div>
resources/views/layouts/default/profile/index.blade.php
+11 -11
View File
@@ -1,5 +1,5 @@
@extends('app')
@section('title', 'profile')
@section('title', __('Profile'))
@section('content')
<div class="row profile-page content-center text-color-dark-beige">
@@ -23,25 +23,25 @@
<div class="content">
<div class="social-description">
<h2>{{ $user->flights}}</h2>
<p>Flights</p>
<p>{{ __trans_choice('Flight', $user->flights) }}</p>
</div>
<div class="social-description">
<h2>{{ \App\Facades\Utils::minutesToTimeString($user->flight_time, false) }}</h2>
<p>Flight Hours</p>
<p>{{ __('Flight Hours') }}</p>
</div>
@if($user->home_airport)
<div class="social-description">
<h2>{{ $user->home_airport->icao }}</h2>
<p>Home Airport</p>
<p>{{ __('Home Airport') }}</p>
</div>
@endif
@if($user->current_airport)
<div class="social-description">
<h2>{{ $user->current_airport->icao }}</h2>
<p>Current Airport</p>
<p>{{ __('Current Airport') }}</p>
</div>
@endif
@@ -58,24 +58,24 @@
<div class="col-sm-12">
<div class="text-right">
<a href="{{ route('frontend.profile.regen_apikey') }}" class="btn btn-warning"
onclick="return confirm('Are you sure? This will reset your API key.')">new api key</a>
onclick="return confirm({{ __('Are you sure? This will reset your API key.') }})">{{ __('New API Key') }}</a>
&nbsp;
<a href="{{ route('frontend.profile.edit', ['id' => $user->id]) }}"
class="btn btn-primary">edit</a>
class="btn btn-primary">{{ __('Edit') }}</a>
</div>
<h3 class="description">your profile</h3>
<h3 class="description">{{ __('Your Profile') }}</h3>
<table class="table table-full-width">
<tr>
<td>Email</td>
<td>{{ __('Email') }}</td>
<td>{{ $user->email }}</td>
</tr>
<tr>
<td>API Key&nbsp;&nbsp;<span class="description">don't share this!</span></td>
<td>{{ __('API Key') }}&nbsp;&nbsp;<span class="description">({{ __('don\'t share this!') }})</span></td>
<td>{{ $user->api_key }}</td>
</tr>
<tr>
<td>Timezone</td>
<td>{{ __('Timezone') }}</td>
<td>{{ $user->timezone }}</td>
</tr>
</table>