diff --git a/app/Http/Controllers/Admin/ComponentController.php b/app/Http/Controllers/Admin/ComponentController.php index e4ab63a4..b5702377 100644 --- a/app/Http/Controllers/Admin/ComponentController.php +++ b/app/Http/Controllers/Admin/ComponentController.php @@ -41,8 +41,8 @@ class ComponentController extends AbstractController ]; View::share([ - 'subMenu' => $this->subMenu, - 'subTitle' => trans_choice('dashboard.components.components', 2), + 'sub_menu' => $this->subMenu, + 'sub_title' => trans_choice('dashboard.components.components', 2), ]); } @@ -60,7 +60,7 @@ class ComponentController extends AbstractController return View::make('dashboard.components.index')->with([ 'pageTitle' => trans_choice('dashboard.components.components', 2).' - '.trans('dashboard.dashboard'), 'components' => $components, - 'subMenu' => $this->subMenu, + 'sub_menu' => $this->subMenu, ]); } @@ -76,7 +76,7 @@ class ComponentController extends AbstractController return View::make('dashboard.components.groups.index')->with([ 'pageTitle' => trans_choice('dashboard.components.groups.groups', 2).' - '.trans('dashboard.dashboard'), 'groups' => ComponentGroup::orderBy('order')->get(), - 'subMenu' => $this->subMenu, + 'sub_menu' => $this->subMenu, ]); } diff --git a/app/Http/Controllers/Admin/IncidentController.php b/app/Http/Controllers/Admin/IncidentController.php index 5853aec4..d7109214 100644 --- a/app/Http/Controllers/Admin/IncidentController.php +++ b/app/Http/Controllers/Admin/IncidentController.php @@ -55,8 +55,8 @@ class IncidentController extends AbstractController ], ]; - View::share('subMenu', $this->subMenu); - View::share('subTitle', trans('dashboard.incidents.title')); + View::share('sub_menu', $this->subMenu); + View::share('sub_title', trans('dashboard.incidents.title')); } /** diff --git a/app/Http/Controllers/Admin/ScheduleController.php b/app/Http/Controllers/Admin/ScheduleController.php index a8cf4ed4..eb5f8222 100644 --- a/app/Http/Controllers/Admin/ScheduleController.php +++ b/app/Http/Controllers/Admin/ScheduleController.php @@ -55,8 +55,8 @@ class ScheduleController extends AbstractController ], ]; - View::share('subMenu', $this->subMenu); - View::share('subTitle', trans('dashboard.incidents.title')); + View::share('sub_menu', $this->subMenu); + View::share('sub_title', trans('dashboard.incidents.title')); } /** diff --git a/app/Http/Controllers/Admin/SettingsController.php b/app/Http/Controllers/Admin/SettingsController.php index 1724135b..7d1ef81c 100644 --- a/app/Http/Controllers/Admin/SettingsController.php +++ b/app/Http/Controllers/Admin/SettingsController.php @@ -54,9 +54,9 @@ class SettingsController extends AbstractController ], ]; - View::share('subTitle', $this->subTitle); + View::share('sub_title', $this->subTitle); - View::share('subMenu', $this->subMenu); + View::share('sub_menu', $this->subMenu); } /** @@ -70,7 +70,7 @@ class SettingsController extends AbstractController return View::make('dashboard.settings.app-setup')->with([ 'pageTitle' => 'Application Setup - Dashboard', - 'subMenu' => $this->subMenu, + 'sub_menu' => $this->subMenu, ]); } @@ -85,7 +85,7 @@ class SettingsController extends AbstractController return View::make('dashboard.settings.theme')->with([ 'pageTitle' => 'Theme - Dashboard', - 'subMenu' => $this->subMenu, + 'sub_menu' => $this->subMenu, ]); } @@ -102,7 +102,7 @@ class SettingsController extends AbstractController return View::make('dashboard.settings.security')->with([ 'pageTitle' => 'Security - Dashboard', - 'subMenu' => $this->subMenu, + 'sub_menu' => $this->subMenu, 'unsecureUsers' => $unsecureUsers, ]); } @@ -118,7 +118,7 @@ class SettingsController extends AbstractController return View::make('dashboard.settings.stylesheet')->with([ 'pageTitle' => 'Stylesheet - Dashboard', - 'subMenu' => $this->subMenu, + 'sub_menu' => $this->subMenu, ]); } diff --git a/resources/views/dashboard/components/groups/index.blade.php b/resources/views/dashboard/components/groups/index.blade.php index 66922c58..64fbe997 100644 --- a/resources/views/dashboard/components/groups/index.blade.php +++ b/resources/views/dashboard/components/groups/index.blade.php @@ -2,7 +2,7 @@ @section('content')
- @if(isset($subMenu)) + @if(isset($sub_menu)) @include('partials.dashboard.sub-sidebar') @endif
diff --git a/resources/views/dashboard/components/index.blade.php b/resources/views/dashboard/components/index.blade.php index e9db7ddd..1b7f2fe4 100644 --- a/resources/views/dashboard/components/index.blade.php +++ b/resources/views/dashboard/components/index.blade.php @@ -2,7 +2,7 @@ @section('content')
- @if(isset($subMenu)) + @if(isset($sub_menu)) @include('partials.dashboard.sub-sidebar') @endif
diff --git a/resources/views/dashboard/incidents/index.blade.php b/resources/views/dashboard/incidents/index.blade.php index 0fa1118b..3f8cf8bd 100644 --- a/resources/views/dashboard/incidents/index.blade.php +++ b/resources/views/dashboard/incidents/index.blade.php @@ -2,7 +2,7 @@ @section('content')
- @if(isset($subMenu)) + @if(isset($sub_menu)) @include('partials.dashboard.sub-sidebar') @endif
diff --git a/resources/views/dashboard/schedule/index.blade.php b/resources/views/dashboard/schedule/index.blade.php index a2ee9c21..183620d9 100644 --- a/resources/views/dashboard/schedule/index.blade.php +++ b/resources/views/dashboard/schedule/index.blade.php @@ -2,7 +2,7 @@ @section('content')
- @if(isset($subMenu)) + @if(isset($sub_menu)) @include('partials.dashboard.sub-sidebar') @endif
diff --git a/resources/views/dashboard/settings/app-setup.blade.php b/resources/views/dashboard/settings/app-setup.blade.php index 2475ae67..f02e0bdd 100644 --- a/resources/views/dashboard/settings/app-setup.blade.php +++ b/resources/views/dashboard/settings/app-setup.blade.php @@ -2,7 +2,7 @@ @section('content')
- @if(isset($subMenu)) + @if(isset($sub_menu)) @include('partials.dashboard.sub-sidebar') @endif
diff --git a/resources/views/dashboard/settings/security.blade.php b/resources/views/dashboard/settings/security.blade.php index 76c62321..51c76fb5 100644 --- a/resources/views/dashboard/settings/security.blade.php +++ b/resources/views/dashboard/settings/security.blade.php @@ -2,7 +2,7 @@ @section('content')
- @if(isset($subMenu)) + @if(isset($sub_menu)) @include('partials.dashboard.sub-sidebar') @endif
diff --git a/resources/views/dashboard/settings/stylesheet.blade.php b/resources/views/dashboard/settings/stylesheet.blade.php index 12cbc593..996ba374 100644 --- a/resources/views/dashboard/settings/stylesheet.blade.php +++ b/resources/views/dashboard/settings/stylesheet.blade.php @@ -2,7 +2,7 @@ @section('content')
- @if(isset($subMenu)) + @if(isset($sub_menu)) @include('partials.dashboard.sub-sidebar') @endif
diff --git a/resources/views/dashboard/settings/theme.blade.php b/resources/views/dashboard/settings/theme.blade.php index 817ff895..dddad4e1 100644 --- a/resources/views/dashboard/settings/theme.blade.php +++ b/resources/views/dashboard/settings/theme.blade.php @@ -2,7 +2,7 @@ @section('content')
- @if(isset($subMenu)) + @if(isset($sub_menu)) @include('partials.dashboard.sub-sidebar') @endif
diff --git a/resources/views/partials/dashboard/sub-sidebar.blade.php b/resources/views/partials/dashboard/sub-sidebar.blade.php index ce8cca0c..6389f979 100644 --- a/resources/views/partials/dashboard/sub-sidebar.blade.php +++ b/resources/views/partials/dashboard/sub-sidebar.blade.php @@ -2,9 +2,9 @@ -

{{ $subTitle }}

+

{{ $sub_title }}