From 2941d694dafa078e656593b9299c178da0701423 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= Date: Mon, 14 Mar 2016 00:53:04 +0100 Subject: [PATCH] FEATURE: remove hard-coded shared variable "vendorName" --- app/Providers/AppServiceProvider.php | 2 +- app/Providers/GlobalViewDataProvider.php | 2 -- resources/views/admin/layout.blade.php | 4 ++-- resources/views/admin/loginForm/form.blade.php | 2 +- resources/views/visitor/default_theme/errorLayout.blade.php | 2 +- resources/views/visitor/default_theme/layout.blade.php | 2 +- resources/views/visitor/errorLayout.blade.php | 2 +- resources/views/visitor/layout.blade.php | 2 +- 8 files changed, 8 insertions(+), 10 deletions(-) diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index df9d98ac..afb59f52 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -87,7 +87,7 @@ class AppServiceProvider extends ServiceProvider private function registerSettings() { $registrator = $this->app->make('registerSettingsExtension'); - + $registrator->register('basic', 'admin/settings.basic', 'admin.settings.parts.basic'); $registrator->register('meta', 'admin/settings.meta', 'admin.settings.parts.meta'); } diff --git a/app/Providers/GlobalViewDataProvider.php b/app/Providers/GlobalViewDataProvider.php index 1aa8c630..11949db6 100644 --- a/app/Providers/GlobalViewDataProvider.php +++ b/app/Providers/GlobalViewDataProvider.php @@ -21,8 +21,6 @@ class GlobalViewDataProvider extends ServiceProvider view()->share($key, $value); } - view()->share('vendorName', 'ja s.r.o.'); - $this->extendBlade(); } diff --git a/resources/views/admin/layout.blade.php b/resources/views/admin/layout.blade.php index ce4a8e84..f151ae21 100644 --- a/resources/views/admin/layout.blade.php +++ b/resources/views/admin/layout.blade.php @@ -5,7 +5,7 @@ @yield('head_meta') - @yield('pageName', @trans('admin/common.admin')) | {{$vendorName}} + @yield('pageName', @trans('admin/common.admin')) | {{$pageName}} @@ -48,7 +48,7 @@ diff --git a/resources/views/admin/loginForm/form.blade.php b/resources/views/admin/loginForm/form.blade.php index d095e85d..b66d361d 100644 --- a/resources/views/admin/loginForm/form.blade.php +++ b/resources/views/admin/loginForm/form.blade.php @@ -4,7 +4,7 @@ - @lang('admin/loginForm.login') | {{$vendorName}} + @lang('admin/loginForm.login') | {{$pageName}} diff --git a/resources/views/visitor/default_theme/errorLayout.blade.php b/resources/views/visitor/default_theme/errorLayout.blade.php index beb4cb26..59063134 100644 --- a/resources/views/visitor/default_theme/errorLayout.blade.php +++ b/resources/views/visitor/default_theme/errorLayout.blade.php @@ -5,7 +5,7 @@ @yield('head_meta') - @yield('pageName', @trans('visitor/common.welcome')) | {{$vendorName}} + @yield('pageName', @trans('visitor/common.welcome')) | {{$pageName}} diff --git a/resources/views/visitor/default_theme/layout.blade.php b/resources/views/visitor/default_theme/layout.blade.php index 7490b817..914c304e 100755 --- a/resources/views/visitor/default_theme/layout.blade.php +++ b/resources/views/visitor/default_theme/layout.blade.php @@ -5,7 +5,7 @@ @yield('head_meta') - @yield('pageName', @trans('visitor/common.welcome')) | {{$vendorName}} + @yield('pageName', @trans('visitor/common.welcome')) | {{$pageName}} diff --git a/resources/views/visitor/errorLayout.blade.php b/resources/views/visitor/errorLayout.blade.php index beb4cb26..59063134 100644 --- a/resources/views/visitor/errorLayout.blade.php +++ b/resources/views/visitor/errorLayout.blade.php @@ -5,7 +5,7 @@ @yield('head_meta') - @yield('pageName', @trans('visitor/common.welcome')) | {{$vendorName}} + @yield('pageName', @trans('visitor/common.welcome')) | {{$pageName}} diff --git a/resources/views/visitor/layout.blade.php b/resources/views/visitor/layout.blade.php index beb4cb26..59063134 100644 --- a/resources/views/visitor/layout.blade.php +++ b/resources/views/visitor/layout.blade.php @@ -5,7 +5,7 @@ @yield('head_meta') - @yield('pageName', @trans('visitor/common.welcome')) | {{$vendorName}} + @yield('pageName', @trans('visitor/common.welcome')) | {{$pageName}}