From 030342067977b5c0f979ee0b375f844126fffe82 Mon Sep 17 00:00:00 2001
From: TL <mengwb@opencart.cn>
Date: Fri, 12 Aug 2022 19:15:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E8=A3=85=E5=BC=95=E5=AF=BC=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Providers/InstallerServiceProvider.php    |   4 +-
 .../Views/environment-wizard.blade.php        | 297 ++++++++++--------
 beike/Installer/Views/finished.blade.php      |  16 +-
 .../Views/layouts/master-update.blade.php     |  46 ---
 .../Installer/Views/layouts/master.blade.php  |  51 +--
 beike/Installer/Views/permissions.blade.php   |   6 +-
 beike/Installer/Views/requirements.blade.php  |   6 +-
 beike/Installer/Views/welcome.blade.php       |   8 +-
 8 files changed, 189 insertions(+), 245 deletions(-)
 delete mode 100644 beike/Installer/Views/layouts/master-update.blade.php

diff --git a/beike/Installer/Providers/InstallerServiceProvider.php b/beike/Installer/Providers/InstallerServiceProvider.php
index 6024ebb4..c983f6f4 100644
--- a/beike/Installer/Providers/InstallerServiceProvider.php
+++ b/beike/Installer/Providers/InstallerServiceProvider.php
@@ -23,7 +23,7 @@ class InstallerServiceProvider extends ServiceProvider
         $this->mergeConfigFrom(__DIR__ . '/../config.php', 'installer');
         $this->loadViewsFrom(__DIR__ . '/../views', 'installer');
 
-        $pathInstaller = base_path('installer');
-        $this->loadTranslationsFrom("{$pathInstaller}/Lang", '');
+        $pathInstaller = base_path('beike/installer');
+        $this->loadTranslationsFrom("{$pathInstaller}/Lang", 'installer');
     }
 }
diff --git a/beike/Installer/Views/environment-wizard.blade.php b/beike/Installer/Views/environment-wizard.blade.php
index 2ace0028..84a2a387 100644
--- a/beike/Installer/Views/environment-wizard.blade.php
+++ b/beike/Installer/Views/environment-wizard.blade.php
@@ -1,150 +1,187 @@
-@extends('vendor.installer.layouts.master')
+@extends('installer::layouts.master')
 
 @section('template_title')
-    {{ trans('installer_messages.environment.wizard.templateTitle') }}
+    {{ trans('installer::installer_messages.environment.wizard.templateTitle') }}
 @endsection
 
 @section('title')
     <i class="fa fa-magic fa-fw" aria-hidden="true"></i>
-    {!! trans('installer_messages.environment.wizard.title') !!}
+    {!! trans('installer::installer_messages.environment.wizard.title') !!}
 @endsection
 
 @section('container')
-    <div class="tabs tabs-full">
+    <form method="post" action="{{ route('installer.environment.save') }}" class="tabs-wrap">
+        <input type="hidden" name="_token" value="{{ csrf_token() }}">
 
-        <input id="tab1" type="radio" name="tabs" class="tab-input" checked />
-        <label for="tab1" class="tab-label">
-            <i class="fa fa-cog fa-2x fa-fw" aria-hidden="true"></i>
-            <br />
-            {{ trans('installer_messages.environment.wizard.tabs.environment') }}
-        </label>
+        <div class="form-group {{ $errors->has('app_url') ? ' has-error ' : '' }}">
+            <label for="app_url">
+                {{ trans('installer::installer_messages.environment.wizard.form.app_url_label') }}
+            </label>
+            <input type="url" name="app_url" id="app_url" value="http://localhost" placeholder="{{ trans('installer::installer_messages.environment.wizard.form.app_url_placeholder') }}" />
+            @if ($errors->has('app_url'))
+                <span class="error-block">
+                    <i class="fa fa-fw fa-exclamation-triangle" aria-hidden="true"></i>
+                    {{ $errors->first('app_url') }}
+                </span>
+            @endif
+        </div>
 
