From acedbcce0bd3b4ced1d2800a0789a5bf12893b2d Mon Sep 17 00:00:00 2001 From: printempw Date: Sat, 31 Dec 2016 17:14:19 +0800 Subject: [PATCH] add language chooser at setup page --- resources/assets/src/sass/install.scss | 8 +++++++- resources/views/setup/wizard/finish.tpl | 5 ++++- resources/views/setup/wizard/info.tpl | 5 ++++- resources/views/setup/wizard/language.tpl | 5 +++++ resources/views/setup/wizard/master.tpl | 16 +++++++++++++++- resources/views/setup/wizard/welcome.tpl | 4 +++- 6 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 resources/views/setup/wizard/language.tpl diff --git a/resources/assets/src/sass/install.scss b/resources/assets/src/sass/install.scss index 8bb2f157..2984d5ac 100644 --- a/resources/assets/src/sass/install.scss +++ b/resources/assets/src/sass/install.scss @@ -2,7 +2,7 @@ * @Author: printempw * @Date: 2016-07-28 13:15:18 * @Last Modified by: printempw - * @Last Modified time: 2016-11-18 15:12:18 + * @Last Modified time: 2016-12-31 17:08:19 */ @import "style.scss"; @@ -76,6 +76,12 @@ p { } } +#language-chooser { + float: right; + margin-top: 4px; + height: 24px; +} + .step { margin: 20px 0 15px; text-align: left; diff --git a/resources/views/setup/wizard/finish.tpl b/resources/views/setup/wizard/finish.tpl index 6895ed04..59f510dc 100644 --- a/resources/views/setup/wizard/finish.tpl +++ b/resources/views/setup/wizard/finish.tpl @@ -1,7 +1,10 @@ @extends('setup.wizard.master') @section('content') -

{{ trans('setup.wizard.finish.title') }}

+

{{ trans('setup.wizard.finish.title') }} +@include('setup.wizard.language') +

+

{{ trans('setup.wizard.finish.text') }}

diff --git a/resources/views/setup/wizard/info.tpl b/resources/views/setup/wizard/info.tpl index 3415e6b2..087ae040 100644 --- a/resources/views/setup/wizard/info.tpl +++ b/resources/views/setup/wizard/info.tpl @@ -1,7 +1,10 @@ @extends('setup.wizard.master') @section('content') -

{{ trans('setup.wizard.info.title') }}

+

{{ trans('setup.wizard.info.title') }} +@include('setup.wizard.language') +

+

{{ trans('setup.wizard.info.text') }}

diff --git a/resources/views/setup/wizard/language.tpl b/resources/views/setup/wizard/language.tpl new file mode 100644 index 00000000..b72a1a10 --- /dev/null +++ b/resources/views/setup/wizard/language.tpl @@ -0,0 +1,5 @@ + diff --git a/resources/views/setup/wizard/master.tpl b/resources/views/setup/wizard/master.tpl index 4fffa1d8..67345c90 100644 --- a/resources/views/setup/wizard/master.tpl +++ b/resources/views/setup/wizard/master.tpl @@ -7,6 +7,7 @@ {{ trans('setup.wizard.master.title') }} + @yield('style') @@ -14,6 +15,19 @@ @yield('content') - + + +@yield('script') + + diff --git a/resources/views/setup/wizard/welcome.tpl b/resources/views/setup/wizard/welcome.tpl index 178aaa05..2b2b6363 100644 --- a/resources/views/setup/wizard/welcome.tpl +++ b/resources/views/setup/wizard/welcome.tpl @@ -1,7 +1,9 @@ @extends('setup.wizard.master') @section('content') -

{{ trans('setup.wizard.welcome.title') }}

+

{{ trans('setup.wizard.welcome.title') }} +@include('setup.wizard.language') +

{{ trans('setup.wizard.welcome.text', ['version' => config('app.version')]) }}

{{ trans('setup.database.connection-success', ['server' => $server]) }}