{{----}}
@@ -73,17 +75,17 @@
@yield('scripts')
diff --git a/modules/Installer/Resources/views/errors/already-installed.blade.php b/modules/Installer/Resources/views/errors/already-installed.blade.php
index 0952813f..5d15fd1f 100644
--- a/modules/Installer/Resources/views/errors/already-installed.blade.php
+++ b/modules/Installer/Resources/views/errors/already-installed.blade.php
@@ -1,11 +1,11 @@
@extends('installer::app')
@section('content')
-
phpVMS has already been installed! Please remove the modules/Installer folder.
- {{ Form::submit('Go to your site >>', ['class' => 'btn btn-success']) }}
-
phpVMS has already been installed! Please remove the modules/Installer folder.
+ {{ Form::submit('Go to your site >>', ['class' => 'btn btn-success']) }}
+
+ {{ Form::close() }}
@endsection
diff --git a/modules/Installer/Resources/views/flash/check_error.blade.php b/modules/Installer/Resources/views/flash/check_error.blade.php
index cc67ffc0..334aa5fd 100644
--- a/modules/Installer/Resources/views/flash/check_error.blade.php
+++ b/modules/Installer/Resources/views/flash/check_error.blade.php
@@ -1,6 +1,6 @@
@if($errors->has($field))
-
--}}
@endif
diff --git a/modules/Installer/Resources/views/flash/message.blade.php b/modules/Installer/Resources/views/flash/message.blade.php
index d1e269b1..40279a70 100644
--- a/modules/Installer/Resources/views/flash/message.blade.php
+++ b/modules/Installer/Resources/views/flash/message.blade.php
@@ -1,11 +1,11 @@
@foreach (session('flash_notification', []) as $message)
-
@endforeach
{{ session()->forget('flash_notification') }}
diff --git a/modules/Installer/Resources/views/install/dbtest.blade.php b/modules/Installer/Resources/views/install/dbtest.blade.php
index 70a9694b..2917b6bb 100644
--- a/modules/Installer/Resources/views/install/dbtest.blade.php
+++ b/modules/Installer/Resources/views/install/dbtest.blade.php
@@ -1,8 +1,8 @@
-
diff --git a/modules/Installer/Resources/views/install/index-start.blade.php b/modules/Installer/Resources/views/install/index-start.blade.php
index d1be531c..45cd81b2 100644
--- a/modules/Installer/Resources/views/install/index-start.blade.php
+++ b/modules/Installer/Resources/views/install/index-start.blade.php
@@ -2,11 +2,11 @@
@section('title', 'Install phpVMS')
@section('content')
-
phpvms installer
-
Press continue to start
- {{ Form::open(['route' => 'installer.step1', 'method' => 'post']) }}
-
- {{ Form::submit('Start >>', ['class' => 'btn btn-success']) }}
-
- {{ Form::close() }}
+
phpvms installer
+
Press continue to start
+ {{ Form::open(['route' => 'installer.step1', 'method' => 'post']) }}
+
+ {{ Form::submit('Start >>', ['class' => 'btn btn-success']) }}
+
+ {{ Form::close() }}
@endsection
diff --git a/modules/Installer/Resources/views/install/steps/step1-requirements.blade.php b/modules/Installer/Resources/views/install/steps/step1-requirements.blade.php
index 1346e386..9f1405a6 100644
--- a/modules/Installer/Resources/views/install/steps/step1-requirements.blade.php
+++ b/modules/Installer/Resources/views/install/steps/step1-requirements.blade.php
@@ -2,62 +2,66 @@
@section('title', 'Requirements Check')
@section('content')
-
+
{{ Form::open(['route' => 'installer.step2', 'method' => 'GET']) }}
- php version |
-
- | PHP Version: {{ $php['version'] }} |
-
- @if($php['passed'] === true)
- OK!
- @else
- Failed!
- @endif
- |
-
-
- php extensions |
- @foreach($extensions as $ext)
-
- | {{ $ext['ext'] }} |
-
- @if($ext['passed'] === true)
- OK!
- @else
- Failed!
- @endif
- |
-
- @endforeach
+
+ php version |
+
+
+ | PHP Version: {{ $php['version'] }} |
+
+ @if($php['passed'] === true)
+ OK!
+ @else
+ Failed!
+ @endif
+ |
+
+
+ php extensions |
+
+ @foreach($extensions as $ext)
-
- directory permissions
- Make sure these directories have read and write permissions
- |
+ {{ $ext['ext'] }} |
+
+ @if($ext['passed'] === true)
+ OK!
+ @else
+ Failed!
+ @endif
+ |
- @foreach($directories as $dir)
-
- | {{ $dir['dir'] }} |
-
- @if($dir['passed'] === true)
- OK!
- @else
- Failed!
- @endif
- |
-
- @endforeach
+ @endforeach
+
+
+
+ directory permissions
+ Make sure these directories have read and write permissions
+ |
+
+ @foreach($directories as $dir)
+
+ | {{ $dir['dir'] }} |
+
+ @if($dir['passed'] === true)
+ OK!
+ @else
+ Failed!
+ @endif
+ |
+
+ @endforeach
@if($passed === true)
-
- {{ Form::submit('Database Setup >>', ['class' => 'btn btn-success']) }}
-
+
+ {{ Form::submit('Database Setup >>', ['class' => 'btn btn-success']) }}
+
@endif
{{--{{ $php_version }}
{{ $extensions }}
{{ $passed }}--}}
{{ Form::close() }}
-
+
@endsection
diff --git a/modules/Installer/Resources/views/install/steps/step2-db.blade.php b/modules/Installer/Resources/views/install/steps/step2-db.blade.php
index 5de79fed..ac0a17de 100644
--- a/modules/Installer/Resources/views/install/steps/step2-db.blade.php
+++ b/modules/Installer/Resources/views/install/steps/step2-db.blade.php
@@ -1,154 +1,154 @@
@extends('installer::app')
@section('title', 'Database Setup')
@section('content')
-
+
{{ Form::open(['route' => 'installer.envsetup', 'method' => 'POST']) }}
-
- Site Config |
-
+
+ Site Config |
+
-
- | Site Name |
-
-
- {{ Form::input('text', 'site_name', 'phpvms', ['class' => 'form-control']) }}
-
- |
-
+
+ | Site Name |
+
+
+ {{ Form::input('text', 'site_name', 'phpvms', ['class' => 'form-control']) }}
+
+ |
+
-
- | Site URL |
-
-
- {{ Form::input('text', 'site_url', Request::root(), ['class' => 'form-control']) }}
-
- |
-
+
+ | Site URL |
+
+
+ {{ Form::input('text', 'site_url', Request::root(), ['class' => 'form-control']) }}
+
+ |
+
-
- Database Config |
-
+
+ Database Config |
+
-
- Select Database Type |
-
-
- {{ Form::select('db_conn', $db_types, null, ['class' => 'form-control', 'id' => 'db_conn']) }}
-
- |
-
+
+ Select Database Type |
+
+
+ {{ Form::select('db_conn', $db_types, null, ['class' => 'form-control', 'id' => 'db_conn']) }}
+
+ |
+
-
-
- | Database Host |
-
-
- {{ Form::input('text', 'db_host', '127.0.0.1', ['class' => 'form-control']) }}
-
- |
-
+
+
+ | Database Host |
+
+
+ {{ Form::input('text', 'db_host', '127.0.0.1', ['class' => 'form-control']) }}
+
+ |
+
-
- | Database Port |
-
-
- {{ Form::input('text', 'db_port', '3306', ['class' => 'form-control']) }}
-
- |
-
+
+ | Database Port |
+
+
+ {{ Form::input('text', 'db_port', '3306', ['class' => 'form-control']) }}
+
+ |
+
-
- | Database Name |
-
-
- {{ Form::input('text', 'db_name', 'phpvms', ['class' => 'form-control']) }}
-
- |
-
+
+ | Database Name |
+
+
+ {{ Form::input('text', 'db_name', 'phpvms', ['class' => 'form-control']) }}
+
+ |
+
-
- | Database User |
-
-
- {{ Form::input('text', 'db_user', null, ['class' => 'form-control']) }}
-
- |
-
+
+ | Database User |
+
+
+ {{ Form::input('text', 'db_user', null, ['class' => 'form-control']) }}
+
+ |
+
-
- | Database Password |
-
-
- {{ Form::input('text', 'db_pass', null, ['class' => 'form-control']) }}
-
- |
-
+
+ | Database Password |
+
+
+ {{ Form::input('text', 'db_pass', null, ['class' => 'form-control']) }}
+
+ |
+
-
- |
- {{ Form::submit('Test Database Credentials', ['class' => 'btn btn-info', 'id' => 'dbtest_button']) }}
- |
-
-
+
+ |
+ {{ Form::submit('Test Database Credentials', ['class' => 'btn btn-info', 'id' => 'dbtest_button']) }}
+ |
+
+
-
+
-
+
-
- | Database Prefix |
-
-
- |
-
+
+ | Database Prefix |
+
+
+ |
+
- {{ Form::submit('Setup Database >>', ['class' => 'btn btn-success']) }}
+ {{ Form::submit('Setup Database >>', ['class' => 'btn btn-success']) }}
{{ Form::close() }}
-
+
@endsection
@section('scripts')
-
+ })
+ });
+
@endsection
diff --git a/modules/Installer/Resources/views/install/steps/step2a-db_output.blade.php b/modules/Installer/Resources/views/install/steps/step2a-db_output.blade.php
index 7a0d8eac..f69f1b21 100644
--- a/modules/Installer/Resources/views/install/steps/step2a-db_output.blade.php
+++ b/modules/Installer/Resources/views/install/steps/step2a-db_output.blade.php
@@ -1,19 +1,19 @@
@extends('installer::app')
@section('title', 'Database Setup Completed')
@section('content')
-
+
{{ Form::open(['route' => 'installer.step3', 'method' => 'GET']) }}
{{----}}
- {{ $console_output }}
+ {{ $console_output }}
- {{ Form::submit('Continue >>', ['class' => 'btn btn-success']) }}
+ {{ Form::submit('Continue >>', ['class' => 'btn btn-success']) }}
{{ Form::close() }}
-
+
@endsection
diff --git a/modules/Installer/Resources/views/install/steps/step3-user.blade.php b/modules/Installer/Resources/views/install/steps/step3-user.blade.php
index 8b1ae320..fe26b71b 100644
--- a/modules/Installer/Resources/views/install/steps/step3-user.blade.php
+++ b/modules/Installer/Resources/views/install/steps/step3-user.blade.php
@@ -2,117 +2,118 @@
@section('title', 'User Setup')
@section('content')
-
-
- {{ Form::open(['route' => 'installer.usersetup', 'method' => 'POST']) }}
-
+
+
+
+ {{ Form::open(['route' => 'installer.usersetup', 'method' => 'POST']) }}
+
-
- |
- Importing from a legacy install?
- |
-
+
+ |
+ Importing from a legacy install?
+ |
+
-
+
Airline Information |
-
+
-
+
Airline ICAO |
-
- {{ Form::input('text', 'airline_icao', null, ['class' => 'form-control']) }}
- @include('installer::flash/check_error', ['field' => 'airline_icao'])
-
+
+ {{ Form::input('text', 'airline_icao', null, ['class' => 'form-control']) }}
+ @include('installer::flash/check_error', ['field' => 'airline_icao'])
+
|
-
+
-
+
Airline Name |
-
- {{ Form::input('text', 'airline_name', null, ['class' => 'form-control']) }}
- @include('installer::flash/check_error', ['field' => 'airline_name'])
-
+
+ {{ Form::input('text', 'airline_name', null, ['class' => 'form-control']) }}
+ @include('installer::flash/check_error', ['field' => 'airline_name'])
+
|
-
+
-
+
Airline Country |
-
- {{ Form::select('airline_country', $countries, null, ['class' => 'form-control select2' ]) }}
- @include('installer::flash/check_error', ['field' => 'airline_country'])
-
+
+ {{ Form::select('airline_country', $countries, null, ['class' => 'form-control select2' ]) }}
+ @include('installer::flash/check_error', ['field' => 'airline_country'])
+
|
-
+
-
+
First User |
-
+
-
+
Name |
-
- {{ Form::input('text', 'name', null, ['class' => 'form-control']) }}
- @include('installer::flash/check_error', ['field' => 'name'])
-
+
+ {{ Form::input('text', 'name', null, ['class' => 'form-control']) }}
+ @include('installer::flash/check_error', ['field' => 'name'])
+
|
-
+
-
+
Email |
-
- {{ Form::input('text', 'email', null, ['class' => 'form-control']) }}
- @include('installer::flash/check_error', ['field' => 'email'])
-
+
+ {{ Form::input('text', 'email', null, ['class' => 'form-control']) }}
+ @include('installer::flash/check_error', ['field' => 'email'])
+
|
-
+
-
+
Password |
- {{ Form::password('password', ['class' => 'form-control']) }}
- @include('installer::flash/check_error', ['field' => 'password'])
+ {{ Form::password('password', ['class' => 'form-control']) }}
+ @include('installer::flash/check_error', ['field' => 'password'])
|
-
+
-
+
Password Confirm |
- {{ Form::password('password_confirmation', ['class' => 'form-control']) }}
- @include('installer::flash/check_error', ['field' => 'password_confirmation'])
+ {{ Form::password('password_confirmation', ['class' => 'form-control']) }}
+ @include('installer::flash/check_error', ['field' => 'password_confirmation'])
|
-
+
-
+
Options |
-
+
-
+
Analytics |
-
+
|
-
-
-
-
- {{ Form::submit('Complete Setup >>', ['class' => 'btn btn-success']) }}
-
- {{ Form::close() }}
-
-
+
+
+
+
+ {{ Form::submit('Complete Setup >>', ['class' => 'btn btn-success']) }}
+
+ {{ Form::close() }}
+
+
@endsection
diff --git a/modules/Installer/Resources/views/install/steps/step3a-completed.blade.php b/modules/Installer/Resources/views/install/steps/step3a-completed.blade.php
index 5a425cbd..80fa9463 100644
--- a/modules/Installer/Resources/views/install/steps/step3a-completed.blade.php
+++ b/modules/Installer/Resources/views/install/steps/step3a-completed.blade.php
@@ -2,19 +2,19 @@
@section('title', 'Installation Completed!')
@section('content')
-
- {{ Form::open(['route' => 'installer.complete', 'method' => 'GET']) }}
+
+ {{ Form::open(['route' => 'installer.complete', 'method' => 'GET']) }}
-
Installer Completed!
+
Installer Completed!
-
Edit the config.php to fill in some additional settings.
-
Click the button to proceed to the login screen!
+
Edit the config.php to fill in some additional settings.
+
Click the button to proceed to the login screen!
-
- {{ Form::submit('Install Complete! Continue to Log-In >>',
- ['class' => 'btn btn-success'])
- }}
-
- {{ Form::close() }}
-
+
+ {{ Form::submit('Install Complete! Continue to Log-In >>',
+ ['class' => 'btn btn-success'])
+ }}
+
+ {{ Form::close() }}
+
@endsection
diff --git a/modules/Installer/Resources/views/update/index-start.blade.php b/modules/Installer/Resources/views/update/index-start.blade.php
index fefb0b7d..c1e7fefe 100644
--- a/modules/Installer/Resources/views/update/index-start.blade.php
+++ b/modules/Installer/Resources/views/update/index-start.blade.php
@@ -2,11 +2,11 @@
@section('title', 'Update phpVMS')
@section('content')
-
phpvms updater
-
Press continue to check if there are any updates available.
- {{ Form::open(['route' => 'update.step1', 'method' => 'post']) }}
-
- {{ Form::submit('Start >>', ['class' => 'btn btn-success']) }}
-
- {{ Form::close() }}
+
phpvms updater
+
Press continue to check if there are any updates available.
+ {{ Form::open(['route' => 'update.step1', 'method' => 'post']) }}
+
+ {{ Form::submit('Start >>', ['class' => 'btn btn-success']) }}
+
+ {{ Form::close() }}
@endsection
diff --git a/modules/Installer/Resources/views/update/steps/step1-no-update.blade.php b/modules/Installer/Resources/views/update/steps/step1-no-update.blade.php
index fd636611..52a5383a 100644
--- a/modules/Installer/Resources/views/update/steps/step1-no-update.blade.php
+++ b/modules/Installer/Resources/views/update/steps/step1-no-update.blade.php
@@ -2,12 +2,12 @@
@section('title', 'Update phpVMS')
@section('content')
-
phpvms updater
-
It seems like you're up to date!
- {{ Form::open(['route' => 'update.complete', 'method' => 'GET']) }}
+
phpvms updater
+
It seems like you're up to date!
+ {{ Form::open(['route' => 'update.complete', 'method' => 'GET']) }}
-
- {{ Form::submit('Complete >>', ['class' => 'btn btn-success']) }}
-
- {{ Form::close() }}
+
+ {{ Form::submit('Complete >>', ['class' => 'btn btn-success']) }}
+
+ {{ Form::close() }}
@endsection
diff --git a/modules/Installer/Resources/views/update/steps/step1-update-available.blade.php b/modules/Installer/Resources/views/update/steps/step1-update-available.blade.php
index 5503a60f..21d2f346 100644
--- a/modules/Installer/Resources/views/update/steps/step1-update-available.blade.php
+++ b/modules/Installer/Resources/views/update/steps/step1-update-available.blade.php
@@ -2,11 +2,11 @@
@section('title', 'Update phpVMS')
@section('content')
-
phpvms updater
-
Click run to complete the update!.
- {{ Form::open(['route' => 'update.run_migrations', 'method' => 'post']) }}
-
- {{ Form::submit('Run >>', ['class' => 'btn btn-success']) }}
-
- {{ Form::close() }}
+
phpvms updater
+
Click run to complete the update!.
+ {{ Form::open(['route' => 'update.run_migrations', 'method' => 'post']) }}
+
+ {{ Form::submit('Run >>', ['class' => 'btn btn-success']) }}
+
+ {{ Form::close() }}
@endsection
diff --git a/modules/Installer/Resources/views/update/steps/step2-migrations-done.blade.php b/modules/Installer/Resources/views/update/steps/step2-migrations-done.blade.php
index 540705d4..19fd4000 100644
--- a/modules/Installer/Resources/views/update/steps/step2-migrations-done.blade.php
+++ b/modules/Installer/Resources/views/update/steps/step2-migrations-done.blade.php
@@ -1,18 +1,18 @@
@extends('installer::app')
@section('title', 'Update Completed')
@section('content')
-
- {{ Form::open(['route' => 'update.complete', 'method' => 'GET']) }}
+
+ {{ Form::open(['route' => 'update.complete', 'method' => 'GET']) }}
-
+
{{ $console_output }}
-
- {{ Form::submit('Complete >>', ['class' => 'btn btn-success']) }}
-
- {{ Form::close() }}
-
+
+ {{ Form::submit('Complete >>', ['class' => 'btn btn-success']) }}
+
+ {{ Form::close() }}
+
@endsection
diff --git a/modules/Installer/Resources/views/update/steps/step3-update-complete.blade.php b/modules/Installer/Resources/views/update/steps/step3-update-complete.blade.php
index bcd4cd66..c8851e96 100644
--- a/modules/Installer/Resources/views/update/steps/step3-update-complete.blade.php
+++ b/modules/Installer/Resources/views/update/steps/step3-update-complete.blade.php
@@ -2,12 +2,12 @@
@section('title', 'Update Completed')
@section('content')
-
phpvms updater
-
Update completed!.
+
phpvms updater
+
Update completed!.
- {{ Form::open(['route' => 'update.complete', 'method' => 'GET']) }}
-
- {{ Form::submit('Finish >>', ['class' => 'btn btn-success']) }}
-
- {{ Form::close() }}
+ {{ Form::open(['route' => 'update.complete', 'method' => 'GET']) }}
+
+ {{ Form::submit('Finish >>', ['class' => 'btn btn-success']) }}
+
+ {{ Form::close() }}
@endsection
diff --git a/modules/Sample/Resources/views/admin/create.blade.php b/modules/Sample/Resources/views/admin/create.blade.php
index 97403ae4..dd55d46a 100644
--- a/modules/Sample/Resources/views/admin/create.blade.php
+++ b/modules/Sample/Resources/views/admin/create.blade.php
@@ -5,10 +5,10 @@
@endsection
@section('content')
-
-
+
@endsection
diff --git a/modules/Sample/Resources/views/admin/index.blade.php b/modules/Sample/Resources/views/admin/index.blade.php
index 50b536cd..0d994bc9 100644
--- a/modules/Sample/Resources/views/admin/index.blade.php
+++ b/modules/Sample/Resources/views/admin/index.blade.php
@@ -2,17 +2,17 @@
@section('title', 'Sample')
@section('actions')
-
-
-
- Add New
-
+
+
+
+ Add New
+
@endsection
@section('content')
-
-
-
-
This view is loaded from module: {{ config('sample.name') }}
-
+
+
+
+
This view is loaded from module: {{ config('sample.name') }}
+
@endsection
diff --git a/modules/Sample/Resources/views/index.blade.php b/modules/Sample/Resources/views/index.blade.php
index a6ef647a..4ecd1f5d 100644
--- a/modules/Sample/Resources/views/index.blade.php
+++ b/modules/Sample/Resources/views/index.blade.php
@@ -1,9 +1,9 @@
@extends('sample::layouts.frontend')
@section('content')
-
Hello World
+
Hello World
-
- This view is loaded from module: {{ config('sample.name') }}
-
+
+ This view is loaded from module: {{ config('sample.name') }}
+
@endsection
diff --git a/modules/Updater/Resources/views/app.blade.php b/modules/Updater/Resources/views/app.blade.php
index 0e4cc175..dfdd534e 100644
--- a/modules/Updater/Resources/views/app.blade.php
+++ b/modules/Updater/Resources/views/app.blade.php
@@ -2,66 +2,68 @@
-
-
-
+
+
+
-
@yield('title') - updater
+
@yield('title') - updater
-
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
+
-
+