-        <input id="tab2" type="radio" name="tabs" class="tab-input" />
-        <label for="tab2" class="tab-label">
-            <i class="fa fa-database fa-2x fa-fw" aria-hidden="true"></i>
-            <br />
-            {{ trans('installer_messages.environment.wizard.tabs.database') }}
-        </label>
+        <div class="form-group {{ $errors->has('database_connection') ? ' has-error ' : '' }}">
+            <label for="database_connection">
+                {{ trans('installer::installer_messages.environment.wizard.form.db_connection_label') }}
+            </label>
+            <select name="database_connection" id="database_connection">
+                <option value="mysql" selected>{{ trans('installer::installer_messages.environment.wizard.form.db_connection_label_mysql') }}</option>
+                <option value="sqlite">{{ trans('installer::installer_messages.environment.wizard.form.db_connection_label_sqlite') }}</option>
+                <option value="pgsql">{{ trans('installer::installer_messages.environment.wizard.form.db_connection_label_pgsql') }}</option>
+                <option value="sqlsrv">{{ trans('installer::installer_messages.environment.wizard.form.db_connection_label_sqlsrv') }}</option>
+            </select>
+            @if ($errors->has('database_connection'))
+                <span class="error-block">
+                    <i class="fa fa-fw fa-exclamation-triangle" aria-hidden="true"></i>
+                    {{ $errors->first('database_connection') }}
+                </span>
+            @endif
+        </div>
 
-        <form method="post" action="{{ route('installer.environment.save') }}" class="tabs-wrap">
-            <div class="tab" id="tab1content">
-                <input type="hidden" name="_token" value="{{ csrf_token() }}">
+        <div class="form-group {{ $errors->has('database_hostname') ? ' has-error ' : '' }}">
+            <label for="database_hostname">
+                {{ trans('installer::installer_messages.environment.wizard.form.db_host_label') }}
+            </label>
+            <input type="text" name="database_hostname" id="database_hostname" value="127.0.0.1" placeholder="{{ trans('installer::installer_messages.environment.wizard.form.db_host_placeholder') }}" />
+            @if ($errors->has('database_hostname'))
+                <span class="error-block">
+                    <i class="fa fa-fw fa-exclamation-triangle" aria-hidden="true"></i>
+                    {{ $errors->first('database_hostname') }}
+                </span>
+            @endif
+        </div>
 
-                <div class="form-group {{ $errors->has('app_url') ? ' has-error ' : '' }}">
-                    <label for="app_url">
-                        {{ trans('installer_messages.environment.wizard.form.app_url_label') }}
-                    </label>
-                    <input type="url" name="app_url" id="app_url" value="http://localhost" placeholder="{{ trans('installer_messages.environment.wizard.form.app_url_placeholder') }}" />
-                    @if ($errors->has('app_url'))
-                        <span class="error-block">
-                            <i class="fa fa-fw fa-exclamation-triangle" aria-hidden="true"></i>
-                            {{ $errors->first('app_url') }}
-                        </span>
-                    @endif
-                </div>
+        <div class="form-group {{ $errors->has('database_port') ? ' has-error ' : '' }}">
+            <label for="database_port">
+                {{ trans('installer::installer_messages.environment.wizard.form.db_port_label') }}
+            </label>
+            <input type="number" name="database_port" id="database_port" value="3306" placeholder="{{ trans('installer::installer_messages.environment.wizard.form.db_port_placeholder') }}" />
+            @if ($errors->has('database_port'))
+                <span class="error-block">
+                    <i class="fa fa-fw fa-exclamation-triangle" aria-hidden="true"></i>
+                    {{ $errors->first('database_port') }}
+                </span>
+            @endif
+        </div>
 
