diff --git a/beike/Installer/Views/environment-wizard.blade.php b/beike/Installer/Views/environment-wizard.blade.php index 84a2a387..58db8114 100644 --- a/beike/Installer/Views/environment-wizard.blade.php +++ b/beike/Installer/Views/environment-wizard.blade.php @@ -1,204 +1,229 @@ @extends('installer::layouts.master') @section('template_title') - {{ trans('installer::installer_messages.environment.wizard.templateTitle') }} + {{ trans('installer::installer_messages.environment.wizard.templateTitle') }} @endsection @section('title') - - {!! trans('installer::installer_messages.environment.wizard.title') !!} + + {!! trans('installer::installer_messages.environment.wizard.title') !!} @endsection -@section('container') -
- +@section('content') + + -
- - - @if ($errors->has('app_url')) - - - {{ $errors->first('app_url') }} - - @endif -
+
+ + + @if ($errors->has('app_url')) + + + {{ $errors->first('app_url') }} + + @endif +
-
- - - @if ($errors->has('database_connection')) - - - {{ $errors->first('database_connection') }} - - @endif -
+
+ + + @if ($errors->has('database_connection')) + + + {{ $errors->first('database_connection') }} + + @endif +
-
- - - @if ($errors->has('database_hostname')) - - - {{ $errors->first('database_hostname') }} - - @endif -
+
+ + + @if ($errors->has('database_hostname')) + + + {{ $errors->first('database_hostname') }} + + @endif +
-
- - - @if ($errors->has('database_port')) - - - {{ $errors->first('database_port') }} - - @endif -
+
+ + + @if ($errors->has('database_port')) + + + {{ $errors->first('database_port') }} + + @endif +
-
- - - @if ($errors->has('database_name')) - - - {{ $errors->first('database_name') }} - - @endif -
+
+ + + @if ($errors->has('database_name')) + + + {{ $errors->first('database_name') }} + + @endif +
-
- - - @if ($errors->has('database_username')) - - - {{ $errors->first('database_username') }} - - @endif -
+
+ + + @if ($errors->has('database_username')) + + + {{ $errors->first('database_username') }} + + @endif +
-
- - - @if ($errors->has('database_password')) - - - {{ $errors->first('database_password') }} - - @endif -
+
+ + + @if ($errors->has('database_password')) + + + {{ $errors->first('database_password') }} + + @endif +
-
- - - @if ($errors->has('mail_driver')) - - - {{ $errors->first('mail_driver') }} - - @endif -
-
- - - @if ($errors->has('mail_host')) - - - {{ $errors->first('mail_host') }} - - @endif -
-
- - - @if ($errors->has('mail_port')) - - - {{ $errors->first('mail_port') }} - - @endif -
-
- - - @if ($errors->has('mail_username')) - - - {{ $errors->first('mail_username') }} - - @endif -
-
- - - @if ($errors->has('mail_password')) - - - {{ $errors->first('mail_password') }} - - @endif -
-
- - - @if ($errors->has('mail_encryption')) - - - {{ $errors->first('mail_encryption') }} - - @endif -
- -
+
+ + + @if ($errors->has('mail_driver')) + + + {{ $errors->first('mail_driver') }} + + @endif +
+
+ + + @if ($errors->has('mail_host')) + + + {{ $errors->first('mail_host') }} + + @endif +
+
+ + + @if ($errors->has('mail_port')) + + + {{ $errors->first('mail_port') }} + + @endif +
+
+ + + @if ($errors->has('mail_username')) + + + {{ $errors->first('mail_username') }} + + @endif +
+
+ + + @if ($errors->has('mail_password')) + + + {{ $errors->first('mail_password') }} + + @endif +
+
+ + + @if ($errors->has('mail_encryption')) + + + {{ $errors->first('mail_encryption') }} + + @endif +
+ + @endsection @section('scripts') - + @endsection diff --git a/beike/Installer/Views/finished.blade.php b/beike/Installer/Views/finished.blade.php index 38f015dd..cb2001f4 100644 --- a/beike/Installer/Views/finished.blade.php +++ b/beike/Installer/Views/finished.blade.php @@ -9,7 +9,7 @@ {{ trans('installer::installer_messages.final.title') }} @endsection -@section('container') +@section('content') @if(session('message')['dbOutputLog'])

{{ trans('installer::installer_messages.final.migration') }}

diff --git a/beike/Installer/Views/layouts/master.blade.php b/beike/Installer/Views/layouts/master.blade.php index f3332dad..4a28117e 100644 --- a/beike/Installer/Views/layouts/master.blade.php +++ b/beike/Installer/Views/layouts/master.blade.php @@ -1,67 +1,73 @@ - - - - - - @if (trim($__env->yieldContent('template_title')))@yield('template_title') | @endif {{ trans('installer::installer_messages.title') }} - - - - - @yield('style') - - - -
-
-
-

@yield('title')

-
-
- @if (session('message')) -

- - @if(is_array(session('message'))) - {{ session('message')['message'] }} - @else - {{ session('message') }} - @endif - -

- @endif - @if(session()->has('errors')) -
- -

- - {{ trans('installer::installer_messages.forms.errorTitle') }} -

-
    - @foreach($errors->all() as $error) -
  • {{ $error }}
  • - @endforeach -
-
- @endif - @yield('container') -
-
-
- @yield('scripts') - - + + + + + + + + @if (trim($__env->yieldContent('template_title'))) + @yield('template_title') | + @endif {{ trans('installer::installer_messages.title') }} + + + + + + + + @yield('style') + + + + + +
+ @if (session('message')) +

+ + @if (is_array(session('message'))) + {{ session('message')['message'] }} + @else + {{ session('message') }} + @endif + +

+ @endif + @if (session()->has('errors')) +
+ +
+ @endif + + @yield('content') +
+ @yield('scripts') + + diff --git a/beike/Installer/Views/permissions.blade.php b/beike/Installer/Views/permissions.blade.php index 3beb4776..b871089f 100644 --- a/beike/Installer/Views/permissions.blade.php +++ b/beike/Installer/Views/permissions.blade.php @@ -9,7 +9,7 @@ {{ trans('installer::installer_messages.permissions.title') }} @endsection -@section('container') +@section('content')