From 0466da8fe9fbd870e0111028198bfaa4a3be6271 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Mon, 25 Jan 2016 09:34:42 +0000 Subject: [PATCH] Site title shows Cachet is we're showing support. Closes #1394 --- app/Composers/AppComposer.php | 8 +++++++- resources/views/dashboard/partials/head.blade.php | 2 +- resources/views/layout/master.blade.php | 9 ++++----- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/app/Composers/AppComposer.php b/app/Composers/AppComposer.php index 951755e0..c66ceccd 100644 --- a/app/Composers/AppComposer.php +++ b/app/Composers/AppComposer.php @@ -27,6 +27,7 @@ class AppComposer */ public function compose(View $view) { + $support = Setting::get('show_support'); $view->withAboutApp(Markdown::convertToHtml(Setting::get('app_about'))); $view->withAppAnalytics(Setting::get('app_analytics')); $view->withAppAnalyticsGoSquared(Setting::get('app_analytics_go_squared')); @@ -39,8 +40,13 @@ class AppComposer $view->withAppGraphs(Setting::get('display_graphs')); $view->withAppLocale(Setting::get('app_locale')); $view->withAppName(Setting::get('app_name')); + if ($support) { + $view->withSiteTitle(Setting::get('app_name').' | Cachet'); + } else { + $view->withSiteTitle(Setting::get('app_name')); + } $view->withAppStylesheet(Setting::get('stylesheet')); $view->withAppUrl(Config::get('app.url')); - $view->withShowSupport(Setting::get('show_support')); + $view->withShowSupport($support); } } diff --git a/resources/views/dashboard/partials/head.blade.php b/resources/views/dashboard/partials/head.blade.php index 390b1f41..f33c7e52 100644 --- a/resources/views/dashboard/partials/head.blade.php +++ b/resources/views/dashboard/partials/head.blade.php @@ -18,7 +18,7 @@ - {{ $page_title or $app_name.' | Cachet' }} + {{ $page_title or $site_title }} diff --git a/resources/views/layout/master.blade.php b/resources/views/layout/master.blade.php index 9f7512f1..1348d193 100644 --- a/resources/views/layout/master.blade.php +++ b/resources/views/layout/master.blade.php @@ -7,8 +7,8 @@ - - + + @@ -35,7 +35,7 @@ - {{ $app_name.' | Cachet' }} + {{ $site_title }} @@ -57,11 +57,10 @@ - @include('partials.banner')
- @yield('content') + @yield('content')
@include('partials.footer')