Move dashboard menu for calendar and activity stream

8 files changed, 16 insertions, 22 deletions

diff --git a/app/Template/dashboard/activity.php b/app/Template/activity/user.php
index 71a67fb2..71a67fb2 100644
--- a/app/Template/dashboard/activity.php
+++ b/app/Template/activity/user.php
diff --git a/app/Template/calendar/project.php b/app/Template/calendar/project.php
new file mode 100644
index 00000000..769e019b
--- /dev/null
+++ b/app/Template/calendar/project.php
@@ -0,0 +1,6 @@
+<?= $this->projectHeader->render($project, 'CalendarController', 'show') ?>
+
+<?= $this->calendar->render(
+    $this->url->href('CalendarController', 'projectEvents', array('project_id' => $project['id'])),
+    $this->url->href('CalendarController', 'save', array('project_id' => $project['id']))
+) ?>
diff --git a/app/Template/calendar/show.php b/app/Template/calendar/show.php
deleted file mode 100644
index 009fc07e..00000000
--- a/app/Template/calendar/show.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<section id="main">
-    <?= $this->projectHeader->render($project, 'CalendarController', 'show') ?>
-
-    <?= $this->calendar->render(
-            $this->url->href('CalendarController', 'project', array('project_id' => $project['id'])),
-            $this->url->href('CalendarController', 'save', array('project_id' => $project['id']))
-    ) ?>
-
-</section>
diff --git a/app/Template/calendar/user.php b/app/Template/calendar/user.php
new file mode 100644
index 00000000..c68bd32d
--- /dev/null
+++ b/app/Template/calendar/user.php
@@ -0,0 +1,4 @@
+<?= $this->calendar->render(
+    $this->url->href('CalendarController', 'userEvents', array('user_id' => $user['id'])),
+    $this->url->href('CalendarController', 'save')
+) ?>
diff --git a/app/Template/dashboard/calendar.php b/app/Template/dashboard/calendar.php
deleted file mode 100644
index 0b768b31..00000000
--- a/app/Template/dashboard/calendar.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?= $this->calendar->render(
-        $this->url->href('CalendarController', 'user', array('user_id' => $user['id'])),
-        $this->url->href('CalendarController', 'save')
-) ?>
diff --git a/app/Template/dashboard/layout.php b/app/Template/dashboard/layout.php
index 15ab8a1a..dbd16886 100644
--- a/app/Template/dashboard/layout.php
+++ b/app/Template/dashboard/layout.php
@@ -12,10 +12,13 @@
             </li>
             <?php endif ?>
             <li>
-                <?= $this->url->icon('search', t('Search'), 'SearchController', 'index') ?>
+                <?= $this->url->icon('folder', t('Project management'), 'ProjectListController', 'show') ?>
             </li>
             <li>
-                <?= $this->url->icon('folder', t('Project management'), 'ProjectListController', 'show') ?>
+                <?= $this->modal->medium('dashboard', t('My activity stream'), 'ActivityController', 'user') ?>
+            </li>
+            <li>
+                <?= $this->modal->medium('calendar', t('My calendar'), 'CalendarController', 'user') ?>
             </li>
         </ul>
     </div>
diff --git a/app/Template/dashboard/sidebar.php b/app/Template/dashboard/sidebar.php
index e4c1038a..7507b00d 100644
--- a/app/Template/dashboard/sidebar.php
+++ b/app/Template/dashboard/sidebar.php
@@ -12,12 +12,6 @@
         <li <?= $this->app->checkMenuSelection('DashboardController', 'subtasks') ?>>
             <?= $this->url->link(t('My subtasks'), 'DashboardController', 'subtasks', array('user_id' => $user['id'])) ?>
         </li>
-        <li <?= $this->app->checkMenuSelection('DashboardController', 'calendar') ?>>
-            <?= $this->url->link(t('My calendar'), 'DashboardController', 'calendar', array('user_id' => $user['id'])) ?>
-        </li>
-        <li <?= $this->app->checkMenuSelection('DashboardController', 'activity') ?>>
-            <?= $this->url->link(t('My activity stream'), 'DashboardController', 'activity', array('user_id' => $user['id'])) ?>
-        </li>
         <?= $this->hook->render('template:dashboard:sidebar', array('user' => $user)) ?>
     </ul>
 </div>
diff --git a/app/Template/project_header/views.php b/app/Template/project_header/views.php
index 0328a051..2684c744 100644
--- a/app/Template/project_header/views.php
+++ b/app/Template/project_header/views.php
@@ -6,7 +6,7 @@
         <?= $this->url->icon('th', t('Board'), 'BoardViewController', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-board', t('Keyboard shortcut: "%s"', 'v b')) ?>
     </li>
     <li <?= $this->app->checkMenuSelection('CalendarController') ?>>
-        <?= $this->url->icon('calendar', t('Calendar'), 'CalendarController', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-calendar', t('Keyboard shortcut: "%s"', 'v c')) ?>
+        <?= $this->url->icon('calendar', t('Calendar'), 'CalendarController', 'project', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-calendar', t('Keyboard shortcut: "%s"', 'v c')) ?>
     </li>
     <li <?= $this->app->checkMenuSelection('TaskListController') ?>>
         <?= $this->url->icon('list', t('List'), 'TaskListController', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-listing', t('Keyboard shortcut: "%s"', 'v l')) ?>