From a588ac2b317ee51604e7b76e360b60224631aee8 Mon Sep 17 00:00:00 2001 From: Andy Heathershaw Date: Fri, 24 Mar 2017 14:43:53 +0000 Subject: [PATCH] #9: Updated the installer to Bootstrap 4. The "create an account" link no longer appears on the new unified login/register view when the "allow self registration" option is disabled. --- .idea/deployment.xml | 3 +- app/Helpers/ConfigHelper.php | 2 + app/Http/Middleware/GlobalConfiguration.php | 4 +- .../views/install/administrator.blade.php | 5 +- resources/views/install/check.blade.php | 5 +- resources/views/install/database.blade.php | 3 +- resources/views/install/layout.blade.php | 104 ++++++++++-------- resources/views/install/navbar.blade.php | 27 ++--- .../themes/base/auth/v2_unified.blade.php | 8 +- resources/views/themes/base/layout.blade.php | 2 +- .../themes/base/partials/navbar.blade.php | 2 +- semantic.json | 73 ------------ 12 files changed, 88 insertions(+), 150 deletions(-) delete mode 100644 semantic.json diff --git a/.idea/deployment.xml b/.idea/deployment.xml index 02a52c6..981e50c 100644 --- a/.idea/deployment.xml +++ b/.idea/deployment.xml @@ -1,6 +1,6 @@ - + @@ -10,6 +10,5 @@ - \ No newline at end of file diff --git a/app/Helpers/ConfigHelper.php b/app/Helpers/ConfigHelper.php index b03d06a..7e369dc 100644 --- a/app/Helpers/ConfigHelper.php +++ b/app/Helpers/ConfigHelper.php @@ -104,7 +104,9 @@ class ConfigHelper 'sender_address' => sprintf('hostmaster@%s', (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : 'localhost')), 'sender_name' => (is_null($currentAppName) ? trans('global.app_name') : $currentAppName), 'smtp_server' => 'localhost', + 'smtp_password' => '', 'smtp_port' => 25, + 'smtp_username' => '', 'theme' => 'bootstrap3' ); } diff --git a/app/Http/Middleware/GlobalConfiguration.php b/app/Http/Middleware/GlobalConfiguration.php index 1621c8d..c744645 100644 --- a/app/Http/Middleware/GlobalConfiguration.php +++ b/app/Http/Middleware/GlobalConfiguration.php @@ -35,6 +35,9 @@ class GlobalConfiguration public function handle(Request $request, Closure $next) { + // We can always add the version number + $this->addVersionNumberToView(); + // If running the installer, chances are our database isn't running yet if ($request->is('install/*')) { @@ -44,7 +47,6 @@ class GlobalConfiguration // When running migrations, CLI tasks or the installer, don't need to add things to the view if (php_sapi_name() != 'cli') { - $this->addVersionNumberToView(); $this->addThemeInfoToView(); $this->addAlbumsToView(); } diff --git a/resources/views/install/administrator.blade.php b/resources/views/install/administrator.blade.php index 590e5be..f907946 100644 --- a/resources/views/install/administrator.blade.php +++ b/resources/views/install/administrator.blade.php @@ -1,5 +1,6 @@ @extends('install.layout') +@section('title', trans('installer.administrator_title')) @section('content')

@lang('installer.administrator_title')

@lang('installer.administrator_intro')

@@ -15,7 +16,7 @@ @endif
-
+
{{ csrf_field() }}
@@ -42,7 +43,7 @@ @if ($can_skip) Skip @endif - +
diff --git a/resources/views/install/check.blade.php b/resources/views/install/check.blade.php index d386a7a..7659d30 100644 --- a/resources/views/install/check.blade.php +++ b/resources/views/install/check.blade.php @@ -1,11 +1,12 @@ @extends('install.layout') +@section('title', trans('installer.requirements_title')) @section('content')

@lang('installer.requirements_title')

@lang('installer.requirements_intro')

-
+
@@ -73,7 +74,7 @@
{{ csrf_field() }} - +
diff --git a/resources/views/install/database.blade.php b/resources/views/install/database.blade.php index 3e34cb5..2dac4aa 100644 --- a/resources/views/install/database.blade.php +++ b/resources/views/install/database.blade.php @@ -1,11 +1,12 @@ @extends('install.layout') +@section('title', trans('installer.database_title')) @section('content')

@lang('installer.database_title')

@lang('installer.database_intro')

-
+
@if (!is_null($database_error))

Database error: {{ $database_error }}

diff --git a/resources/views/install/layout.blade.php b/resources/views/install/layout.blade.php index ac1e908..0d7026d 100644 --- a/resources/views/install/layout.blade.php +++ b/resources/views/install/layout.blade.php @@ -6,70 +6,82 @@ - @lang('installer.app_name') - + @yield('title') | @lang('global.app_name') + {{-- Cannot use $theme_url here: if a theme uses the base layout, it would also have to provide all these dependencies! --}} {{-- As these files are shipped with core (not a theme) use the main app.version instead of the current theme's version --}} - - - - + @if (App::environment() == 'production') + + @else + + @endif @stack('styles') @include('install.navbar') -
- @if (isset($error)) -
-
- {{ $error }} -
-
- @endif - - @if (isset($warning)) -
-
- {{ $warning }} -
-
- @endif - - @if (isset($success)) -
-
- {{ $success }} -
-
- @endif - - @if (isset($info)) -
-
- {{ $info }} -
-
- @endif - + {{-- Render breadcrumb within a container if present in the sub-view --}} + @if (View::hasSection('breadcrumb'))
- @yield('content') +
+
+
    + @yield('breadcrumb') +
+
+
+ @endif - @include('themes.base.partials.copyright_gallery') + @if (isset($error)) +
+
+ {{ $error }} +
+
+ @endif + + @if (isset($warning)) +
+
+ {{ $warning }} +
+
+ @endif + + @if (isset($success)) +
+
+ {{ $success }} +
+
+ @endif + + @if (isset($info)) +
+
+ {{ $info }} +
+
+ @endif + +
+ @yield('content')
+ @include('themes.base.partials.copyright_admin') + {{-- Cannot use $theme_url here: if a theme uses the base layout, it would also have to provide all these dependencies! --}} {{-- As these files are shipped with core (not a theme) use the main app.version instead of the current theme's version --}} - - - - - + @if (App::environment() == 'production') + + @else + + @endif