-                <div class="buttons">
-                    <button class="button" onclick="showDatabaseSettings();return false">
-                        {{ trans('installer_messages.environment.wizard.form.buttons.setup_database') }}
-                        <i class="fa fa-angle-right fa-fw" aria-hidden="true"></i>
-                    </button>
-                </div>
-            </div>
-            <div class="tab" id="tab2content">
+        <div class="form-group {{ $errors->has('database_name') ? ' has-error ' : '' }}">
+            <label for="database_name">
+                {{ trans('installer::installer_messages.environment.wizard.form.db_name_label') }}
+            </label>
+            <input type="text" name="database_name" id="database_name" value="" placeholder="{{ trans('installer::installer_messages.environment.wizard.form.db_name_placeholder') }}" />
+            @if ($errors->has('database_name'))
+                <span class="error-block">
+                    <i class="fa fa-fw fa-exclamation-triangle" aria-hidden="true"></i>
+                    {{ $errors->first('database_name') }}
+                </span>
+            @endif
+        </div>
 
-                <div class="form-group {{ $errors->has('database_connection') ? ' has-error ' : '' }}">
-                    <label for="database_connection">
-                        {{ trans('installer_messages.environment.wizard.form.db_connection_label') }}
-                    </label>
-                    <select name="database_connection" id="database_connection">
-                        <option value="mysql" selected>{{ trans('installer_messages.environment.wizard.form.db_connection_label_mysql') }}</option>
-                        <option value="sqlite">{{ trans('installer_messages.environment.wizard.form.db_connection_label_sqlite') }}</option>
-                        <option value="pgsql">{{ trans('installer_messages.environment.wizard.form.db_connection_label_pgsql') }}</option>
-                        <option value="sqlsrv">{{ trans('installer_messages.environment.wizard.form.db_connection_label_sqlsrv') }}</option>
-                    </select>
-                    @if ($errors->has('database_connection'))
-                        <span class="error-block">
-                            <i class="fa fa-fw fa-exclamation-triangle" aria-hidden="true"></i>
-                            {{ $errors->first('database_connection') }}
-                        </span>
-                    @endif
-                </div>
+        <div class="form-group {{ $errors->has('database_username') ? ' has-error ' : '' }}">
+            <label for="database_username">
+                {{ trans('installer::installer_messages.environment.wizard.form.db_username_label') }}
+            </label>
+            <input type="text" name="database_username" id="database_username" value="" placeholder="{{ trans('installer::installer_messages.environment.wizard.form.db_username_placeholder') }}" />
+            @if ($errors->has('database_username'))
+                <span class="error-block">
+                    <i class="fa fa-fw fa-exclamation-triangle" aria-hidden="true"></i>
+                    {{ $errors->first('database_username') }}
+                </span>
+            @endif
+        </div>
 
-                <div class="form-group {{ $errors->has('database_hostname') ? ' has-error ' : '' }}">
-                    <label for="database_hostname">
-                        {{ trans('installer_messages.environment.wizard.form.db_host_label') }}
-                    </label>
-                    <input type="text" name="database_hostname" id="database_hostname" value="127.0.0.1" placeholder="{{ trans('installer_messages.environment.wizard.form.db_host_placeholder') }}" />
-                    @if ($errors->has('database_hostname'))
-                        <span class="error-block">
-                            <i class="fa fa-fw fa-exclamation-triangle" aria-hidden="true"></i>
-                            {{ $errors->first('database_hostname') }}
-                        </span>
-                    @endif
-                </div>
+        <div class="form-group {{ $errors->has('database_password') ? ' has-error ' : '' }}">
+            <label for="database_password">
+                {{ trans('installer::installer_messages.environment.wizard.form.db_password_label') }}
+            </label>
+            <input type="password" name="database_password" id="database_password" value="" placeholder="{{ trans('installer::installer_messages.environment.wizard.form.db_password_placeholder') }}" />
+            @if ($errors->has('database_password'))
+                <span class="error-block">
+                    <i class="fa fa-fw fa-exclamation-triangle" aria-hidden="true"></i>
+                    {{ $errors->first('database_password') }}
+                </span>
+            @endif
+        </div>
 
