Move dashboard menu for calendar and activity stream

This commit is contained in:
Frederic Guillot
2017-03-11 19:36:48 -05:00
parent cfd3000d83
commit 8f6b3295e8
11 changed files with 59 additions and 66 deletions

View File

@@ -1,4 +0,0 @@
<div class="page-header">
<h2><?= t('My activity stream') ?></h2>
</div>
<?= $this->render('event/events', array('events' => $events)) ?>

View File

@@ -1,4 +0,0 @@
<?= $this->calendar->render(
$this->url->href('CalendarController', 'user', array('user_id' => $user['id'])),
$this->url->href('CalendarController', 'save')
) ?>

View File

@@ -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>

View File

@@ -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>