From c64df7eed781b749fd19cbdec807580238a5a2a5 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Sat, 21 Nov 2015 23:09:20 +0000 Subject: [PATCH] Move display_graphs into AppComposer --- app/Composers/AppComposer.php | 2 ++ resources/views/dashboard/settings/app-setup.blade.php | 2 +- resources/views/index.blade.php | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Composers/AppComposer.php b/app/Composers/AppComposer.php index 3f563ffe..a607782b 100644 --- a/app/Composers/AppComposer.php +++ b/app/Composers/AppComposer.php @@ -33,8 +33,10 @@ class AppComposer $view->withAppAnalyticsPiwikUrl(Setting::get('app_analytics_piwik_url')); $view->withAppAnalyticsPiwikSiteId(Setting::get('app_analytics_piwik_siteid')); $view->withAppBanner(Setting::get('app_banner')); + $view->withAppBannerStyleFullWidth(Setting::get('style_fullwidth_header')); $view->withAppBannerType(Setting::get('app_banner_type')); $view->withAppDomain(Setting::get('app_domain')); + $view->withAppGraphs(Setting::get('display_graphs')); $view->withAppLocale(Setting::get('app_locale')); $view->withAppName(Setting::get('app_name')); $view->withAppStylesheet(Setting::get('app_stylesheet')); diff --git a/resources/views/dashboard/settings/app-setup.blade.php b/resources/views/dashboard/settings/app-setup.blade.php index 787494d4..26b64d6b 100644 --- a/resources/views/dashboard/settings/app-setup.blade.php +++ b/resources/views/dashboard/settings/app-setup.blade.php @@ -67,7 +67,7 @@
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php index b3fca4ba..c935c142 100644 --- a/resources/views/index.blade.php +++ b/resources/views/index.blade.php @@ -17,7 +17,7 @@ @endif -@if($display_metrics && Setting::get('display_graphs')) +@if($display_metrics && $app_graphs)
@include('partials.metrics')