7.0.0-beta3 Release (#541)
* 391 Notification refactorings (#441) * Refactor notifications to allow easier plugins * Notification refactoring * Formatting * Move news to NewsService; cleanup of events * More refactoring; added send email out for news item and the template * Formatting * Formatting * Fix missing newsRepo (#445) * Refactor and add importer to Installer module #443 (#444) * Refactor and add importer to Installer module #443 * Refactor for finances to use in import * Import groups into roles * Formatting * Formatting * Add interface in installer for import * Notes about importing * Check for installer folder * Formatting * Fix pirep->user mapping * Unused import * Formatting * Replace importer with AJAX powered; better error handling #443 (#447) * Replace importer with AJAX powered; better error handling #443 * Formatting * Fix command line importer * Remove bootstrap cache (#448) * Cleanup the bootstrap/cache directory when packaging * Fix removal of bootstrap cache * Formatting * Stricter checks on ACARS API data (#451) * Stricter checks on ACARS API data * More checks * Fix for flight_number check forcing to exist * Allow nullable on flight_id * Avoid proc_open use #455 (#456) * Use PhpExecutableFinder() closes #457 #458 (#460) * Use DateTimeZone instead of int for creating datetime closes #461 * Fix CSV imports giving Storage class not found #454 (#462) * Fix CSV imports giving Storage class not found #454 * Update yarn files for security alert * Add PHP 7.4 support (#464) * Add PHP 7.4 to build matrix * DB fix * YAML parser fix in test data * Show versions * Package updates * Track used ICAOs * 7.4 METAR parsing fix * METAR parser fix * Formatting * Add meters to response units * Call instance for unit conversion * Return value * Catch exception for unknown quantity * Comment fix * Formatting * METAR parsing fixes on PHP 7.4 * Package updates * More random airport ID * More random airport ID * Properly disable toolbar * Semver written out to version file * Use dev as default identifier * Fix BindingResolutionError when debug toolbar isn't present (#465) * Fix BindingResolutionError when debug toolbar isn't present * Formatting * Split the importer module out from the installer module (#468) * Split the importer module out from the installer module * Cleanup of unused imports * Move updater into separate module #453 * Remove unused imports/formatting * Disable the install and importer modules at the end of the setup * Unused imports; update IJ style * test explicit stage for php+mysql * add more to matrix * Add different MariaDB versions * undo * Cleanup Model doc * Pilots cannot use the dashboard or flights without admin rights (#481) * Use auth middleware instead of specific groups for logged in state * Auth check for admin access * Check user admin access for updates * Formatting * Allow nullable field and calculate distance if nulled for flight import #478 (#482) * Check for no roles being attached #480 (#483) * Return the flight fares if there are no subfleet fares #488 (#489) * Return the flight fares if there are no subfleet fares #488 * Formatting * Formatting * Account for units when entering fuel amounts #493 * Search for ICAO not working properly (#496) * /flights and /flights/search direct to the same endpoint * Properly set the distance/planned_distance on save (#497) * 491 Installation Error (#495) * Disable CSRF token * Add error handling around looking up the theme and set a default * Note about logs in issue template * Formatting * Fix GeoService errors when viewing PIREP #498 (#499) * Add new command to export a specific PIREP for debugging (#501) * Set a default model value for airports on PIREP (#500) * Set a default model value for airports on PIREP * Fix airport icao reference * Default airport models * Catch broader exception writing out config files #491 * style * Add reference to docs on doc site (#502) * Properly create/update rows importing #486 (#503) * Add base Dockerfile for Dockerhub builds (#504) * New subfleet not being attached to an airline on import #479 (#505) * Fix subfleet not being attached to an airline on creation in import #479 * Call airline name with optional() around subfleet * Minor cleanup * Search flights by subfleet #484 (#506) * API level search of flights #484 * Add Subfleet to flights page for search * Make the fuel used optional (#512) * Add make to Docker container * Add getRootDomain() to Utils (#514) * Show admin dropdown for admin-access ability (#515) * Show admin dropdown for admin-access ability closes #509 * Formatting * Check user permissions on the routes #508 (#516) * Check user permissions on the routes #508 * Formatting * Return default value on exception for setting() * Correct text for no subfleets #507 (#518) * Add a public_url() helper #513 (#519) * Reduce number of queries for update check (#520) * Try to clear caches before updating (#522) * Try to clear caches before updating * Add clear-compiled to maintenance cache list * Formatting * Set PIREPs page to public (#526) Set PIREPs page to public * Fix live and route map errors #527 (#528) * Add menu bar for mobile (#529) * Format all blade templates to 2 spaces #530 (#531) * Fix PIREP edit endpoint closes #533 (#534) * Fix import during flight cron #532 (#535) * PIREPS resource except for show (#536) * Use optional() around the airport fields (#537) * Use optional() around the airport fields * Add null-coalesce around full_name * Add link to download ACARS config from profile (#539) * Add link to download ACARS config from profile * Formatting * Update xml config file template (#540)
This commit is contained in:
Nabeel S
@@ -1 +1,2 @@
|
||||
{{ __('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>
|
||||
|
||||
@@ -1,20 +1,20 @@
|
||||
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<link rel="apple-touch-icon" sizes="76x76" href="/assets/frontend/img/apple-icon.png">
|
||||
<link rel="icon" type="image/png" href="/assets/frontend/img/favicon.png">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
|
||||
<title>@yield('title') - {{ config('app.name') }}</title>
|
||||
<meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no' name='viewport' />
|
||||
<link href="https://fonts.googleapis.com/css?family=Montserrat:400,700,200" rel="stylesheet" />
|
||||
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css" />
|
||||
<link href="{{ public_asset('/assets/frontend/css/bootstrap.min.css') }}" rel="stylesheet"/>
|
||||
<link href="{{ public_mix('/assets/frontend/css/now-ui-kit.css') }}" rel="stylesheet"/>
|
||||
<link href="{{ public_asset('/assets/frontend/css/styles.css') }}" rel="stylesheet"/>
|
||||
@yield('css')
|
||||
<meta charset="utf-8"/>
|
||||
<link rel="apple-touch-icon" sizes="76x76" href="/assets/frontend/img/apple-icon.png">
|
||||
<link rel="icon" type="image/png" href="/assets/frontend/img/favicon.png">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
|
||||
<title>@yield('title') - {{ config('app.name') }}</title>
|
||||
<meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no'
|
||||
name='viewport'/>
|
||||
<link href="https://fonts.googleapis.com/css?family=Montserrat:400,700,200" rel="stylesheet"/>
|
||||
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css"/>
|
||||
<link href="{{ public_asset('/assets/frontend/css/bootstrap.min.css') }}" rel="stylesheet"/>
|
||||
<link href="{{ public_mix('/assets/frontend/css/now-ui-kit.css') }}" rel="stylesheet"/>
|
||||
<link href="{{ public_asset('/assets/frontend/css/styles.css') }}" rel="stylesheet"/>
|
||||
@yield('css')
|
||||
</head>
|
||||
|
||||
<body class="login-page" style="background: #067ec1;">
|
||||
@@ -23,21 +23,22 @@
|
||||
<!-- End Navbar -->
|
||||
<div class="page-header">
|
||||
|
||||
<div class="container">
|
||||
@yield('content')
|
||||
</div>
|
||||
<footer class="footer">
|
||||
<div class="container">
|
||||
@yield('content')
|
||||
<div class="copyright">
|
||||
©
|
||||
<script>
|
||||
document.write(new Date().getFullYear())
|
||||
</script>
|
||||
, powered by
|
||||
<a href="http://www.phpvms.net" target="_blank">phpvms</a>. Now-UI by
|
||||
<a href="https://www.creative-tim.com" target="_blank">Creative Tim</a>
|
||||
</div>
|
||||
</div>
|
||||
<footer class="footer">
|
||||
<div class="container">
|
||||
<div class="copyright">
|
||||
©
|
||||
<script>
|
||||
document.write(new Date().getFullYear())
|
||||
</script>, powered by
|
||||
<a href="http://www.phpvms.net" target="_blank">phpvms</a>. Now-UI by
|
||||
<a href="https://www.creative-tim.com" target="_blank">Creative Tim</a>
|
||||
</div>
|
||||
</div>
|
||||
</footer>
|
||||
</footer>
|
||||
</div>
|
||||
</body>
|
||||
|
||||
|
||||
@@ -3,46 +3,46 @@
|
||||
|
||||
<!-- Main Content -->
|
||||
@section('content')
|
||||
<div class="container">
|
||||
<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-body">
|
||||
@if (session('status'))
|
||||
<div class="alert alert-success">
|
||||
{{ session('status') }}
|
||||
</div>
|
||||
@endif
|
||||
<div class="col-md-8 col-md-offset-2">
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">{{ __('Reset Password') }}</div>
|
||||
<div class="panel-body">
|
||||
@if (session('status'))
|
||||
<div class="alert alert-success">
|
||||
{{ session('status') }}
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<form class="form-horizontal" role="form" method="POST" action="{{ url('/password/email') }}">
|
||||
{{ csrf_field() }}
|
||||
<form class="form-horizontal" role="form" method="POST" action="{{ url('/password/email') }}">
|
||||
{{ csrf_field() }}
|
||||
|
||||
<div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}">
|
||||
<label for="email" class="col-md-4 control-label">{{ __('Email Address') }}</label>
|
||||
<div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}">
|
||||
<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>
|
||||
<div class="col-md-6">
|
||||
<input id="email" type="email" class="form-control" name="email" value="{{ old('email') }}" required>
|
||||
|
||||
@if ($errors->has('email'))
|
||||
<span class="help-block">
|
||||
@if ($errors->has('email'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('email') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<div class="col-md-6 col-md-offset-4">
|
||||
<button type="submit" class="btn btn-primary">
|
||||
{{ __('Send Password Reset Link') }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<div class="col-md-6 col-md-offset-4">
|
||||
<button type="submit" class="btn btn-primary">
|
||||
{{ __('Send Password Reset Link') }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
|
||||
@@ -2,73 +2,74 @@
|
||||
@section('title', __('Reset Password'))
|
||||
|
||||
@section('content')
|
||||
<div class="container">
|
||||
<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-body">
|
||||
{{ Form::open([
|
||||
'url' => url('/password/reset'),
|
||||
'method' => 'post',
|
||||
'role' => 'form',
|
||||
'class' => 'form-horizontal',
|
||||
])
|
||||
}}
|
||||
<input type="hidden" name="token" value="{{ $token }}">
|
||||
<div class="col-md-8 col-md-offset-2">
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">{{ __('Reset Password') }}</div>
|
||||
<div class="panel-body">
|
||||
{{ Form::open([
|
||||
'url' => url('/password/reset'),
|
||||
'method' => 'post',
|
||||
'role' => 'form',
|
||||
'class' => 'form-horizontal',
|
||||
])
|
||||
}}
|
||||
<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">{{ __('Email Address') }}</label>
|
||||
<div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}">
|
||||
<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>
|
||||
<div class="col-md-6">
|
||||
<input id="email" type="email" class="form-control" name="email" value="{{ $email or old('email') }}"
|
||||
required autofocus>
|
||||
|
||||
@if ($errors->has('email'))
|
||||
<span class="help-block">
|
||||
@if ($errors->has('email'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('email') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}">
|
||||
<label for="password" class="col-md-4 control-label">{{ __('Password') }}</label>
|
||||
<div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}">
|
||||
<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>
|
||||
<div class="col-md-6">
|
||||
<input id="password" type="password" class="form-control" name="password" required>
|
||||
|
||||
@if ($errors->has('password'))
|
||||
<span class="help-block">
|
||||
@if ($errors->has('password'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('password') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group{{ $errors->has('password_confirmation') ? ' has-error' : '' }}">
|
||||
<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>
|
||||
<div class="form-group{{ $errors->has('password_confirmation') ? ' has-error' : '' }}">
|
||||
<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>
|
||||
|
||||
@if ($errors->has('password_confirmation'))
|
||||
<span class="help-block">
|
||||
@if ($errors->has('password_confirmation'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('password_confirmation') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<div class="col-md-6 col-md-offset-4">
|
||||
<button type="submit" class="btn btn-primary">
|
||||
{{ __('Reset Password') }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
{{ Form::close() }}
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<div class="col-md-6 col-md-offset-4">
|
||||
<button type="submit" class="btn btn-primary">
|
||||
{{ __('Reset Password') }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
{{ Form::close() }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
@section('title', __('auth.registrationpending'))
|
||||
|
||||
@section('content')
|
||||
<div class="row">
|
||||
<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">@lang('auth.pendingmessage')</h2>
|
||||
</div>
|
||||
<div class="flex-center position-ref full-height">
|
||||
<div class="title m-b-md">
|
||||
<h2 class="description">@lang('auth.pendingmessage')</h2>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endsection()
|
||||
|
||||
@@ -2,160 +2,161 @@
|
||||
@section('title', __('auth.register'))
|
||||
|
||||
@section('content')
|
||||
<div class="row">
|
||||
<div class="col-sm-3"></div>
|
||||
<div class="col-sm-6">
|
||||
<div class="row">
|
||||
<div class="col-sm-3"></div>
|
||||
<div class="col-sm-6">
|
||||
|
||||
{{ Form::open(['url' => '/register', 'class' => 'form-signin']) }}
|
||||
{{ Form::open(['url' => '/register', 'class' => 'form-signin']) }}
|
||||
|
||||
<div class="panel periodic-login">
|
||||
<div class="panel periodic-login">
|
||||
<div class="panel-body">
|
||||
<h2>@lang('common.register')</h2>
|
||||
<label for="name" class="control-label">@lang('auth.fullname')</label>
|
||||
<div class="input-group form-group-no-border {{ $errors->has('name') ? 'has-danger' : '' }}">
|
||||
{{ Form::text('name', null, ['class' => 'form-control']) }}
|
||||
</div>
|
||||
@if ($errors->has('name'))
|
||||
<h2>@lang('common.register')</h2>
|
||||
<label for="name" class="control-label">@lang('auth.fullname')</label>
|
||||
<div class="input-group form-group-no-border {{ $errors->has('name') ? 'has-danger' : '' }}">
|
||||
{{ Form::text('name', null, ['class' => 'form-control']) }}
|
||||
</div>
|
||||
@if ($errors->has('name'))
|
||||
<p class="text-danger">{{ $errors->first('name') }}</p>
|
||||
@endif
|
||||
@endif
|
||||
|
||||
<label for="email" class="control-label">@lang('auth.emailaddress')</label>
|
||||
<div class="input-group form-group-no-border {{ $errors->has('email') ? 'has-danger' : '' }}">
|
||||
{{ Form::text('email', null, ['class' => 'form-control']) }}
|
||||
</div>
|
||||
@if ($errors->has('email'))
|
||||
<p class="text-danger">{{ $errors->first('email') }}</p>
|
||||
@endif
|
||||
<label for="email" class="control-label">@lang('auth.emailaddress')</label>
|
||||
<div class="input-group form-group-no-border {{ $errors->has('email') ? 'has-danger' : '' }}">
|
||||
{{ Form::text('email', null, ['class' => 'form-control']) }}
|
||||
</div>
|
||||
@if ($errors->has('email'))
|
||||
<p class="text-danger">{{ $errors->first('email') }}</p>
|
||||
@endif
|
||||
|
||||
<label for="airline" class="control-label">@lang('common.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>
|
||||
@if ($errors->has('airline_id'))
|
||||
<label for="airline" class="control-label">@lang('common.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>
|
||||
@if ($errors->has('airline_id'))
|
||||
<p class="text-danger">{{ $errors->first('airline_id') }}</p>
|
||||
@endif
|
||||
@endif
|
||||
|
||||
<label for="home_airport" class="control-label">@lang('airports.home')</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>
|
||||
@if ($errors->has('home_airport_id'))
|
||||
<label for="home_airport" class="control-label">@lang('airports.home')</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>
|
||||
@if ($errors->has('home_airport_id'))
|
||||
<p class="text-danger">{{ $errors->first('home_airport_id') }}</p>
|
||||
@endif
|
||||
@endif
|
||||
|
||||
<label for="country" class="control-label">@lang('common.country')</label>
|
||||
<div class="input-group form-group-no-border {{ $errors->has('country') ? 'has-danger' : '' }}">
|
||||
{{ Form::select('country', $countries, null, ['class' => 'form-control select2' ]) }}
|
||||
<label for="country" class="control-label">@lang('common.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>
|
||||
@if ($errors->has('country'))
|
||||
<p class="text-danger">{{ $errors->first('country') }}</p>
|
||||
@endif
|
||||
|
||||
<label for="timezone" class="control-label">@lang('common.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>
|
||||
@if ($errors->has('timezone'))
|
||||
<p class="text-danger">{{ $errors->first('timezone') }}</p>
|
||||
@endif
|
||||
|
||||
@if (setting('pilots.allow_transfer_hours') === true)
|
||||
<label for="transfer_time" class="control-label">@lang('auth.transferhours')</label>
|
||||
<div class="input-group form-group-no-border {{ $errors->has('transfer_time') ? 'has-danger' : '' }}">
|
||||
{{ Form::number('transfer_time', 0, ['class' => 'form-control']) }}
|
||||
</div>
|
||||
@if ($errors->has('country'))
|
||||
<p class="text-danger">{{ $errors->first('country') }}</p>
|
||||
@if ($errors->has('transfer_time'))
|
||||
<p class="text-danger">{{ $errors->first('transfer_time') }}</p>
|
||||
@endif
|
||||
@endif
|
||||
|
||||
<label for="timezone" class="control-label">@lang('common.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>
|
||||
@if ($errors->has('timezone'))
|
||||
<p class="text-danger">{{ $errors->first('timezone') }}</p>
|
||||
@endif
|
||||
|
||||
@if (setting('pilots.allow_transfer_hours') === true)
|
||||
<label for="transfer_time" class="control-label">@lang('auth.transferhours')</label>
|
||||
<div class="input-group form-group-no-border {{ $errors->has('transfer_time') ? 'has-danger' : '' }}">
|
||||
{{ Form::number('transfer_time', 0, ['class' => 'form-control']) }}
|
||||
</div>
|
||||
@if ($errors->has('transfer_time'))
|
||||
<p class="text-danger">{{ $errors->first('transfer_time') }}</p>
|
||||
@endif
|
||||
@endif
|
||||
|
||||
<label for="password" class="control-label">@lang('auth.password')</label>
|
||||
<div class="input-group form-group-no-border {{ $errors->has('password') ? 'has-danger' : '' }}">
|
||||
{{ Form::password('password', ['class' => 'form-control']) }}
|
||||
</div>
|
||||
@if ($errors->has('password'))
|
||||
<label for="password" class="control-label">@lang('auth.password')</label>
|
||||
<div class="input-group form-group-no-border {{ $errors->has('password') ? 'has-danger' : '' }}">
|
||||
{{ Form::password('password', ['class' => 'form-control']) }}
|
||||
</div>
|
||||
@if ($errors->has('password'))
|
||||
<p class="text-danger">{{ $errors->first('password') }}</p>
|
||||
@endif
|
||||
@endif
|
||||
|
||||
<label for="password_confirmation" class="control-label">@lang('passwords.confirm')</label>
|
||||
<div class="input-group form-group-no-border {{ $errors->has('password_confirmation') ? 'has-danger' : '' }}">
|
||||
{{ Form::password('password_confirmation', ['class' => 'form-control']) }}
|
||||
<label for="password_confirmation" class="control-label">@lang('passwords.confirm')</label>
|
||||
<div class="input-group form-group-no-border {{ $errors->has('password_confirmation') ? 'has-danger' : '' }}">
|
||||
{{ Form::password('password_confirmation', ['class' => 'form-control']) }}
|
||||
</div>
|
||||
@if ($errors->has('password_confirmation'))
|
||||
<p class="text-danger">{{ $errors->first('password_confirmation') }}</p>
|
||||
@endif
|
||||
|
||||
@if(config('captcha.enabled'))
|
||||
<label for="g-recaptcha-response" class="control-label">@lang('auth.fillcaptcha')</label>
|
||||
<div
|
||||
class="input-group form-group-no-border {{ $errors->has('g-recaptcha-response') ? 'has-danger' : '' }}">
|
||||
{!! NoCaptcha::display(config('captcha.attributes')) !!}
|
||||
</div>
|
||||
@if ($errors->has('password_confirmation'))
|
||||
<p class="text-danger">{{ $errors->first('password_confirmation') }}</p>
|
||||
@if ($errors->has('g-recaptcha-response'))
|
||||
<p class="text-danger">{{ $errors->first('g-recaptcha-response') }}</p>
|
||||
@endif
|
||||
@endif
|
||||
|
||||
@if(config('captcha.enabled'))
|
||||
<label for="g-recaptcha-response" class="control-label">@lang('auth.fillcaptcha')</label>
|
||||
<div class="input-group form-group-no-border {{ $errors->has('g-recaptcha-response') ? 'has-danger' : '' }}">
|
||||
{!! NoCaptcha::display(config('captcha.attributes')) !!}
|
||||
<div>
|
||||
@include('auth.toc')
|
||||
<br/>
|
||||
</div>
|
||||
|
||||
<table>
|
||||
<tr>
|
||||
<td style="vertical-align: top; padding: 5px 10px 0 0">
|
||||
<div class="input-group form-group-no-border">
|
||||
{{ Form::hidden('toc_accepted', 0, false) }}
|
||||
{{ Form::checkbox('toc_accepted', 1, null, ['id' => 'toc_accepted']) }}
|
||||
</div>
|
||||
@if ($errors->has('g-recaptcha-response'))
|
||||
<p class="text-danger">{{ $errors->first('g-recaptcha-response') }}</p>
|
||||
</td>
|
||||
<td style="vertical-align: top;">
|
||||
<label for="toc_accepted" class="control-label">@lang('auth.tocaccept')</label>
|
||||
@if ($errors->has('toc_accepted'))
|
||||
<p class="text-danger">{{ $errors->first('toc_accepted') }}</p>
|
||||
@endif
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<div class="input-group form-group-no-border">
|
||||
{{ Form::hidden('opt_in', 0, false) }}
|
||||
{{ Form::checkbox('opt_in', 1, null) }}
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<label for="opt_in" class="control-label">@lang('profile.opt-in-descrip')</label>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<div>
|
||||
@include('auth.toc')
|
||||
<br />
|
||||
</div>
|
||||
|
||||
<table>
|
||||
<tr>
|
||||
<td style="vertical-align: top; padding: 5px 10px 0 0">
|
||||
<div class="input-group form-group-no-border">
|
||||
{{ Form::hidden('toc_accepted', 0, false) }}
|
||||
{{ Form::checkbox('toc_accepted', 1, null, ['id' => 'toc_accepted']) }}
|
||||
</div>
|
||||
</td>
|
||||
<td style="vertical-align: top;">
|
||||
<label for="toc_accepted" class="control-label">@lang('auth.tocaccept')</label>
|
||||
@if ($errors->has('toc_accepted'))
|
||||
<p class="text-danger">{{ $errors->first('toc_accepted') }}</p>
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<div class="input-group form-group-no-border">
|
||||
{{ Form::hidden('opt_in', 0, false) }}
|
||||
{{ Form::checkbox('opt_in', 1, null) }}
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<label for="opt_in" class="control-label">@lang('profile.opt-in-descrip')</label>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<div style="width: 100%; text-align: right; padding-top: 20px;">
|
||||
{{ Form::submit(__('auth.register'), [
|
||||
'id' => 'register_button',
|
||||
'class' => 'btn btn-primary',
|
||||
'disabled' => true,
|
||||
]) }}
|
||||
</div>
|
||||
<div style="width: 100%; text-align: right; padding-top: 20px;">
|
||||
{{ Form::submit(__('auth.register'), [
|
||||
'id' => 'register_button',
|
||||
'class' => 'btn btn-primary',
|
||||
'disabled' => true,
|
||||
]) }}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
{{ Form::close() }}
|
||||
</div>
|
||||
{{ Form::close() }}
|
||||
</div>
|
||||
<div class="col-sm-4"></div>
|
||||
</div>
|
||||
<div class="col-sm-4"></div>
|
||||
</div>
|
||||
@endsection
|
||||
|
||||
@section('scripts')
|
||||
{!! NoCaptcha::renderJs(config('app.locale')) !!}
|
||||
{!! NoCaptcha::renderJs(config('app.locale')) !!}
|
||||
|
||||
<script>
|
||||
$('#toc_accepted').click(function () {
|
||||
if ($(this).is(':checked')) {
|
||||
console.log('toc accepted');
|
||||
$('#register_button').removeAttr('disabled');
|
||||
} else {
|
||||
console.log('toc not accepted');
|
||||
$('#register_button').attr('disabled', 'true');
|
||||
}
|
||||
});
|
||||
</script>
|
||||
<script>
|
||||
$('#toc_accepted').click(function () {
|
||||
if ($(this).is(':checked')) {
|
||||
console.log('toc accepted');
|
||||
$('#register_button').removeAttr('disabled');
|
||||
} else {
|
||||
console.log('toc not accepted');
|
||||
$('#register_button').attr('disabled', 'true');
|
||||
}
|
||||
});
|
||||
</script>
|
||||
@endsection
|
||||
|
||||
@@ -2,10 +2,10 @@
|
||||
@section('title', __('auth.registrationsubmitted'))
|
||||
|
||||
@section('content')
|
||||
<div class="container registered-page">
|
||||
<div class="container registered-page">
|
||||
<h3>@lang('auth.registrationconfirmation')</h3>
|
||||
<p>
|
||||
@lang('auth.confirmationmessage')
|
||||
@lang('auth.confirmationmessage')
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
|
||||
@@ -2,15 +2,15 @@
|
||||
@section('title', __('auth.registrationdenied'))
|
||||
|
||||
@section('content')
|
||||
<div class="row">
|
||||
<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">
|
||||
@lang('auth.deniedmessage')
|
||||
</h2>
|
||||
</div>
|
||||
<div class="flex-center position-ref full-height">
|
||||
<div class="title m-b-md">
|
||||
<h2 class="description">
|
||||
@lang('auth.deniedmessage')
|
||||
</h2>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
|
||||
@@ -2,15 +2,15 @@
|
||||
@section('title', __('auth.accountsuspended'))
|
||||
|
||||
@section('content')
|
||||
<div class="row">
|
||||
<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">
|
||||
@lang('auth.suspendedmessage')
|
||||
</h2>
|
||||
</div>
|
||||
<div class="flex-center position-ref full-height">
|
||||
<div class="title m-b-md">
|
||||
<h2 class="description">
|
||||
@lang('auth.suspendedmessage')
|
||||
</h2>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
|
||||
@@ -1,31 +1,32 @@
|
||||
@extends('layouts.app')
|
||||
|
||||
@section('content')
|
||||
<div class="container">
|
||||
<div class="container">
|
||||
<div class="row justify-content-center">
|
||||
<div class="col-md-8">
|
||||
<div class="card">
|
||||
<div class="card-header">{{ __('Verify Your Email Address') }}</div>
|
||||
<div class="col-md-8">
|
||||
<div class="card">
|
||||
<div class="card-header">{{ __('Verify Your Email Address') }}</div>
|
||||
|
||||
<div class="card-body">
|
||||
@if (session('resent'))
|
||||
<div class="alert alert-success" role="alert">
|
||||
{{ __('A fresh verification link has been sent to your email address.') }}
|
||||
</div>
|
||||
@endif
|
||||
<div class="card-body">
|
||||
@if (session('resent'))
|
||||
<div class="alert alert-success" role="alert">
|
||||
{{ __('A fresh verification link has been sent to your email address.') }}
|
||||
</div>
|
||||
@endif
|
||||
|
||||
{{ __('Before proceeding, please check your email for a verification link.') }}
|
||||
{{ __('If you did not receive the email') }},
|
||||
{{ __('Before proceeding, please check your email for a verification link.') }}
|
||||
{{ __('If you did not receive the email') }},
|
||||
|
||||
<form class="d-inline" method="POST" action="{{ route('verification.resend') }}">
|
||||
@csrf
|
||||
<button type="submit" class="btn btn-link p-0 m-0 align-baseline">
|
||||
{{ __('click here to request another') }}
|
||||
</button>.
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
<form class="d-inline" method="POST" action="{{ route('verification.resend') }}">
|
||||
@csrf
|
||||
<button type="submit" class="btn btn-link p-0 m-0 align-baseline">
|
||||
{{ __('click here to request another') }}
|
||||
</button>
|
||||
.
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
|
||||
Reference in New Issue
Block a user