summaryrefslogtreecommitdiff
path: root/app/Template
diff options
context:
space:
mode:
Diffstat (limited to 'app/Template')
-rw-r--r--app/Template/activity/filter_dropdown.php14
-rw-r--r--app/Template/notification/task_overdue.php43
-rw-r--r--app/Template/search/activity.php39
-rw-r--r--app/Template/search/index.php4
-rw-r--r--app/Template/task/details.php8
-rw-r--r--app/Template/task/sidebar.php6
-rw-r--r--app/Template/user/index.php5
7 files changed, 99 insertions, 20 deletions
diff --git a/app/Template/activity/filter_dropdown.php b/app/Template/activity/filter_dropdown.php
new file mode 100644
index 00000000..8d7a7de3
--- /dev/null
+++ b/app/Template/activity/filter_dropdown.php
@@ -0,0 +1,14 @@
+<div class="dropdown">
+ <a href="#" class="dropdown-menu dropdown-menu-link-icon" title="<?= t('Default filters') ?>"><i class="fa fa-filter fa-fw"></i><i class="fa fa-caret-down"></i></a>
+ <ul>
+ <li><a href="#" class="filter-helper filter-reset" data-filter="" title="<?= t('Keyboard shortcut: "%s"', 'r') ?>"><?= t('Reset filters') ?></a></li>
+ <li><a href="#" class="filter-helper" data-filter="creator:me"><?= t('My activities') ?></a></li>
+ <li><a href="#" class="filter-helper" data-filter="created:<=<?= date('Y-m-d', strtotime('yesterday')) ?>"><?= t('Activity until yesterday') ?></a></li>
+ <li><a href="#" class="filter-helper" data-filter="created:<=<?= date('Y-m-d')?>"><?= t('Activity until today') ?></a></li>
+ <li><a href="#" class="filter-helper" data-filter="status:closed"><?= t('Closed tasks') ?></a></li>
+ <li><a href="#" class="filter-helper" data-filter="status:open"><?= t('Open tasks') ?></a></li>
+ <li>
+ <?= $this->url->doc(t('View advanced search syntax'), 'search') ?>
+ </li>
+ </ul>
+</div> \ No newline at end of file
diff --git a/app/Template/notification/task_overdue.php b/app/Template/notification/task_overdue.php
index ac0665a2..ee2ff379 100644
--- a/app/Template/notification/task_overdue.php
+++ b/app/Template/notification/task_overdue.php
@@ -1,18 +1,31 @@
-<h2><?= t('Overdue tasks for the project "%s"', $project_name) ?></h2>
+<h2><?= t('Overdue tasks for the project(s) "%s"', $project_name) ?></h2>
+
+<table style="font-size: .8em; table-layout: fixed; width: 100%; border-collapse: collapse; border-spacing: 0; margin-bottom: 20px;" cellpadding=5 cellspacing=1>
+ <tr style="background: #fbfbfb; text-align: left; padding-top: .5em; padding-bottom: .5em; padding-left: 3px; padding-right: 3px;">
+ <th style="border: 1px solid #eee;"><?= t('ID') ?></th>
+ <th style="border: 1px solid #eee;"><?= t('Title') ?></th>
+ <th style="border: 1px solid #eee;"><?= t('Due date') ?></th>
+ <th style="border: 1px solid #eee;"><?= t('Project') ?></th>
+ <th style="border: 1px solid #eee;"><?= t('Assignee') ?></th>
+ </tr>
-<ul>
<?php foreach ($tasks as $task): ?>
- <li>
- (<strong>#<?= $task['id'] ?></strong>)
- <?php if ($application_url): ?>
- <a href="<?= $this->url->href('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', true) ?>"><?= $this->text->e($task['title']) ?></a>
- <?php else: ?>
- <?= $this->text->e($task['title']) ?>
- <?php endif ?>
- (<?= $this->dt->date($task['date_due']) ?>)
- <?php if ($task['assignee_username']): ?>
- (<strong><?= t('Assigned to %s', $task['assignee_name'] ?: $task['assignee_username']) ?></strong>)
- <?php endif ?>
- </li>
+ <tr style="overflow: hidden; background: #fff; text-align: left; padding-top: .5em; padding-bottom: .5em; padding-left: 3px; padding-right: 3px;">
+ <td style="border: 1px solid #eee;">#<?= $task['id'] ?></td>
+ <td style="border: 1px solid #eee;">
+ <?php if ($application_url): ?>
+ <a href="<?= $this->url->href('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', true) ?>"><?= $this->text->e($task['title']) ?></a>
+ <?php else: ?>
+ <?= $this->text->e($task['title']) ?>
+ <?php endif ?>
+ </td>
+ <td style="border: 1px solid #eee;"><?= $this->dt->date($task['date_due']) ?></td>
+ <td style="border: 1px solid #eee;"><?= $task['project_name'] ?></td>
+ <td style="border: 1px solid #eee;">
+ <?php if ($task['assignee_username']): ?>
+ <?= t('%s', $task['assignee_name'] ?: $task['assignee_username']) ?>
+ <?php endif ?>
+ </td>
+ </tr>
<?php endforeach ?>
-</ul>
+</table>
diff --git a/app/Template/search/activity.php b/app/Template/search/activity.php
new file mode 100644
index 00000000..60362215
--- /dev/null
+++ b/app/Template/search/activity.php
@@ -0,0 +1,39 @@
+<section id="main">
+ <div class="page-header">
+ <ul>
+ <li>
+ <i class="fa fa-search fa-fw"></i>
+ <?= $this->url->link(t('Search tasks'), 'search', 'index') ?>
+ </li>
+ </ul>
+ </div>
+
+ <div class="filter-box">
+ <form method="get" action="<?= $this->url->dir() ?>" class="search">
+ <?= $this->form->hidden('controller', $values) ?>
+ <?= $this->form->hidden('action', $values) ?>
+ <?= $this->form->text('search', $values, array(), array(empty($values['search']) ? 'autofocus' : '', 'placeholder="'.t('Search').'"'), 'form-input-large') ?>
+ <?= $this->render('activity/filter_dropdown') ?>
+ </form>
+ </div>
+
+ <?php if (empty($values['search'])): ?>
+ <div class="listing">
+ <h3><?= t('Advanced search') ?></h3>
+ <p><?= t('Example of query: ') ?><strong>project:"My project" creator:me</strong></p>
+ <ul>
+ <li><?= t('Search by project: ') ?><strong>project:"My project"</strong></li>
+ <li><?= t('Search by creator: ') ?><strong>creator:admin</strong></li>
+ <li><?= t('Search by creation date: ') ?><strong>created:today</strong></li>
+ <li><?= t('Search by task status: ') ?><strong>status:open</strong></li>
+ <li><?= t('Search by task title: ') ?><strong>title:"My task"</strong></li>
+ </ul>
+ <p><i class="fa fa-external-link fa-fw"></i><?= $this->url->doc(t('View advanced search syntax'), 'search') ?></p>
+ </div>
+ <?php elseif (! empty($values['search']) && $nb_events === 0): ?>
+ <p class="alert"><?= t('Nothing found.') ?></p>
+ <?php else: ?>
+ <?= $this->render('event/events', array('events' => $events)) ?>
+ <?php endif ?>
+
+</section> \ No newline at end of file
diff --git a/app/Template/search/index.php b/app/Template/search/index.php
index 9231a6f3..d5d07ed6 100644
--- a/app/Template/search/index.php
+++ b/app/Template/search/index.php
@@ -2,8 +2,8 @@
<div class="page-header">
<ul>
<li>
- <i class="fa fa-folder fa-fw"></i>
- <?= $this->url->link(t('All projects'), 'project', 'index') ?>
+ <i class="fa fa-search fa-fw"></i>
+ <?= $this->url->link(t('Activity stream search'), 'search', 'activity') ?>
</li>
</ul>
</div>
diff --git a/app/Template/task/details.php b/app/Template/task/details.php
index 6093c157..141c4a0b 100644
--- a/app/Template/task/details.php
+++ b/app/Template/task/details.php
@@ -40,6 +40,8 @@
</li>
<?php endif ?>
<li class="smaller">
+
+ <?= $this->hook->render('template:task:details:first-column', array('task' => $task)) ?>
</ul>
</div>
<div class="task-summary-column">
@@ -64,6 +66,8 @@
<strong><?= t('Position:') ?></strong>
<span><?= $task['position'] ?></span>
</li>
+
+ <?= $this->hook->render('template:task:details:second-column', array('task' => $task)) ?>
</ul>
</div>
<div class="task-summary-column">
@@ -102,6 +106,8 @@
<span><?= t('%s hours', $task['time_spent']) ?></span>
</li>
<?php endif ?>
+
+ <?= $this->hook->render('template:task:details:third-column', array('task' => $task)) ?>
</ul>
</div>
<div class="task-summary-column">
@@ -132,6 +138,8 @@
<span><?= $this->dt->datetime($task['date_moved']) ?></span>
</li>
<?php endif ?>
+
+ <?= $this->hook->render('template:task:details:fourth-column', array('task' => $task)) ?>
</ul>
</div>
</div>
diff --git a/app/Template/task/sidebar.php b/app/Template/task/sidebar.php
index 773b28dc..a2d73b8c 100644
--- a/app/Template/task/sidebar.php
+++ b/app/Template/task/sidebar.php
@@ -23,6 +23,8 @@
<?= $this->url->link(t('Time tracking'), 'task', 'timetracking', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
</li>
<?php endif ?>
+
+ <?= $this->hook->render('template:task:sidebar:information', array('task' => $task)) ?>
</ul>
<?php if ($this->user->hasProjectAccess('taskmodification', 'edit', $task['project_id'])): ?>
@@ -91,8 +93,8 @@
<?= $this->url->link(t('Remove'), 'task', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
</li>
<?php endif ?>
+
+ <?= $this->hook->render('template:task:sidebar:actions', array('task' => $task)) ?>
</ul>
<?php endif ?>
-
- <?= $this->hook->render('template:task:sidebar', array('task' => $task)) ?>
</div>
diff --git a/app/Template/user/index.php b/app/Template/user/index.php
index 364fd965..0b5da17c 100644
--- a/app/Template/user/index.php
+++ b/app/Template/user/index.php
@@ -14,6 +14,7 @@
<?php else: ?>
<table class="table-stripped">
<tr>
+ <th class="column-5"><?= $paginator->order(t('Id'), 'id') ?></th>
<th class="column-18"><?= $paginator->order(t('Username'), 'username') ?></th>
<th class="column-18"><?= $paginator->order(t('Name'), 'name') ?></th>
<th class="column-15"><?= $paginator->order(t('Email'), 'email') ?></th>
@@ -26,7 +27,9 @@
<?php foreach ($paginator->getCollection() as $user): ?>
<tr>
<td>
- <?= '#'.$user['id'] ?>&nbsp;
+ <?= '#'.$user['id'] ?>
+ </td>
+ <td>
<?= $this->url->link($this->text->e($user['username']), 'user', 'show', array('user_id' => $user['id'])) ?>
</td>
<td>
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-21 02:20:18 +0000