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/Template/dashboard/activity.php | 4 ----
 app/Template/dashboard/calendar.php | 4 ----
 app/Template/dashboard/layout.php   | 7 +++++--
 app/Template/dashboard/sidebar.php  | 6 ------
 4 files changed, 5 insertions(+), 16 deletions(-)
 delete mode 100644 app/Template/dashboard/activity.php
 delete mode 100644 app/Template/dashboard/calendar.php

(limited to 'app/Template/dashboard')

diff --git a/app/Template/dashboard/activity.php b/app/Template/dashboard/activity.php
deleted file mode 100644
index 71a67fb2..00000000
--- a/app/Template/dashboard/activity.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="page-header">
-    <h2><?= t('My activity stream') ?></h2>
-</div>
-<?= $this->render('event/events', array('events' => $events)) ?>
\ No newline at end of file
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>
-- 
cgit v1.2.3