-                <div class="form-group {{ $errors->has('database_port') ? ' has-error ' : '' }}">
-                    <label for="database_port">
-                        {{ trans('installer_messages.environment.wizard.form.db_port_label') }}
-                    </label>
-                    <input type="number" name="database_port" id="database_port" value="3306" placeholder="{{ trans('installer_messages.environment.wizard.form.db_port_placeholder') }}" />
-                    @if ($errors->has('database_port'))
-                        <span class="error-block">
-                            <i class="fa fa-fw fa-exclamation-triangle" aria-hidden="true"></i>
-                            {{ $errors->first('database_port') }}
-                        </span>
-                    @endif
-                </div>
-
-                <div class="form-group {{ $errors->has('database_name') ? ' has-error ' : '' }}">
-                    <label for="database_name">
-                        {{ trans('installer_messages.environment.wizard.form.db_name_label') }}
-                    </label>
-                    <input type="text" name="database_name" id="database_name" value="" placeholder="{{ trans('installer_messages.environment.wizard.form.db_name_placeholder') }}" />
-                    @if ($errors->has('database_name'))
-                        <span class="error-block">
-                            <i class="fa fa-fw fa-exclamation-triangle" aria-hidden="true"></i>
-                            {{ $errors->first('database_name') }}
-                        </span>
-                    @endif
-                </div>
-
-                <div class="form-group {{ $errors->has('database_username') ? ' has-error ' : '' }}">
-                    <label for="database_username">
-                        {{ trans('installer_messages.environment.wizard.form.db_username_label') }}
-                    </label>
-                    <input type="text" name="database_username" id="database_username" value="" placeholder="{{ trans('installer_messages.environment.wizard.form.db_username_placeholder') }}" />
-                    @if ($errors->has('database_username'))
-                        <span class="error-block">
-                            <i class="fa fa-fw fa-exclamation-triangle" aria-hidden="true"></i>
-                            {{ $errors->first('database_username') }}
-                        </span>
-                    @endif
-                </div>
-
-                <div class="form-group {{ $errors->has('database_password') ? ' has-error ' : '' }}">
-                    <label for="database_password">
-                        {{ trans('installer_messages.environment.wizard.form.db_password_label') }}
-                    </label>
-                    <input type="password" name="database_password" id="database_password" value="" placeholder="{{ trans('installer_messages.environment.wizard.form.db_password_placeholder') }}" />
-                    @if ($errors->has('database_password'))
-                        <span class="error-block">
-                            <i class="fa fa-fw fa-exclamation-triangle" aria-hidden="true"></i>
-                            {{ $errors->first('database_password') }}
-                        </span>
-                    @endif
-                </div>
-
-                <div class="buttons">
-                    <button class="button" onclick="showApplicationSettings();return false">
-                        {{ trans('installer_messages.environment.wizard.form.buttons.setup_application') }}
-                        <i class="fa fa-angle-right fa-fw" aria-hidden="true"></i>
-                    </button>
-                </div>
-            </div>
-        </form>
-
-    </div>
+        <div class="form-group {{ $errors->has('mail_driver') ? ' has-error ' : '' }}">
+            <label for="mail_driver">
+                {{ trans('installer::installer_messages.environment.wizard.form.app_tabs.mail_driver_label') }}
+                <sup>
+                    <a href="https://laravel.com/docs/5.4/mail" target="_blank" title="{{ trans('installer::installer_messages.environment.wizard.form.app_tabs.more_info') }}">
+                        <i class="fa fa-info-circle fa-fw" aria-hidden="true"></i>
+                        <span class="sr-only">{{ trans('installer::installer_messages.environment.wizard.form.app_tabs.more_info') }}</span>
+                    </a>
+                </sup>
+            </label>
+            <input type="text" name="mail_driver" id="mail_driver" value="smtp" placeholder="{{ trans('installer::installer_messages.environment.wizard.form.app_tabs.mail_driver_placeholder') }}" />
+            @if ($errors->has('mail_driver'))
+                <span class="error-block">
+                    <i class="fa fa-fw fa-exclamation-triangle" aria-hidden="true"></i>
+                    {{ $errors->first('mail_driver') }}
+                </span>
+            @endif
+        </div>
+        <div class="form-group {{ $errors->has('mail_host') ? ' has-error ' : '' }}">
+            <label for="mail_host">{{ trans('installer::installer_messages.environment.wizard.form.app_tabs.mail_host_label') }}</label>
+            <input type="text" name="mail_host" id="mail_host" value="smtp.mailtrap.io" placeholder="{{ trans('installer::installer_messages.environment.wizard.form.app_tabs.mail_host_placeholder') }}" />
+            @if ($errors->has('mail_host'))
+                <span class="error-block">
+                    <i class="fa fa-fw fa-exclamation-triangle" aria-hidden="true"></i>
+                    {{ $errors->first('mail_host') }}
+                </span>
+            @endif
+        </div>
+        <div class="form-group {{ $errors->has('mail_port') ? ' has-error ' : '' }}">
+            <label for="mail_port">{{ trans('installer::installer_messages.environment.wizard.form.app_tabs.mail_port_label') }}</label>
+            <input type="number" name="mail_port" id="mail_port" value="2525" placeholder="{{ trans('installer::installer_messages.environment.wizard.form.app_tabs.mail_port_placeholder') }}" />
+            @if ($errors->has('mail_port'))
+                <span class="error-block">
+                    <i class="fa fa-fw fa-exclamation-triangle" aria-hidden="true"></i>
+                    {{ $errors->first('mail_port') }}
+                </span>
+            @endif
+        </div>
+        <div class="form-group {{ $errors->has('mail_username') ? ' has-error ' : '' }}">
+            <label for="mail_username">{{ trans('installer::installer_messages.environment.wizard.form.app_tabs.mail_username_label') }}</label>
+            <input type="text" name="mail_username" id="mail_username" value="null" placeholder="{{ trans('installer::installer_messages.environment.wizard.form.app_tabs.mail_username_placeholder') }}" />
+            @if ($errors->has('mail_username'))
+                <span class="error-block">
+                    <i class="fa fa-fw fa-exclamation-triangle" aria-hidden="true"></i>
+                    {{ $errors->first('mail_username') }}
+                </span>
+            @endif
+        </div>
+        <div class="form-group {{ $errors->has('mail_password') ? ' has-error ' : '' }}">
+            <label for="mail_password">{{ trans('installer::installer_messages.environment.wizard.form.app_tabs.mail_password_label') }}</label>
+            <input type="text" name="mail_password" id="mail_password" value="null" placeholder="{{ trans('installer::installer_messages.environment.wizard.form.app_tabs.mail_password_placeholder') }}" />
+            @if ($errors->has('mail_password'))
+                <span class="error-block">
+                    <i class="fa fa-fw fa-exclamation-triangle" aria-hidden="true"></i>
+                    {{ $errors->first('mail_password') }}
+                </span>
+            @endif
+        </div>
+        <div class="form-group {{ $errors->has('mail_encryption') ? ' has-error ' : '' }}">
+            <label for="mail_encryption">{{ trans('installer::installer_messages.environment.wizard.form.app_tabs.mail_encryption_label') }}</label>
+            <input type="text" name="mail_encryption" id="mail_encryption" value="null" placeholder="{{ trans('installer::installer_messages.environment.wizard.form.app_tabs.mail_encryption_placeholder') }}" />
+            @if ($errors->has('mail_encryption'))
+                <span class="error-block">
+                    <i class="fa fa-fw fa-exclamation-triangle" aria-hidden="true"></i>
+                    {{ $errors->first('mail_encryption') }}
+                </span>
+            @endif
+        </div>
+        <button class="button" type="submit">
+            {{ trans('installer::installer_messages.environment.wizard.form.buttons.install') }}
+            <i class="fa fa-angle-right fa-fw" aria-hidden="true"></i>
+        </button>
+    </form>
 @endsection
 
 @section('scripts')
