- fixed an error on finance in admin panel
- 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
committed by
Nabeel Shahzad
Nabeel Shahzad
parent
77a2fd70c3
commit
ba8a819c7d
@@ -1 +1 @@
|
||||
Click here to reset your password: <a href="{{ $link = url('password/reset', $token).'?email='.urlencode($user->getEmailForPasswordReset()) }}"> {{ $link }} </a>
|
||||
{{ __('Click here to reset your password') }}: <a href="{{ $link = url('password/reset', $token).'?email='.urlencode($user->getEmailForPasswordReset()) }}"> {{ $link }} </a>
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
</div>
|
||||
</body>
|
||||
|
||||
<script src="{{ public_asset('/assets/frontend/js/core/jquery.3.2.1.min.js') }}" type="text/javascript"></script>
|
||||
<script src="{{ public_asset('/assets/frontend/js/core/jquery-3.3.1.min.js') }}" type="text/javascript"></script>
|
||||
|
||||
@yield('scripts')
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
@extends('auth.layout')
|
||||
@section('title', 'Log In')
|
||||
@section('title', __('Log In'))
|
||||
|
||||
@section('content')
|
||||
<div class="col-md-4 content-center">
|
||||
@@ -51,16 +51,16 @@
|
||||
|
||||
</div>
|
||||
<div class="footer text-center">
|
||||
<button href="#pablo" class="btn btn-primary btn-round btn-lg btn-block">login</button>
|
||||
<button href="#pablo" class="btn btn-primary btn-round btn-lg btn-block">{{ __('Login') }}</button>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<h6>
|
||||
<a href="{{ url('/register') }}" class="link">Create Account</a>
|
||||
<a href="{{ url('/register') }}" class="link">{{ __('Create Account') }}</a>
|
||||
</h6>
|
||||
</div>
|
||||
<div class="pull-right">
|
||||
<h6>
|
||||
<a href="{{ url('/password/reset') }}" class="link">Forgot Password?</a>
|
||||
<a href="{{ url('/password/reset') }}" class="link">{{ __('Forgot Password') }}?</a>
|
||||
</h6>
|
||||
</div>
|
||||
{{ Form::close() }}
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
@extends('app')
|
||||
@section('title', __('Reset Password'))
|
||||
|
||||
<!-- Main Content -->
|
||||
@section('content')
|
||||
@@ -6,7 +7,7 @@
|
||||
<div class="row">
|
||||
<div class="col-md-8 col-md-offset-2">
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">Reset Password</div>
|
||||
<div class="panel-heading">{{ __('Reset Password') }}</div>
|
||||
<div class="panel-body">
|
||||
@if (session('status'))
|
||||
<div class="alert alert-success">
|
||||
@@ -18,7 +19,7 @@
|
||||
{{ csrf_field() }}
|
||||
|
||||
<div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}">
|
||||
<label for="email" class="col-md-4 control-label">E-Mail Address</label>
|
||||
<label for="email" class="col-md-4 control-label">{{ __('Email Address') }}</label>
|
||||
|
||||
<div class="col-md-6">
|
||||
<input id="email" type="email" class="form-control" name="email" value="{{ old('email') }}" required>
|
||||
@@ -34,7 +35,7 @@
|
||||
<div class="form-group">
|
||||
<div class="col-md-6 col-md-offset-4">
|
||||
<button type="submit" class="btn btn-primary">
|
||||
Send Password Reset Link
|
||||
{{ __('Send Password Reset Link') }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
@extends('app')
|
||||
@section('title', 'Reset Password')
|
||||
@section('title', __('Reset Password'))
|
||||
|
||||
@section('content')
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-md-8 col-md-offset-2">
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">Reset Password</div>
|
||||
<div class="panel-heading">{{ __('Reset Password') }}</div>
|
||||
<div class="panel-body">
|
||||
{{ Form::open([
|
||||
'url' => url('/password/reset'),
|
||||
@@ -18,7 +18,7 @@
|
||||
<input type="hidden" name="token" value="{{ $token }}">
|
||||
|
||||
<div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}">
|
||||
<label for="email" class="col-md-4 control-label">E-Mail Address</label>
|
||||
<label for="email" class="col-md-4 control-label">{{ __('Email Address') }}</label>
|
||||
|
||||
<div class="col-md-6">
|
||||
<input id="email" type="email" class="form-control" name="email" value="{{ $email or old('email') }}" required autofocus>
|
||||
@@ -32,7 +32,7 @@
|
||||
</div>
|
||||
|
||||
<div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}">
|
||||
<label for="password" class="col-md-4 control-label">Password</label>
|
||||
<label for="password" class="col-md-4 control-label">{{ __('Password') }}</label>
|
||||
|
||||
<div class="col-md-6">
|
||||
<input id="password" type="password" class="form-control" name="password" required>
|
||||
@@ -46,7 +46,7 @@
|
||||
</div>
|
||||
|
||||
<div class="form-group{{ $errors->has('password_confirmation') ? ' has-error' : '' }}">
|
||||
<label for="password-confirm" class="col-md-4 control-label">Confirm Password</label>
|
||||
<label for="password-confirm" class="col-md-4 control-label">{{ __('Confirm Password') }}</label>
|
||||
<div class="col-md-6">
|
||||
<input id="password-confirm" type="password" class="form-control" name="password_confirmation" required>
|
||||
|
||||
@@ -61,7 +61,7 @@
|
||||
<div class="form-group">
|
||||
<div class="col-md-6 col-md-offset-4">
|
||||
<button type="submit" class="btn btn-primary">
|
||||
Reset Password
|
||||
{{ __('Reset Password') }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
@extends('app')
|
||||
@section('title', 'registration pending')
|
||||
@section('title', __('Registration Pending'))
|
||||
|
||||
@section('content')
|
||||
<div class="row">
|
||||
<div class="col-md-12 " style="text-align: center;">
|
||||
<div class="flex-center position-ref full-height">
|
||||
<div class="title m-b-md">
|
||||
<h2 class="description">your registration is pending approval. please check your email!</h2>
|
||||
<h2 class="description">{{ __('Your registration is pending approval. Please check your email!') }}</h2>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
@extends('app')
|
||||
@section('title', 'register')
|
||||
@section('title', __('Register'))
|
||||
|
||||
@section('content')
|
||||
<div class="row">
|
||||
@@ -10,8 +10,8 @@
|
||||
|
||||
<div class="panel periodic-login">
|
||||
<div class="panel-body">
|
||||
<h2>Register</h2>
|
||||
<label for="name" class="control-label">Full Name</label>
|
||||
<h2>{{ __('Register') }}</h2>
|
||||
<label for="name" class="control-label">{{ __('Full Name') }}</label>
|
||||
<div class="input-group form-group-no-border {{ $errors->has('name') ? 'has-danger' : '' }}">
|
||||
{{ Form::text('name', null, ['class' => 'form-control']) }}
|
||||
</div>
|
||||
@@ -19,7 +19,7 @@
|
||||
<p class="text-danger">{{ $errors->first('name') }}</p>
|
||||
@endif
|
||||
|
||||
<label for="email" class="control-label">Email Address</label>
|
||||
<label for="email" class="control-label">{{ __('Email Address') }}</label>
|
||||
<div class="input-group form-group-no-border {{ $errors->has('email') ? 'has-danger' : '' }}">
|
||||
{{ Form::text('email', null, ['class' => 'form-control']) }}
|
||||
</div>
|
||||
@@ -27,7 +27,7 @@
|
||||
<p class="text-danger">{{ $errors->first('email') }}</p>
|
||||
@endif
|
||||
|
||||
<label for="airline" class="control-label">Airline</label>
|
||||
<label for="airline" class="control-label">{{ __('Airline') }}</label>
|
||||
<div class="input-group form-group-no-border {{ $errors->has('airline') ? 'has-danger' : '' }}">
|
||||
{{ Form::select('airline_id', $airlines, null , ['class' => 'form-control select2']) }}
|
||||
</div>
|
||||
@@ -35,7 +35,7 @@
|
||||
<p class="text-danger">{{ $errors->first('airline_id') }}</p>
|
||||
@endif
|
||||
|
||||
<label for="home_airport" class="control-label">Home Airport</label>
|
||||
<label for="home_airport" class="control-label">{{ __('Home Airport') }}</label>
|
||||
<div class="input-group form-group-no-border {{ $errors->has('home_airport') ? 'has-danger' : '' }}">
|
||||
{{ Form::select('home_airport_id', $airports, null , ['class' => 'form-control select2']) }}
|
||||
</div>
|
||||
@@ -43,7 +43,7 @@
|
||||
<p class="text-danger">{{ $errors->first('home_airport_id') }}</p>
|
||||
@endif
|
||||
|
||||
<label for="country" class="control-label">Country</label>
|
||||
<label for="country" class="control-label">{{ __('Country') }}</label>
|
||||
<div class="input-group form-group-no-border {{ $errors->has('country') ? 'has-danger' : '' }}">
|
||||
{{ Form::select('country', $countries, null, ['class' => 'form-control select2' ]) }}
|
||||
</div>
|
||||
@@ -51,7 +51,7 @@
|
||||
<p class="text-danger">{{ $errors->first('country') }}</p>
|
||||
@endif
|
||||
|
||||
<label for="timezone" class="control-label">Timezone</label>
|
||||
<label for="timezone" class="control-label">{{ __('Timezone') }}</label>
|
||||
<div class="input-group form-group-no-border {{ $errors->has('timezone') ? 'has-danger' : '' }}">
|
||||
{{ Form::select('timezone', $timezones, null, ['id'=>'timezone', 'class' => 'form-control select2' ]) }}
|
||||
</div>
|
||||
@@ -59,7 +59,7 @@
|
||||
<p class="text-danger">{{ $errors->first('timezone') }}</p>
|
||||
@endif
|
||||
|
||||
<label for="password" class="control-label">Password</label>
|
||||
<label for="password" class="control-label">{{ __('Password') }}</label>
|
||||
<div class="input-group form-group-no-border {{ $errors->has('password') ? 'has-danger' : '' }}">
|
||||
{{ Form::password('password', ['class' => 'form-control']) }}
|
||||
</div>
|
||||
@@ -67,7 +67,7 @@
|
||||
<p class="text-danger">{{ $errors->first('password') }}</p>
|
||||
@endif
|
||||
|
||||
<label for="password_confirmation" class="control-label">Confirm Password</label>
|
||||
<label for="password_confirmation" class="control-label">{{ __('Confirm Password') }}</label>
|
||||
<div class="input-group form-group-no-border {{ $errors->has('password_confirmation') ? 'has-danger' : '' }}">
|
||||
{{ Form::password('password_confirmation', ['class' => 'form-control']) }}
|
||||
</div>
|
||||
@@ -76,7 +76,7 @@
|
||||
@endif
|
||||
|
||||
@if(config('captcha.enabled'))
|
||||
<label for="g-recaptcha-response" class="control-label">Fill out the captcha</label>
|
||||
<label for="g-recaptcha-response" class="control-label">{{ __('Fill out the captcha') }}</label>
|
||||
<div class="input-group form-group-no-border {{ $errors->has('g-recaptcha-response') ? 'has-danger' : '' }}">
|
||||
{!! NoCaptcha::display(config('captcha.attributes')) !!}
|
||||
</div>
|
||||
@@ -88,8 +88,8 @@
|
||||
@include('auth.toc')
|
||||
|
||||
<div style="width: 100%; text-align: right; padding-top: 20px;">
|
||||
By registering, you agree to the Term and Conditions<br /><br />
|
||||
{{ Form::submit('Register!', ['class' => 'btn btn-primary']) }}
|
||||
{{ __('By registering, you agree to the Terms and Conditions.') }}<br /><br />
|
||||
{{ Form::submit(__('Register!'), ['class' => 'btn btn-primary']) }}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
@@ -1,12 +1,11 @@
|
||||
@extends('app')
|
||||
@section('title', 'registration submitted')
|
||||
@section('title', __('Registration Submitted'))
|
||||
|
||||
@section('content')
|
||||
<div class="container registered-page">
|
||||
<h3>Registration Confirmation</h3>
|
||||
<h3>{{ __('Registration Confirmation') }}</h3>
|
||||
<p>
|
||||
Your application has been submitted. It requires staff member approval, once a
|
||||
staff member has reviewed your application, you will receive an email confirmation.
|
||||
__('Your application has been submitted. It requires staff member approval, once a\nstaff member has reviewed your application, you will receive a confirmation email.') }}
|
||||
</p>
|
||||
</div>
|
||||
@endsection
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
@extends('app')
|
||||
@section('title', 'registration denied')
|
||||
@section('title', __('Registration Denied'))
|
||||
|
||||
@section('content')
|
||||
<div class="row">
|
||||
@@ -7,7 +7,7 @@
|
||||
<div class="flex-center position-ref full-height">
|
||||
<div class="title m-b-md">
|
||||
<h2 class="description">
|
||||
your registration was denied. please contact an administrator
|
||||
{{ __('Your registration was denied. Please contact an administrator.') }}
|
||||
</h2>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
@extends('app')
|
||||
@section('title', 'account suspended')
|
||||
@section('title', __('Account Suspended'))
|
||||
|
||||
@section('content')
|
||||
<div class="row">
|
||||
@@ -7,7 +7,7 @@
|
||||
<div class="flex-center position-ref full-height">
|
||||
<div class="title m-b-md">
|
||||
<h2 class="description">
|
||||
your has been suspended. please contact an administrator
|
||||
{{ __('Your account has been suspended. Please contact an administrator.') }}
|
||||
</h2>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<h4>Terms and Conditions</h4>
|
||||
<h4>{{ __('Terms and Conditions') }}</h4>
|
||||
<textarea class="form-control" style="height: 150px; border: 1px #ccc solid;">
|
||||
{{ config('app.name') }} offers this Web site, including all information, software,
|
||||
products and services available from this Web site or offered as part of or in conjunction
|
||||
|
||||
Reference in New Issue
Block a user