diff --git a/app/Helpers/Settings.php b/app/Helpers/Settings.php new file mode 100644 index 00000000..fe95ec03 --- /dev/null +++ b/app/Helpers/Settings.php @@ -0,0 +1,62 @@ +$key) ? self::$settings->$key : $default; + } + + /** + * Get all settings + * + * @return array + */ + public static function all() + { + self::init(); + + return self::$settings; + } + + /** + * Initialize settings array + */ + private static function init() + { + if (!self::$initialized) { + $model = new SettingsModel(); + self::$settings = $model->getAll(); + } + } +} \ No newline at end of file diff --git a/app/Helpers/functions.php b/app/Helpers/functions.php index 5fd8b190..938ae77e 100644 --- a/app/Helpers/functions.php +++ b/app/Helpers/functions.php @@ -11,4 +11,16 @@ function e($value) { return htmlspecialchars($value, ENT_QUOTES, 'UTF-8'); +} + +/** + * Shortcut for \App\Helpers\Settings::get() + * + * @param $key + * @param null $default + * + * @return null|string + */ +function setting($key, $default = null) { + return \App\Helpers\Settings::get($key, $default); } \ No newline at end of file diff --git a/app/Providers/GlobalViewDataProvider.php b/app/Providers/GlobalViewDataProvider.php index 3b7193b2..f201c027 100644 --- a/app/Providers/GlobalViewDataProvider.php +++ b/app/Providers/GlobalViewDataProvider.php @@ -21,11 +21,11 @@ class GlobalViewDataProvider extends ServiceProvider return; } - $settings = new Settings(); - - foreach ($settings->getForView() as $key => $value) { - view()->share($key, $value); - } +// $settings = new Settings(); +// +// foreach ($settings->getForView() as $key => $value) { +// view()->share($key, $value); +// } $this->extendBlade(); } diff --git a/resources/views/admin/layout.blade.php b/resources/views/admin/layout.blade.php index ecc84228..a5c9daaf 100644 --- a/resources/views/admin/layout.blade.php +++ b/resources/views/admin/layout.blade.php @@ -4,7 +4,7 @@ - @yield('pageHeading') {{isset($pageName) ? ' | '.$pageName: ''}} + @yield('pageHeading') {{setting('pageName')}} diff --git a/resources/views/admin/layoutWithNavigation.blade.php b/resources/views/admin/layoutWithNavigation.blade.php index 46e995f6..74d33be1 100644 --- a/resources/views/admin/layoutWithNavigation.blade.php +++ b/resources/views/admin/layoutWithNavigation.blade.php @@ -60,7 +60,7 @@