diff --git a/beike/Installer/Views/finished.blade.php b/beike/Installer/Views/finished.blade.php
index 73ac9126..38f015dd 100644
--- a/beike/Installer/Views/finished.blade.php
+++ b/beike/Installer/Views/finished.blade.php
@@ -1,32 +1,32 @@
-@extends('vendor.installer.layouts.master')
+@extends('installer::layouts.master')
 
 @section('template_title')
-    {{ trans('installer_messages.final.templateTitle') }}
+    {{ trans('installer::installer_messages.final.templateTitle') }}
 @endsection
 
 @section('title')
     <i class="fa fa-flag-checkered fa-fw" aria-hidden="true"></i>
-    {{ trans('installer_messages.final.title') }}
+    {{ trans('installer::installer_messages.final.title') }}
 @endsection
 
 @section('container')
 
 	@if(session('message')['dbOutputLog'])
-		<p><strong><small>{{ trans('installer_messages.final.migration') }}</small></strong></p>
+		<p><strong><small>{{ trans('installer::installer_messages.final.migration') }}</small></strong></p>
 		<pre><code>{{ session('message')['dbOutputLog'] }}</code></pre>
 	@endif
 
-	<p><strong><small>{{ trans('installer_messages.final.console') }}</small></strong></p>
+	<p><strong><small>{{ trans('installer::installer_messages.final.console') }}</small></strong></p>
 	<pre><code>{{ $finalMessages }}</code></pre>
 
