summaryrefslogtreecommitdiff
path: root/app/Template/board
diff options
context:
space:
mode:
authorFrederic Guillot <fred@kanboard.net>2015-01-17 17:11:51 -0500
committerFrederic Guillot <fred@kanboard.net>2015-01-17 17:11:51 -0500
commit84b0f0df90442775b9122457648f06c9485df1f1 (patch)
tree5f0fb91ed9280bbf10bb60d69f3523cafc928f5c /app/Template/board
parent4b45b2aa3533309898670f1b13756dfdfce355a7 (diff)
Add project calendars (merge/refactoring of #490)
Diffstat (limited to 'app/Template/board')
-rw-r--r--app/Template/board/filters.php8
-rw-r--r--app/Template/board/task.php4
2 files changed, 9 insertions, 3 deletions
diff --git a/app/Template/board/filters.php b/app/Template/board/filters.php
index 36259820..1f0afe9c 100644
--- a/app/Template/board/filters.php
+++ b/app/Template/board/filters.php
@@ -23,13 +23,19 @@
<i class="fa fa-dashboard fa-fw"></i>
<?= $this->a(t('Activity'), 'project', 'activity', array('project_id' => $project['id'])) ?>
</li>
+ <li>
+ <i class="fa fa-calendar fa-fw"></i>
+ <?= $this->a(t('Calendar'), 'calendar', 'show', array('project_id' => $project['id'])) ?>
+ </li>
<?php if ($this->acl->isManagerActionAllowed($project['id'])): ?>
<li>
<i class="fa fa-line-chart fa-fw"></i>
<?= $this->a(t('Analytics'), 'analytic', 'tasks', array('project_id' => $project['id'])) ?>
</li>
- <li><i class="fa fa-cog fa-fw"></i>
+ <li>
+ <i class="fa fa-cog fa-fw"></i>
<?= $this->a(t('Configure'), 'project', 'show', array('project_id' => $project['id'])) ?>
+ </li>
<?php endif ?>
</ul>
</div> \ No newline at end of file
diff --git a/app/Template/board/task.php b/app/Template/board/task.php
index 6700b693..66ddee60 100644
--- a/app/Template/board/task.php
+++ b/app/Template/board/task.php
@@ -1,6 +1,6 @@
<?php if ($not_editable): ?>
-<div class="task-board task-<?= $task['color_id'] ?> <?= $task['date_modification'] > time() - $board_highlight_period ? 'task-board-recent' : '' ?>">
+<div class="task-board color-<?= $task['color_id'] ?> <?= $task['date_modification'] > time() - $board_highlight_period ? 'task-board-recent' : '' ?>">
<?= $this->a('#'.$task['id'], 'task', 'readonly', array('task_id' => $task['id'], 'token' => $project['token'])) ?>
@@ -30,7 +30,7 @@
<?php else: ?>
-<div class="task-board draggable-item task-<?= $task['color_id'] ?> <?= $task['date_modification'] > time() - $board_highlight_period ? 'task-board-recent' : '' ?>"
+<div class="task-board draggable-item color-<?= $task['color_id'] ?> <?= $task['date_modification'] > time() - $board_highlight_period ? 'task-board-recent' : '' ?>"
data-task-id="<?= $task['id'] ?>"
data-owner-id="<?= $task['owner_id'] ?>"
data-category-id="<?= $task['category_id'] ?>"