Simplify layout and templates generation

1 files changed, 7 insertions, 23 deletions

diff --git a/app/Controller/App.php b/app/Controller/App.php
index bdd7fbcf..1ce74506 100644
--- a/app/Controller/App.php
+++ b/app/Controller/App.php
@@ -13,22 +13,6 @@ use Kanboard\Model\Subtask as SubtaskModel;
 class App extends Base
 {
     /**
-     * Common layout for dashboard views
-     *
-     * @access private
-     * @param  string    $template   Template name
-     * @param  array     $params     Template parameters
-     * @return string
-     */
-    private function layout($template, array $params)
-    {
-        $params['board_selector'] = $this->projectUserRole->getActiveProjectsByUser($this->userSession->getId());
-        $params['content_for_sublayout'] = $this->template->render($template, $params);
-
-        return $this->template->layout('app/layout', $params);
-    }
-
-    /**
      * Get project pagination
      *
      * @access private
@@ -101,7 +85,7 @@ class App extends Base
     {
         $user = $this->getUser();
 
-        $this->response->html($this->layout('app/overview', array(
+        $this->response->html($this->helper->layout->dashboard('app/overview', array(
             'title' => t('Dashboard'),
             'project_paginator' => $this->getProjectPaginator($user['id'], 'index', 10),
             'task_paginator' => $this->getTaskPaginator($user['id'], 'index', 10),
@@ -119,7 +103,7 @@ class App extends Base
     {
         $user = $this->getUser();
 
-        $this->response->html($this->layout('app/tasks', array(
+        $this->response->html($this->helper->layout->dashboard('app/tasks', array(
             'title' => t('My tasks'),
             'paginator' => $this->getTaskPaginator($user['id'], 'tasks', 50),
             'user' => $user,
@@ -135,7 +119,7 @@ class App extends Base
     {
         $user = $this->getUser();
 
-        $this->response->html($this->layout('app/subtasks', array(
+        $this->response->html($this->helper->layout->dashboard('app/subtasks', array(
             'title' => t('My subtasks'),
             'paginator' => $this->getSubtaskPaginator($user['id'], 'subtasks', 50),
             'user' => $user,
@@ -151,7 +135,7 @@ class App extends Base
     {
         $user = $this->getUser();
 
-        $this->response->html($this->layout('app/projects', array(
+        $this->response->html($this->helper->layout->dashboard('app/projects', array(
             'title' => t('My projects'),
             'paginator' => $this->getProjectPaginator($user['id'], 'projects', 25),
             'user' => $user,
@@ -167,7 +151,7 @@ class App extends Base
     {
         $user = $this->getUser();
 
-        $this->response->html($this->layout('app/activity', array(
+        $this->response->html($this->helper->layout->dashboard('app/activity', array(
             'title' => t('My activity stream'),
             'events' => $this->projectActivity->getProjects($this->projectPermission->getActiveProjectIds($user['id']), 100),
             'user' => $user,
@@ -181,7 +165,7 @@ class App extends Base
      */
     public function calendar()
     {
-        $this->response->html($this->layout('app/calendar', array(
+        $this->response->html($this->helper->layout->dashboard('app/calendar', array(
             'title' => t('My calendar'),
             'user' => $this->getUser(),
         )));
@@ -196,7 +180,7 @@ class App extends Base
     {
         $user = $this->getUser();
 
-        $this->response->html($this->layout('app/notifications', array(
+        $this->response->html($this->helper->layout->dashboard('app/notifications', array(
             'title' => t('My notifications'),
             'notifications' => $this->userUnreadNotification->getAll($user['id']),
             'user' => $user,