-	<p><strong><small>{{ trans('installer_messages.final.log') }}</small></strong></p>
+	<p><strong><small>{{ trans('installer::installer_messages.final.log') }}</small></strong></p>
 	<pre><code>{{ $finalStatusMessage }}</code></pre>
 
-	<p><strong><small>{{ trans('installer_messages.final.env') }}</small></strong></p>
+	<p><strong><small>{{ trans('installer::installer_messages.final.env') }}</small></strong></p>
 	<pre><code>{{ $finalEnvFile }}</code></pre>
 
     <div class="buttons">
-        <a href="{{ url('/') }}" class="button">{{ trans('installer_messages.final.exit') }}</a>
+        <a href="{{ url('/') }}" class="button">{{ trans('installer::installer_messages.final.exit') }}</a>
     </div>
 
 @endsection
diff --git a/beike/Installer/Views/layouts/master-update.blade.php b/beike/Installer/Views/layouts/master-update.blade.php
deleted file mode 100644
index 00ff410b..00000000
--- a/beike/Installer/Views/layouts/master-update.blade.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <title>@if (trim($__env->yieldContent('template_title')))@yield('template_title') | @endif {{ trans('installer_messages.updater.title') }}</title>
-        <link rel="icon" type="image/png" href="{{ asset('installer/img/favicon/favicon-16x16.png') }}" sizes="16x16"/>
-        <link rel="icon" type="image/png" href="{{ asset('installer/img/favicon/favicon-32x32.png') }}" sizes="32x32"/>
-        <link rel="icon" type="image/png" href="{{ asset('installer/img/favicon/favicon-96x96.png') }}" sizes="96x96"/>
-        <link href="{{ asset('installer/css/style.min.css') }}" rel="stylesheet"/>
-        @yield('style')
-        <script>
-            window.Laravel = <?php echo json_encode([
-                'csrfToken' => csrf_token(),
-            ]); ?>
-        </script>
-    </head>
-    <body>
-        <div class="master">
-            <div class="box">
-                <div class="header">
-                    <h1 class="header__title">@yield('title')</h1>
-                </div>
-                <ul class="step">
-                    <li class="step__divider"></li>
-                    <li class="step__item {{ isActive('LaravelUpdater::final') }}">
-                        <i class="step__icon fa fa-database" aria-hidden="true"></i>
-                    </li>
-                    <li class="step__divider"></li>
-                    <li class="step__item {{ isActive('LaravelUpdater::overview') }}">
-                        <i class="step__icon fa fa-reorder" aria-hidden="true"></i>
-                    </li>
-                    <li class="step__divider"></li>
-                    <li class="step__item {{ isActive('LaravelUpdater::welcome') }}">
-                        <i class="step__icon fa fa-refresh" aria-hidden="true"></i>
-                    </li>
-                    <li class="step__divider"></li>
-                </ul>
-                <div class="main">
-                    @yield('container')
-                </div>
-            </div>
-        </div>
-    </body>
-</html>
diff --git a/beike/Installer/Views/layouts/master.blade.php b/beike/Installer/Views/layouts/master.blade.php
index fc3e98ce..f3332dad 100644
--- a/beike/Installer/Views/layouts/master.blade.php
+++ b/beike/Installer/Views/layouts/master.blade.php
@@ -5,7 +5,7 @@
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <meta name="csrf-token" content="{{ csrf_token() }}">
-        <title>@if (trim($__env->yieldContent('template_title')))@yield('template_title') | @endif {{ trans('installer_messages.title') }}</title>
+        <title>@if (trim($__env->yieldContent('template_title')))@yield('template_title') | @endif {{ trans('installer::installer_messages.title') }}</title>
         <link rel="icon" type="image/png" href="{{ asset('installer/img/favicon/favicon-16x16.png') }}" sizes="16x16"/>
         <link rel="icon" type="image/png" href="{{ asset('installer/img/favicon/favicon-32x32.png') }}" sizes="32x32"/>
         <link rel="icon" type="image/png" href="{{ asset('installer/img/favicon/favicon-96x96.png') }}" sizes="96x96"/>
