lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
lbriggs
2014-12-31 11:51:00 +00:00
parent 1c851951df 3132a65cc3
commit e64d418b54
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/controllers/DashSettingsController.php
View File

@@ -5,7 +5,8 @@ class DashSettingsController extends Controller
protected $subMenu = [];
protected $subTitle = 'Settings';
public function __construct() {
public function __construct()
{
$this->subMenu = [
'setup' => [
'title' => 'Application Setup',
@@ -30,7 +31,7 @@ class DashSettingsController extends Controller
'url' => '/dashboard/settings/stylesheet',
'icon' => 'ion-paintbucket',
'active' => false,
]
],
];
View::share('subTitle', $this->subTitle);
@@ -48,7 +49,7 @@ class DashSettingsController extends Controller
return View::make('dashboard.settings-app-setup')->with([
'pageTitle' => 'Application Setup - Dashboard',
'subMenu' => $this->subMenu
'subMenu' => $this->subMenu,
]);
}
@@ -63,7 +64,7 @@ class DashSettingsController extends Controller
return View::make('dashboard.settings-theme')->with([
'pageTitle' => 'Theme - Dashboard',
'subMenu' => $this->subMenu
'subMenu' => $this->subMenu,
]);
}
@@ -78,7 +79,7 @@ class DashSettingsController extends Controller
return View::make('dashboard.settings-security')->with([
'pageTitle' => 'Security - Dashboard',
'subMenu' => $this->subMenu
'subMenu' => $this->subMenu,
]);
}
@@ -93,7 +94,7 @@ class DashSettingsController extends Controller
return View::make('dashboard.settings-stylesheet')->with([
'pageTitle' => 'Stylesheet - Dashboard',
'subMenu' => $this->subMenu
'subMenu' => $this->subMenu,
]);
}

1
app/controllers/SetupController.php
View File

@@ -51,6 +51,7 @@ class SetupController extends Controller
'username' => $userDetails['username'],
'email' => $userDetails['email'],
'password' => $userDetails['password'],
'level' => 1,
]);
Auth::login($user);