summaryrefslogtreecommitdiff
path: root/app/Template
diff options
context:
space:
mode:
Diffstat (limited to 'app/Template')
-rw-r--r--app/Template/app/dashboard.php10
-rw-r--r--app/Template/user/calendar.php5
-rw-r--r--app/Template/user/sidebar.php3
3 files changed, 18 insertions, 0 deletions
diff --git a/app/Template/app/dashboard.php b/app/Template/app/dashboard.php
index c29ae02e..80f32fee 100644
--- a/app/Template/app/dashboard.php
+++ b/app/Template/app/dashboard.php
@@ -25,6 +25,9 @@
<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>
</ul>
@@ -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)) ?>
diff --git a/app/Template/user/calendar.php b/app/Template/user/calendar.php
new file mode 100644
index 00000000..ab7d05a2
--- /dev/null
+++ b/app/Template/user/calendar.php
@@ -0,0 +1,5 @@
+<div id="user-calendar"
+ data-check-url="<?= $this->u('calendar', 'user') ?>"
+ data-user-id="<?= $user['id'] ?>"
+>
+</div> \ No newline at end of file
diff --git a/app/Template/user/sidebar.php b/app/Template/user/sidebar.php
index 05be2e84..e41851a9 100644
--- a/app/Template/user/sidebar.php
+++ b/app/Template/user/sidebar.php
@@ -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'])): ?>