@@ -23,53 +23,6 @@
                 <div class="header">
                     <h1 class="header__title">@yield('title')</h1>
                 </div>
-                <ul class="step">
-                    <li class="step__divider"></li>
-                    <li class="step__item {{ isActive('LaravelInstaller::final') }}">
-                        <i class="step__icon fa fa-server" aria-hidden="true"></i>
-                    </li>
-                    <li class="step__divider"></li>
-                    <li class="step__item {{ isActive('LaravelInstaller::environment')}} {{ isActive('LaravelInstaller::environmentWizard')}} {{ isActive('LaravelInstaller::environmentClassic')}}">
-                        @if(Request::is('install/environment') || Request::is('install/environment/wizard') || Request::is('install/environment/classic') )
-                            <a href="{{ route('LaravelInstaller::environment') }}">
-                                <i class="step__icon fa fa-cog" aria-hidden="true"></i>
-                            </a>
-                        @else
-                            <i class="step__icon fa fa-cog" aria-hidden="true"></i>
-                        @endif
-                    </li>
-                    <li class="step__divider"></li>
-                    <li class="step__item {{ isActive('LaravelInstaller::permissions') }}">
-                        @if(Request::is('install/permissions') || Request::is('install/environment') || Request::is('install/environment/wizard') || Request::is('install/environment/classic') )
-                            <a href="{{ route('LaravelInstaller::permissions') }}">
-                                <i class="step__icon fa fa-key" aria-hidden="true"></i>
-                            </a>
-                        @else
-                            <i class="step__icon fa fa-key" aria-hidden="true"></i>
-                        @endif
-                    </li>
-                    <li class="step__divider"></li>
-                    <li class="step__item {{ isActive('LaravelInstaller::requirements') }}">
-                        @if(Request::is('install') || Request::is('install/requirements') || Request::is('install/permissions') || Request::is('install/environment') || Request::is('install/environment/wizard') || Request::is('install/environment/classic') )
-                            <a href="{{ route('LaravelInstaller::requirements') }}">
-                                <i class="step__icon fa fa-list" aria-hidden="true"></i>
-                            </a>
-                        @else
-                            <i class="step__icon fa fa-list" aria-hidden="true"></i>
-                        @endif
-                    </li>
-                    <li class="step__divider"></li>
-                    <li class="step__item {{ isActive('LaravelInstaller::welcome') }}">
-                        @if(Request::is('install') || Request::is('install/requirements') || Request::is('install/permissions') || Request::is('install/environment') || Request::is('install/environment/wizard') || Request::is('install/environment/classic') )
-                            <a href="{{ route('LaravelInstaller::welcome') }}">
-                                <i class="step__icon fa fa-home" aria-hidden="true"></i>
-                            </a>
-                        @else
-                            <i class="step__icon fa fa-home" aria-hidden="true"></i>
-                        @endif
-                    </li>
-                    <li class="step__divider"></li>
-                </ul>
                 <div class="main">
                     @if (session('message'))
                         <p class="alert text-center">
