Add user calendar view on the dashboard and in the user management section

This commit is contained in:
Frederic Guillot
2015-02-08 16:13:05 -05:00
parent acf3941b4a
commit 92509c43c4
26 changed files with 182 additions and 43 deletions

View File

@@ -24,6 +24,9 @@
<li>
<a href="#" class="dashboard-toggle" data-toggle="subtasks"><?= t('Show/hide subtasks') ?></a>
</li>
<li>
<a href="#" class="dashboard-toggle" data-toggle="calendar"><?= t('Show/hide calendar') ?></a>
</li>
<li>
<a href="#" class="dashboard-toggle" data-toggle="activities"><?= t('Show/hide activities') ?></a>
</li>
@@ -40,6 +43,13 @@
<div id="dashboard-subtasks"><?= $this->render('app/subtasks', array('paginator' => $subtask_paginator)) ?></div>
</div>
<div class="dashboard-right-column">
<div id="dashboard-calendar">
<div id="user-calendar"
data-check-url="<?= $this->u('calendar', 'user') ?>"
data-user-id="<?= $user_id ?>"
>
</div>
</div>
<div id="dashboard-activities">
<h2><?= t('Activity stream') ?></h2>
<?= $this->render('project/events', array('events' => $events)) ?>

View File

@@ -0,0 +1,5 @@
<div id="user-calendar"
data-check-url="<?= $this->u('calendar', 'user') ?>"
data-user-id="<?= $user['id'] ?>"
>
</div>

View File

@@ -37,6 +37,9 @@
<li>
<?= $this->a(t('User dashboard'), 'app', 'dashboard', array('user_id' => $user['id'])) ?>
</li>
<li>
<?= $this->a(t('User calendar'), 'user', 'calendar', array('user_id' => $user['id'])) ?>
</li>
<?php endif ?>
<?php if ($this->userSession->isAdmin() && ! $this->userSession->isCurrentUser($user['id'])): ?>