From 8f6b3295e89af4c877f5522b9941fafd51b795c7 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sat, 11 Mar 2017 19:36:48 -0500
Subject: Move dashboard menu for calendar and activity stream

---
 app/Controller/ActivityController.php | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

(limited to 'app/Controller/ActivityController.php')

diff --git a/app/Controller/ActivityController.php b/app/Controller/ActivityController.php
index 476e4aac..a1734af1 100644
--- a/app/Controller/ActivityController.php
+++ b/app/Controller/ActivityController.php
@@ -10,6 +10,22 @@ namespace Kanboard\Controller;
  */
 class ActivityController extends BaseController
 {
+    /**
+     * Activity page for a user
+     *
+     * @access public
+     */
+    public function user()
+    {
+        $user = $this->getUser();
+
+        $this->response->html($this->helper->layout->dashboard('activity/user', array(
+            'title'  => t('Activity stream for %s', $this->helper->user->getFullname($user)),
+            'events' => $this->helper->projectActivity->getProjectsEvents($this->projectPermissionModel->getActiveProjectIds($user['id']), 100),
+            'user'   => $user,
+        )));
+    }
+
     /**
      * Activity page for a project
      *
@@ -20,9 +36,9 @@ class ActivityController extends BaseController
         $project = $this->getProject();
 
         $this->response->html($this->helper->layout->app('activity/project', array(
-            'events' => $this->helper->projectActivity->getProjectEvents($project['id']),
+            'title'   => t('%s\'s activity', $project['name']),
+            'events'  => $this->helper->projectActivity->getProjectEvents($project['id']),
             'project' => $project,
-            'title' => t('%s\'s activity', $project['name'])
         )));
     }
 
@@ -36,11 +52,11 @@ class ActivityController extends BaseController
         $task = $this->getTask();
 
         $this->response->html($this->helper->layout->task('activity/task', array(
-            'title' => $task['title'],
-            'task' => $task,
+            'title'   => $task['title'],
+            'task'    => $task,
             'project' => $this->projectModel->getById($task['project_id']),
-            'events' => $this->helper->projectActivity->getTaskEvents($task['id']),
-            'tags' => $this->taskTagModel->getList($task['id']),
+            'events'  => $this->helper->projectActivity->getTaskEvents($task['id']),
+            'tags'    => $this->taskTagModel->getList($task['id']),
         )));
     }
 }
-- 
cgit v1.2.3