summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/Controller/Base.php2
-rw-r--r--app/Model/Base.php1
-rw-r--r--app/Template/board/filters.php2
-rw-r--r--app/Template/calendar/show.php17
-rw-r--r--app/Template/project/activity.php19
-rw-r--r--app/Template/project/layout.php10
-rw-r--r--app/Template/project/search.php19
-rw-r--r--app/Template/project/tasks.php19
-rw-r--r--app/Template/task/layout.php9
9 files changed, 84 insertions, 14 deletions
diff --git a/app/Controller/Base.php b/app/Controller/Base.php
index 8a5354aa..48ce62fa 100644
--- a/app/Controller/Base.php
+++ b/app/Controller/Base.php
@@ -36,6 +36,7 @@ use Symfony\Component\EventDispatcher\Event;
* @property \Model\ProjectAnalytic $projectAnalytic
* @property \Model\ProjectDailySummary $projectDailySummary
* @property \Model\SubTask $subTask
+ * @property \Model\Swimlane $swimlane
* @property \Model\Task $task
* @property \Model\TaskCreation $taskCreation
* @property \Model\TaskModification $taskModification
@@ -43,6 +44,7 @@ use Symfony\Component\EventDispatcher\Event;
* @property \Model\TaskHistory $taskHistory
* @property \Model\TaskExport $taskExport
* @property \Model\TaskFinder $taskFinder
+ * @property \Model\TaskFilter $taskFilter
* @property \Model\TaskPosition $taskPosition
* @property \Model\TaskPermission $taskPermission
* @property \Model\TaskStatus $taskStatus
diff --git a/app/Model/Base.php b/app/Model/Base.php
index 3f847c2e..a6333144 100644
--- a/app/Model/Base.php
+++ b/app/Model/Base.php
@@ -23,6 +23,7 @@ use Pimple\Container;
* @property \Model\Config $config
* @property \Model\DateParser $dateParser
* @property \Model\File $file
+ * @property \Model\Helper $helper
* @property \Model\LastLogin $lastLogin
* @property \Model\Notification $notification
* @property \Model\Project $project
diff --git a/app/Template/board/filters.php b/app/Template/board/filters.php
index 1f0afe9c..45255231 100644
--- a/app/Template/board/filters.php
+++ b/app/Template/board/filters.php
@@ -12,7 +12,7 @@
<a href="#" id="filter-due-date"><?= t('Filter by due date') ?></a>
</li>
<li>
- <i class="fa fa-search"></i>
+ <i class="fa fa-search fa-fw"></i>
<?= $this->a(t('Search'), 'project', 'search', array('project_id' => $project['id'])) ?>
</li>
<li>
diff --git a/app/Template/calendar/show.php b/app/Template/calendar/show.php
index aae856f4..0a41fabe 100644
--- a/app/Template/calendar/show.php
+++ b/app/Template/calendar/show.php
@@ -1,7 +1,22 @@
<section id="main">
<div class="page-header">
<ul>
- <li><i class="fa fa-table fa-fw"></i><?= $this->a(t('Back to the board'), 'board', 'show', array('project_id' => $project['id'])) ?></li>
+ <li>
+ <i class="fa fa-table fa-fw"></i>
+ <?= $this->a(t('Back to the board'), 'board', 'show', array('project_id' => $project['id'])) ?>
+ </li>
+ <li>
+ <i class="fa fa-search fa-fw"></i>
+ <?= $this->a(t('Search'), 'project', 'search', array('project_id' => $project['id'])) ?>
+ </li>
+ <li>
+ <i class="fa fa-check-square-o fa-fw"></i>
+ <?= $this->a(t('Completed tasks'), 'project', 'tasks', array('project_id' => $project['id'])) ?>
+ </li>
+ <li>
+ <i class="fa fa-dashboard fa-fw"></i>
+ <?= $this->a(t('Activity'), 'project', 'activity', array('project_id' => $project['id'])) ?>
+ </li>
</ul>
</div>
<section class="sidebar-container">
diff --git a/app/Template/project/activity.php b/app/Template/project/activity.php
index cb986658..bc4eb19c 100644
--- a/app/Template/project/activity.php
+++ b/app/Template/project/activity.php
@@ -1,9 +1,22 @@
<section id="main">
<div class="page-header">
<ul>
- <li><i class="fa fa-table fa-fw"></i><?= $this->a(t('Back to the board'), 'board', 'show', array('project_id' => $project['id'])) ?></li>
- <li><i class="fa fa-search fa-fw"></i><?= $this->a(t('Search'), 'project', 'search', array('project_id' => $project['id'])) ?></li>
- <li><i class="fa fa-check-square-o fa-fw"></i><?= $this->a(t('Completed tasks'), 'project', 'tasks', array('project_id' => $project['id'])) ?></li>
+ <li>
+ <i class="fa fa-table fa-fw"></i>
+ <?= $this->a(t('Back to the board'), 'board', 'show', 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>
+ <li>
+ <i class="fa fa-search fa-fw"></i>
+ <?= $this->a(t('Search'), 'project', 'search', array('project_id' => $project['id'])) ?>
+ </li>
+ <li>
+ <i class="fa fa-check-square-o fa-fw"></i>
+ <?= $this->a(t('Completed tasks'), 'project', 'tasks', array('project_id' => $project['id'])) ?>
+ </li>
<?php if ($project['is_public']): ?>
<li><i class="fa fa-rss-square fa-fw"></i><?= $this->a(t('RSS feed'), 'project', 'feed', array('token' => $project['token']), false, '', '', true) ?></li>
<?php endif ?>
diff --git a/app/Template/project/layout.php b/app/Template/project/layout.php
index ce154c19..8cd1fd3c 100644
--- a/app/Template/project/layout.php
+++ b/app/Template/project/layout.php
@@ -1,8 +1,14 @@
<section id="main">
<div class="page-header">
<ul>
- <li><i class="fa fa-table fa-fw"></i><?= $this->a(t('Back to the board'), 'board', 'show', array('project_id' => $project['id'])) ?></li>
- <li><i class="fa fa-folder fa-fw"></i><?= $this->a(t('All projects'), 'project', 'index') ?></li>
+ <li>
+ <i class="fa fa-table fa-fw"></i>
+ <?= $this->a(t('Back to the board'), 'board', 'show', array('project_id' => $project['id'])) ?>
+ </li>
+ <li>
+ <i class="fa fa-folder fa-fw"></i>
+ <?= $this->a(t('All projects'), 'project', 'index') ?>
+ </li>
</ul>
</div>
<section class="sidebar-container" id="project-section">
diff --git a/app/Template/project/search.php b/app/Template/project/search.php
index c8a3e410..695940ac 100644
--- a/app/Template/project/search.php
+++ b/app/Template/project/search.php
@@ -1,9 +1,22 @@
<section id="main">
<div class="page-header">
<ul>
- <li><i class="fa fa-table fa-fw"></i><?= $this->a(t('Back to the board'), 'board', 'show', array('project_id' => $project['id'])) ?></li>
- <li><i class="fa fa-check-square-o fa-fw"></i><?= $this->a(t('Completed tasks'), 'project', 'tasks', array('project_id' => $project['id'])) ?></li>
- <li><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-table fa-fw"></i>
+ <?= $this->a(t('Back to the board'), 'board', 'show', 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>
+ <li>
+ <i class="fa fa-check-square-o fa-fw"></i>
+ <?= $this->a(t('Completed tasks'), 'project', 'tasks', array('project_id' => $project['id'])) ?>
+ </li>
+ <li>
+ <i class="fa fa-dashboard fa-fw"></i>
+ <?= $this->a(t('Activity'), 'project', 'activity', array('project_id' => $project['id'])) ?>
+ </li>
</ul>
</div>
<section>
diff --git a/app/Template/project/tasks.php b/app/Template/project/tasks.php
index 6ca24acf..c52abde4 100644
--- a/app/Template/project/tasks.php
+++ b/app/Template/project/tasks.php
@@ -1,9 +1,22 @@
<section id="main">
<div class="page-header">
<ul>
- <li><i class="fa fa-table fa-fw"></i><?= $this->a(t('Back to the board'), 'board', 'show', array('project_id' => $project['id'])) ?></li>
- <li><i class="fa fa-search fa-fw"></i><?= $this->a(t('Search'), 'project', 'search', array('project_id' => $project['id'])) ?></li>
- <li><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-table fa-fw"></i>
+ <?= $this->a(t('Back to the board'), 'board', 'show', 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>
+ <li>
+ <i class="fa fa-search fa-fw"></i>
+ <?= $this->a(t('Search'), 'project', 'search', array('project_id' => $project['id'])) ?>
+ </li>
+ <li>
+ <i class="fa fa-dashboard fa-fw"></i>
+ <?= $this->a(t('Activity'), 'project', 'activity', array('project_id' => $project['id'])) ?>
+ </li>
</ul>
</div>
<section>
diff --git a/app/Template/task/layout.php b/app/Template/task/layout.php
index dd36903d..dd59a9fc 100644
--- a/app/Template/task/layout.php
+++ b/app/Template/task/layout.php
@@ -1,7 +1,14 @@
<section id="main">
<div class="page-header">
<ul>
- <li><i class="fa fa-table fa-fw"></i><?= $this->a(t('Back to the board'), 'board', 'show', array('project_id' => $task['project_id'])) ?></li>
+ <li>
+ <i class="fa fa-table fa-fw"></i>
+ <?= $this->a(t('Back to the board'), 'board', 'show', array('project_id' => $task['project_id'])) ?>
+ </li>
+ <li>
+ <i class="fa fa-calendar fa-fw"></i>
+ <?= $this->a(t('Calendar'), 'calendar', 'show', array('project_id' => $task['project_id'])) ?>
+ </li>
</ul>
</div>
<section class="sidebar-container" id="task-section">
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-23 10:52:57 +0000