3 files changed, 43 insertions, 44 deletions

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
@@ -11,6 +11,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
      *
      * @access public
@@ -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']),
         )));
     }
 }
diff --git a/app/Controller/CalendarController.php b/app/Controller/CalendarController.php
index 5ad253e1..e764549d 100644
--- a/app/Controller/CalendarController.php
+++ b/app/Controller/CalendarController.php
@@ -17,17 +17,31 @@ use Kanboard\Model\TaskModel;
 class CalendarController extends BaseController
 {
     /**
-     * Show calendar view for projects
+     * Show calendar view for a user
      *
      * @access public
      */
-    public function show()
+    public function user()
+    {
+        $user = $this->getUser();
+
+        $this->response->html($this->helper->layout->app('calendar/user', array(
+            'user' => $user,
+        )));
+    }
+
+    /**
+     * Show calendar view for a project
+     *
+     * @access public
+     */
+    public function project()
     {
         $project = $this->getProject();
 
-        $this->response->html($this->helper->layout->app('calendar/show', array(
-            'project' => $project,
-            'title' => $project['name'],
+        $this->response->html($this->helper->layout->app('calendar/project', array(
+            'project'     => $project,
+            'title'       => $project['name'],
             'description' => $this->helper->projectHeader->getDescription($project),
         )));
     }
@@ -37,7 +51,7 @@ class CalendarController extends BaseController
      *
      * @access public
      */
-    public function project()
+    public function projectEvents()
     {
         $project_id = $this->request->getIntegerParam('project_id');
         $start = $this->request->getStringParam('start');
@@ -62,7 +76,7 @@ class CalendarController extends BaseController
      *
      * @access public
      */
-    public function user()
+    public function userEvents()
     {
         $user_id = $this->request->getIntegerParam('user_id');
         $start = $this->request->getStringParam('start');
diff --git a/app/Controller/DashboardController.php b/app/Controller/DashboardController.php
index cdd256d8..7fdc53ff 100644
--- a/app/Controller/DashboardController.php
+++ b/app/Controller/DashboardController.php
@@ -75,35 +75,4 @@ class DashboardController extends BaseController
             'user' => $user,
         )));
     }
-
-    /**
-     * My activity stream
-     *
-     * @access public
-     */
-    public function activity()
-    {
-        $user = $this->getUser();
-
-        $this->response->html($this->helper->layout->dashboard('dashboard/activity', 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,
-        )));
-    }
-
-    /**
-     * My calendar
-     *
-     * @access public
-     */
-    public function calendar()
-    {
-        $user = $this->getUser();
-
-        $this->response->html($this->helper->layout->dashboard('dashboard/calendar', array(
-            'title' => t('Calendar for %s', $this->helper->user->getFullname($user)),
-            'user' => $user,
-        )));
-    }
 }