diff --git a/app/Http/Controllers/Admin/ComponentController.php b/app/Http/Controllers/Admin/ComponentController.php
index b5702377..a38436d3 100644
--- a/app/Http/Controllers/Admin/ComponentController.php
+++ b/app/Http/Controllers/Admin/ComponentController.php
@@ -58,7 +58,7 @@ class ComponentController extends AbstractController
$this->subMenu['components']['active'] = true;
return View::make('dashboard.components.index')->with([
- 'pageTitle' => trans_choice('dashboard.components.components', 2).' - '.trans('dashboard.dashboard'),
+ 'page_title' => trans_choice('dashboard.components.components', 2).' - '.trans('dashboard.dashboard'),
'components' => $components,
'sub_menu' => $this->subMenu,
]);
@@ -74,7 +74,7 @@ class ComponentController extends AbstractController
$this->subMenu['groups']['active'] = true;
return View::make('dashboard.components.groups.index')->with([
- 'pageTitle' => trans_choice('dashboard.components.groups.groups', 2).' - '.trans('dashboard.dashboard'),
+ 'page_title' => trans_choice('dashboard.components.groups.groups', 2).' - '.trans('dashboard.dashboard'),
'groups' => ComponentGroup::orderBy('order')->get(),
'sub_menu' => $this->subMenu,
]);
@@ -99,7 +99,7 @@ class ComponentController extends AbstractController
);
return View::make('dashboard.components.edit')->with([
- 'pageTitle' => $pageTitle,
+ 'page_title' => $pageTitle,
'component' => $component,
'groups' => $groups,
]);
@@ -170,7 +170,7 @@ class ComponentController extends AbstractController
$groups = ComponentGroup::all();
return View::make('dashboard.components.add')->with([
- 'pageTitle' => trans('dashboard.components.add.title').' - '.trans('dashboard.dashboard'),
+ 'page_title' => trans('dashboard.components.add.title').' - '.trans('dashboard.dashboard'),
'groups' => $groups,
]);
}
@@ -279,7 +279,7 @@ class ComponentController extends AbstractController
public function showAddComponentGroup()
{
return View::make('dashboard.components.groups.add')->with([
- 'pageTitle' => trans('dashboard.components.groups.add.title').' - '.trans('dashboard.dashboard'),
+ 'page_title' => trans('dashboard.components.groups.add.title').' - '.trans('dashboard.dashboard'),
]);
}
@@ -293,7 +293,7 @@ class ComponentController extends AbstractController
public function showEditComponentGroup(ComponentGroup $group)
{
return View::make('dashboard.components.groups.edit')->with([
- 'pageTitle' => trans('dashboard.components.groups.edit.title').' - '.trans('dashboard.dashboard'),
+ 'page_title' => trans('dashboard.components.groups.edit.title').' - '.trans('dashboard.dashboard'),
'group' => $group,
]);
}
diff --git a/app/Http/Controllers/Admin/DashboardController.php b/app/Http/Controllers/Admin/DashboardController.php
index 9db1c761..00eea6e3 100644
--- a/app/Http/Controllers/Admin/DashboardController.php
+++ b/app/Http/Controllers/Admin/DashboardController.php
@@ -41,7 +41,7 @@ class DashboardController extends AbstractController
public function showNotifications()
{
return View::make('dashboard.notifications.index')->with([
- 'pageTitle' => trans('dashboard.notifications.notifications').' '.trans('dashboard.dashboard'),
+ 'page_title' => trans('dashboard.notifications.notifications').' '.trans('dashboard.dashboard'),
]);
}
}
diff --git a/app/Http/Controllers/Admin/IncidentController.php b/app/Http/Controllers/Admin/IncidentController.php
index d7109214..78b9ab60 100644
--- a/app/Http/Controllers/Admin/IncidentController.php
+++ b/app/Http/Controllers/Admin/IncidentController.php
@@ -69,7 +69,7 @@ class IncidentController extends AbstractController
$incidents = Incident::notScheduled()->orderBy('created_at', 'desc')->get();
return View::make('dashboard.incidents.index')->with([
- 'pageTitle' => trans('dashboard.incidents.incidents').' - '.trans('dashboard.dashboard'),
+ 'page_title' => trans('dashboard.incidents.incidents').' - '.trans('dashboard.dashboard'),
'incidents' => $incidents,
]);
}
@@ -85,7 +85,7 @@ class IncidentController extends AbstractController
$componentsOutGroups = Component::where('group_id', 0)->get();
return View::make('dashboard.incidents.add')->with([
- 'pageTitle' => trans('dashboard.incidents.add.title').' - '.trans('dashboard.dashboard'),
+ 'page_title' => trans('dashboard.incidents.add.title').' - '.trans('dashboard.dashboard'),
'componentsInGroups' => $componentsInGroups,
'componentsOutGroups' => $componentsOutGroups,
'incidentTemplates' => IncidentTemplate::all(),
@@ -100,7 +100,7 @@ class IncidentController extends AbstractController
public function showTemplates()
{
return View::make('dashboard.incidents.templates.index')->with([
- 'pageTitle' => trans('dashboard.incidents.templates.title').' - '.trans('dashboard.dashboard'),
+ 'page_title' => trans('dashboard.incidents.templates.title').' - '.trans('dashboard.dashboard'),
'incidentTemplates' => IncidentTemplate::all(),
]);
}
@@ -178,7 +178,7 @@ class IncidentController extends AbstractController
public function showAddIncidentTemplate()
{
return View::make('dashboard.incidents.templates.add')->with([
- 'pageTitle' => trans('dashboard.incidents.templates.add.title').' - '.trans('dashboard.dashboard'),
+ 'page_title' => trans('dashboard.incidents.templates.add.title').' - '.trans('dashboard.dashboard'),
]);
}
@@ -192,7 +192,7 @@ class IncidentController extends AbstractController
public function showEditTemplateAction(IncidentTemplate $template)
{
return View::make('dashboard.incidents.templates.edit')->with([
- 'pageTitle' => trans('dashboard.incidents.templates.edit.title').' - '.trans('dashboard.dashboard'),
+ 'page_title' => trans('dashboard.incidents.templates.edit.title').' - '.trans('dashboard.dashboard'),
'template' => $template,
]);
}
@@ -285,7 +285,7 @@ class IncidentController extends AbstractController
$componentsOutGroups = Component::where('group_id', 0)->get();
return View::make('dashboard.incidents.edit')->with([
- 'pageTitle' => trans('dashboard.incidents.edit.title').' - '.trans('dashboard.dashboard'),
+ 'page_title' => trans('dashboard.incidents.edit.title').' - '.trans('dashboard.dashboard'),
'incident' => $incident,
'componentsInGroups' => $componentsInGroups,
'componentsOutGroups' => $componentsOutGroups,
diff --git a/app/Http/Controllers/Admin/MetricController.php b/app/Http/Controllers/Admin/MetricController.php
index 316d8416..88f1b11f 100644
--- a/app/Http/Controllers/Admin/MetricController.php
+++ b/app/Http/Controllers/Admin/MetricController.php
@@ -30,7 +30,7 @@ class MetricController extends AbstractController
$metrics = Metric::orderBy('created_at', 'desc')->get();
return View::make('dashboard.metrics.index')->with([
- 'pageTitle' => trans('dashboard.metrics.metrics').' - '.trans('dashboard.dashboard'),
+ 'page_title' => trans('dashboard.metrics.metrics').' - '.trans('dashboard.dashboard'),
'metrics' => $metrics,
]);
}
@@ -43,7 +43,7 @@ class MetricController extends AbstractController
public function showAddMetric()
{
return View::make('dashboard.metrics.add')->with([
- 'pageTitle' => trans('dashboard.metrics.add.title').' - '.trans('dashboard.dashboard'),
+ 'page_title' => trans('dashboard.metrics.add.title').' - '.trans('dashboard.dashboard'),
'metricMetricPoints' => MetricPoint::all(),
]);
}
@@ -56,7 +56,7 @@ class MetricController extends AbstractController
public function showMetricPoints()
{
return View::make('dashboard.metrics.points.index')->with([
- 'pageTitle' => trans('dashboard.metrics.points.title').' - '.trans('dashboard.dashboard'),
+ 'page_title' => trans('dashboard.metrics.points.title').' - '.trans('dashboard.dashboard'),
'metricMetricPoints' => MetricPoint::all(),
]);
}
@@ -108,7 +108,7 @@ class MetricController extends AbstractController
public function showAddMetricPoint()
{
return View::make('dashboard.metrics.points.add')->with([
- 'pageTitle' => trans('dashboard.metrics.points.add.title').' - '.trans('dashboard.dashboard'),
+ 'page_title' => trans('dashboard.metrics.points.add.title').' - '.trans('dashboard.dashboard'),
]);
}
@@ -165,7 +165,7 @@ class MetricController extends AbstractController
public function showEditMetricAction(Metric $metric)
{
return View::make('dashboard.metrics.edit')->with([
- 'pageTitle' => trans('dashboard.metrics.edit.title').' - '.trans('dashboard.dashboard'),
+ 'page_title' => trans('dashboard.metrics.edit.title').' - '.trans('dashboard.dashboard'),
'metric' => $metric,
]);
}
diff --git a/app/Http/Controllers/Admin/SettingsController.php b/app/Http/Controllers/Admin/SettingsController.php
index 7d1ef81c..9c1890b1 100644
--- a/app/Http/Controllers/Admin/SettingsController.php
+++ b/app/Http/Controllers/Admin/SettingsController.php
@@ -69,7 +69,7 @@ class SettingsController extends AbstractController
$this->subMenu['setup']['active'] = true;
return View::make('dashboard.settings.app-setup')->with([
- 'pageTitle' => 'Application Setup - Dashboard',
+ 'page_title' => 'Application Setup - Dashboard',
'sub_menu' => $this->subMenu,
]);
}
@@ -84,7 +84,7 @@ class SettingsController extends AbstractController
$this->subMenu['theme']['active'] = true;
return View::make('dashboard.settings.theme')->with([
- 'pageTitle' => 'Theme - Dashboard',
+ 'page_title' => 'Theme - Dashboard',
'sub_menu' => $this->subMenu,
]);
}
@@ -101,7 +101,7 @@ class SettingsController extends AbstractController
$unsecureUsers = User::whereNull('google_2fa_secret')->orWhere('google_2fa_secret', '')->get();
return View::make('dashboard.settings.security')->with([
- 'pageTitle' => 'Security - Dashboard',
+ 'page_title' => 'Security - Dashboard',
'sub_menu' => $this->subMenu,
'unsecureUsers' => $unsecureUsers,
]);
@@ -117,7 +117,7 @@ class SettingsController extends AbstractController
$this->subMenu['stylesheet']['active'] = true;
return View::make('dashboard.settings.stylesheet')->with([
- 'pageTitle' => 'Stylesheet - Dashboard',
+ 'page_title' => 'Stylesheet - Dashboard',
'sub_menu' => $this->subMenu,
]);
}
diff --git a/app/Http/Controllers/Admin/TeamController.php b/app/Http/Controllers/Admin/TeamController.php
index 4a9cde54..09905536 100644
--- a/app/Http/Controllers/Admin/TeamController.php
+++ b/app/Http/Controllers/Admin/TeamController.php
@@ -29,7 +29,7 @@ class TeamController extends AbstractController
$team = User::all();
return View::make('dashboard.team.index')->with([
- 'pageTitle' => trans('dashboard.team.team').' - '.trans('dashboard.dashboard'),
+ 'page_title' => trans('dashboard.team.team').' - '.trans('dashboard.dashboard'),
'teamMembers' => $team,
]);
}
@@ -42,7 +42,7 @@ class TeamController extends AbstractController
public function showTeamMemberView(User $user)
{
return View::make('dashboard.team.edit')->with([
- 'pageTitle' => trans('dashboard.team.edit.title').' - '.trans('dashboard.dashboard'),
+ 'page_title' => trans('dashboard.team.edit.title').' - '.trans('dashboard.dashboard'),
'user' => $user,
]);
}
@@ -55,7 +55,7 @@ class TeamController extends AbstractController
public function showAddTeamMemberView()
{
return View::make('dashboard.team.add')->with([
- 'pageTitle' => trans('dashboard.team.add.title').' - '.trans('dashboard.dashboard'),
+ 'page_title' => trans('dashboard.team.add.title').' - '.trans('dashboard.dashboard'),
]);
}
diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php
index ef26fb56..a698018b 100644
--- a/app/Http/Controllers/Admin/UserController.php
+++ b/app/Http/Controllers/Admin/UserController.php
@@ -29,7 +29,7 @@ class UserController extends AbstractController
public function showUser()
{
return View::make('dashboard.user.index')->with([
- 'pageTitle' => trans('dashboard.team.profile').' - '.trans('dashboard.dashboard'),
+ 'page_title' => trans('dashboard.team.profile').' - '.trans('dashboard.dashboard'),
]);
}
diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php
index dd0a5a03..bbb1493e 100644
--- a/app/Http/Controllers/AuthController.php
+++ b/app/Http/Controllers/AuthController.php
@@ -33,7 +33,7 @@ class AuthController extends AbstractController
public function showLogin()
{
return View::make('auth.login')->with([
- 'pageTitle' => trans('dashboard.login.login'),
+ 'page_title' => trans('dashboard.login.login'),
]);
}
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 59307cf1..52d37907 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -112,7 +112,7 @@ class HomeController extends AbstractController
'canPageBackward' => $canPageBackward,
'previousDate' => $startDate->copy()->subDays($daysToShow)->toDateString(),
'nextDate' => $startDate->copy()->addDays($daysToShow)->toDateString(),
- 'pageTitle' => Setting::get('app_name').' Status',
+ 'page_title' => Setting::get('app_name').' Status',
]);
}
}
diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php
index 58a27e66..03d74fbe 100644
--- a/app/Http/Controllers/SetupController.php
+++ b/app/Http/Controllers/SetupController.php
@@ -59,7 +59,7 @@ class SetupController extends AbstractController
}
return View::make('setup')->with([
- 'pageTitle' => trans('setup.setup'),
+ 'page_title' => trans('setup.setup'),
'cacheDrivers' => $this->cacheDrivers,
'appUrl' => Request::root(),
]);
diff --git a/app/Http/Controllers/SubscribeController.php b/app/Http/Controllers/SubscribeController.php
index 03862f36..848b5536 100644
--- a/app/Http/Controllers/SubscribeController.php
+++ b/app/Http/Controllers/SubscribeController.php
@@ -31,7 +31,7 @@ class SubscribeController extends AbstractController
public function showSubscribe()
{
return View::make('subscribe', [
- 'pageTitle' => Setting::get('app_name'),
+ 'page_title' => Setting::get('app_name'),
'aboutApp' => Markdown::convertToHtml(Setting::get('app_about')),
]);
}
diff --git a/resources/views/layout/error.blade.php b/resources/views/layout/error.blade.php
index f674accb..882069ca 100644
--- a/resources/views/layout/error.blade.php
+++ b/resources/views/layout/error.blade.php
@@ -4,8 +4,8 @@
-
-
+
+
@@ -19,7 +19,7 @@
- {{ isset($pageTitle) ?: Setting::get('app_name') }} Status
+ {{ isset($page_title) ?: Setting::get('app_name') }} Status
diff --git a/resources/views/layout/master.blade.php b/resources/views/layout/master.blade.php
index de77e37f..831457b9 100644
--- a/resources/views/layout/master.blade.php
+++ b/resources/views/layout/master.blade.php
@@ -7,8 +7,8 @@
-
-
+
+
@@ -35,7 +35,7 @@
- {{ $pageTitle }}
+ {{ $page_title }}
diff --git a/resources/views/partials/dashboard/head.blade.php b/resources/views/partials/dashboard/head.blade.php
index 08349e62..330a4973 100644
--- a/resources/views/partials/dashboard/head.blade.php
+++ b/resources/views/partials/dashboard/head.blade.php
@@ -18,7 +18,7 @@
- {{ isset($pageTitle) ? $pageTitle : Setting::get('app_name') }} | Cachet
+ {{ isset($page_title) ? $page_title : Setting::get('app_name') }} | Cachet