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/CalendarController.php | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

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

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');
-- 
cgit v1.2.3