@@ -89,7 +42,7 @@
                             </button>
                             <h4>
                                 <i class="fa fa-fw fa-exclamation-triangle" aria-hidden="true"></i>
-                                {{ trans('installer_messages.forms.errorTitle') }}
+                                {{ trans('installer::installer_messages.forms.errorTitle') }}
                             </h4>
                             <ul>
                                 @foreach($errors->all() as $error)
diff --git a/beike/Installer/Views/permissions.blade.php b/beike/Installer/Views/permissions.blade.php
index 11563559..3beb4776 100644
--- a/beike/Installer/Views/permissions.blade.php
+++ b/beike/Installer/Views/permissions.blade.php
@@ -1,12 +1,12 @@
 @extends('installer::layouts.master')
 
 @section('template_title')
-    {{ trans('installer_messages.permissions.templateTitle') }}
+    {{ trans('installer::installer_messages.permissions.templateTitle') }}
 @endsection
 
 @section('title')
     <i class="fa fa-key fa-fw" aria-hidden="true"></i>
-    {{ trans('installer_messages.permissions.title') }}
+    {{ trans('installer::installer_messages.permissions.title') }}
 @endsection
 
 @section('container')
@@ -26,7 +26,7 @@
     @if ( ! isset($permissions['errors']))
         <div class="buttons">
             <a href="{{ route('installer.environment') }}" class="button">
-                {{ trans('installer_messages.permissions.next') }}
+                {{ trans('installer::installer_messages.permissions.next') }}
                 <i class="fa fa-angle-right fa-fw" aria-hidden="true"></i>
             </a>
         </div>
diff --git a/beike/Installer/Views/requirements.blade.php b/beike/Installer/Views/requirements.blade.php
index 240d3aea..fcd0fa8e 100644
--- a/beike/Installer/Views/requirements.blade.php
+++ b/beike/Installer/Views/requirements.blade.php
@@ -1,12 +1,12 @@
 @extends('installer::layouts.master')
 
 @section('template_title')
-    {{ trans('installer_messages.requirements.templateTitle') }}
+    {{ trans('installer::installer_messages.requirements.templateTitle') }}
 @endsection
 
 @section('title')
     <i class="fa fa-list-ul fa-fw" aria-hidden="true"></i>
-    {{ trans('installer_messages.requirements.title') }}
+    {{ trans('installer::installer_messages.requirements.title') }}
 @endsection
 
 @section('container')
@@ -41,7 +41,7 @@
     @if ( ! isset($requirements['errors']) && $phpSupportInfo['supported'] )
         <div class="buttons">
             <a class="button" href="{{ route('installer.permissions') }}">
-                {{ trans('installer_messages.requirements.next') }}
+                {{ trans('installer::installer_messages.requirements.next') }}
                 <i class="fa fa-angle-right fa-fw" aria-hidden="true"></i>
             </a>
         </div>
diff --git a/beike/Installer/Views/welcome.blade.php b/beike/Installer/Views/welcome.blade.php
index 393b086b..b03c4160 100644
--- a/beike/Installer/Views/welcome.blade.php
+++ b/beike/Installer/Views/welcome.blade.php
@@ -1,20 +1,20 @@
 @extends('installer::layouts.master')
 
 @section('template_title')
-    {{ trans('installer_messages.welcome.templateTitle') }}
+    {{ trans('installer::installer_messages.welcome.templateTitle') }}
 @endsection
 
 @section('title')
-    {{ trans('installer_messages.welcome.title') }}
+    {{ trans('installer::installer_messages.welcome.title') }}
 @endsection
 
 @section('container')
     <p class="text-center">
-      {{ trans('installer_messages.welcome.message') }}
+      {{ trans('installer::installer_messages.welcome.message') }}
     </p>
     <p class="text-center">
       <a href="{{ route('installer.requirements') }}" class="button">
-        {{ trans('installer_messages.welcome.next') }}
+        {{ trans('installer::installer_messages.welcome.next') }}
         <i class="fa fa-angle-right fa-fw" aria-hidden="true"></i>
       </a>
     </p>