summaryrefslogtreecommitdiff
path: root/app/Template
diff options
context:
space:
mode:
Diffstat (limited to 'app/Template')
-rw-r--r--app/Template/app/notifications.php2
-rw-r--r--app/Template/app/tasks.php8
-rw-r--r--app/Template/notification/task_overdue.php43
-rw-r--r--app/Template/project/sidebar.php2
-rw-r--r--app/Template/project_header/search.php8
-rw-r--r--app/Template/task/details.php12
-rw-r--r--app/Template/task/dropdown.php2
-rw-r--r--app/Template/task/layout.php3
-rw-r--r--app/Template/task/show.php2
-rw-r--r--app/Template/task/sidebar.php6
-rw-r--r--app/Template/task_creation/form.php4
-rw-r--r--app/Template/task_modification/edit_task.php6
12 files changed, 68 insertions, 30 deletions
diff --git a/app/Template/app/notifications.php b/app/Template/app/notifications.php
index 4cb3c571..b64eb0b7 100644
--- a/app/Template/app/notifications.php
+++ b/app/Template/app/notifications.php
@@ -2,8 +2,8 @@
<h2><?= t('My notifications') ?></h2>
<?php if (empty($notifications)): ?>
- <p class="alert"><?= t('No new notifications.') ?></p>
</div>
+<p class="alert"><?= t('No new notifications.') ?></p>
<?php else: ?>
<ul>
<li>
diff --git a/app/Template/app/tasks.php b/app/Template/app/tasks.php
index d7826fb7..f0ed61e0 100644
--- a/app/Template/app/tasks.php
+++ b/app/Template/app/tasks.php
@@ -9,6 +9,7 @@
<th class="column-5"><?= $paginator->order('Id', 'tasks.id') ?></th>
<th class="column-20"><?= $paginator->order(t('Project'), 'project_name') ?></th>
<th><?= $paginator->order(t('Task'), 'title') ?></th>
+ <th class="column-5"><?= $paginator->order('Priority', 'tasks.priority') ?></th>
<th class="column-20"><?= t('Time tracking') ?></th>
<th class="column-20"><?= $paginator->order(t('Due date'), 'date_due') ?></th>
</tr>
@@ -24,6 +25,11 @@
<?= $this->url->link($this->text->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
</td>
<td>
+ <?php if ($task['priority'] >= 0): ?>
+ P<?= $this->text->e($task['priority'])?>
+ <?php endif?>
+ </td>
+ <td>
<?php if (! empty($task['time_spent'])): ?>
<strong><?= $this->text->e($task['time_spent']).'h' ?></strong> <?= t('spent') ?>
<?php endif ?>
@@ -40,4 +46,4 @@
</table>
<?= $paginator ?>
-<?php endif ?> \ No newline at end of file
+<?php endif ?>
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/project/sidebar.php b/app/Template/project/sidebar.php
index 304b4aee..7fb7718d 100644
--- a/app/Template/project/sidebar.php
+++ b/app/Template/project/sidebar.php
@@ -11,7 +11,7 @@
<?php endif ?>
<?php if ($this->user->hasProjectAccess('ProjectEdit', 'edit', $project['id'])): ?>
- <li <?= $this->app->checkMenuSelection('ProjectEdit', 'edit') ?>>
+ <li <?= $this->app->checkMenuSelection('ProjectEdit') ?>>
<?= $this->url->link(t('Edit project'), 'ProjectEdit', 'edit', array('project_id' => $project['id'])) ?>
</li>
<li <?= $this->app->checkMenuSelection('project', 'share') ?>>
diff --git a/app/Template/project_header/search.php b/app/Template/project_header/search.php
index 42216352..8885d9c9 100644
--- a/app/Template/project_header/search.php
+++ b/app/Template/project_header/search.php
@@ -22,9 +22,9 @@
<div class="dropdown">
<a href="#" class="dropdown-menu dropdown-menu-link-icon" title="<?= t('User filters') ?>"><i class="fa fa-users fa-fw"></i> <i class="fa fa-caret-down"></i></a>
<ul>
- <li><a href="#" class="filter-helper" data-append-filter="assignee:nobody"><?= t('Not assigned') ?></a></li>
+ <li><a href="#" class="filter-helper" data-unique-filter="assignee:nobody"><?= t('Not assigned') ?></a></li>
<?php foreach ($users_list as $user): ?>
- <li><a href="#" class="filter-helper" data-append-filter='assignee:"<?= $this->text->e($user) ?>"'><?= $this->text->e($user) ?></a></li>
+ <li><a href="#" class="filter-helper" data-unique-filter='assignee:"<?= $this->text->e($user) ?>"'><?= $this->text->e($user) ?></a></li>
<?php endforeach ?>
</ul>
</div>
@@ -34,9 +34,9 @@
<div class="dropdown">
<a href="#" class="dropdown-menu dropdown-menu-link-icon" title="<?= t('Category filters') ?>"><i class="fa fa-tags fa-fw"></i><i class="fa fa-caret-down"></i></a>
<ul>
- <li><a href="#" class="filter-helper" data-append-filter="category:none"><?= t('No category') ?></a></li>
+ <li><a href="#" class="filter-helper" data-unique-filter="category:none"><?= t('No category') ?></a></li>
<?php foreach ($categories_list as $category): ?>
- <li><a href="#" class="filter-helper" data-append-filter='category:"<?= $this->text->e($category) ?>"'><?= $this->text->e($category) ?></a></li>
+ <li><a href="#" class="filter-helper" data-unique-filter='category:"<?= $this->text->e($category) ?>"'><?= $this->text->e($category) ?></a></li>
<?php endforeach ?>
</ul>
</div>
diff --git a/app/Template/task/details.php b/app/Template/task/details.php
index 6093c157..5b8b7c6d 100644
--- a/app/Template/task/details.php
+++ b/app/Template/task/details.php
@@ -1,6 +1,8 @@
<section id="task-summary">
<h2><?= $this->text->e($task['title']) ?></h2>
+ <?= $this->hook->render('template:task:details:top', array('task' => $task)) ?>
+
<div class="task-summary-container color-<?= $task['color_id'] ?>">
<div class="task-summary-column">
<ul class="no-bullet">
@@ -40,6 +42,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 +68,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 +108,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 +140,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>
@@ -141,4 +151,6 @@
<?= $this->url->button('fa-play', t('Set start date'), 'taskmodification', 'start', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
</div>
<?php endif ?>
+
+ <?= $this->hook->render('template:task:details:bottom', array('task' => $task)) ?>
</section>
diff --git a/app/Template/task/dropdown.php b/app/Template/task/dropdown.php
index f98f5172..6fea3728 100644
--- a/app/Template/task/dropdown.php
+++ b/app/Template/task/dropdown.php
@@ -55,6 +55,6 @@
</li>
<?php endif ?>
- <?= $this->hook->render('template:task:dropdown') ?>
+ <?= $this->hook->render('template:task:dropdown', array('task' => $task)) ?>
</ul>
</div>
diff --git a/app/Template/task/layout.php b/app/Template/task/layout.php
index 52db5d1b..ba2cd8d5 100644
--- a/app/Template/task/layout.php
+++ b/app/Template/task/layout.php
@@ -1,5 +1,6 @@
<section id="main">
<?= $this->projectHeader->render($project, 'Listing', 'show') ?>
+ <?= $this->hook->render('template:task:layout:top', array('task' => $task)) ?>
<section
class="sidebar-container" id="task-view"
data-edit-url="<?= $this->url->href('taskmodification', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"
@@ -14,4 +15,4 @@
<?= $content_for_sublayout ?>
</div>
</section>
-</section> \ No newline at end of file
+</section>
diff --git a/app/Template/task/show.php b/app/Template/task/show.php
index 86422941..8f41d653 100644
--- a/app/Template/task/show.php
+++ b/app/Template/task/show.php
@@ -34,7 +34,7 @@
'project' => $project,
)) ?>
-<?= $this->hook->render('template:task:show:before-attachements', array('task' => $task, 'project' => $project)) ?>
+<?= $this->hook->render('template:task:show:before-attachments', array('task' => $task, 'project' => $project)) ?>
<?= $this->render('task_file/show', array(
'task' => $task,
'files' => $files,
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/task_creation/form.php b/app/Template/task_creation/form.php
index 9bfd839f..c963bdcf 100644
--- a/app/Template/task_creation/form.php
+++ b/app/Template/task_creation/form.php
@@ -29,7 +29,7 @@
<?= $this->form->checkbox('another_task', t('Create another task'), 1, isset($values['another_task']) && $values['another_task'] == 1) ?>
<?php endif ?>
- <?= $this->hook->render('template:task:form:left-column', array('values'=>$values, 'errors'=>$errors)) ?>
+ <?= $this->hook->render('template:task:form:left-column', array('values' => $values, 'errors' => $errors)) ?>
</div>
<div class="form-column">
@@ -43,7 +43,7 @@
<?= $this->task->selectTimeEstimated($values, $errors) ?>
<?= $this->task->selectDueDate($values, $errors) ?>
- <?= $this->hook->render('template:task:form:right-column', array('values'=>$values, 'errors'=>$errors)) ?>
+ <?= $this->hook->render('template:task:form:right-column', array('values' => $values, 'errors' => $errors)) ?>
</div>
<div class="form-actions">
diff --git a/app/Template/task_modification/edit_task.php b/app/Template/task_modification/edit_task.php
index b5891c15..5ddec5ea 100644
--- a/app/Template/task_modification/edit_task.php
+++ b/app/Template/task_modification/edit_task.php
@@ -14,6 +14,8 @@
<?= $this->task->selectCategory($categories_list, $values, $errors) ?>
<?= $this->task->selectPriority($project, $values) ?>
<?= $this->task->selectScore($values, $errors) ?>
+
+ <?= $this->hook->render('template:task:form:left-column', array('values' => $values, 'errors' => $errors)) ?>
</div>
<div class="form-column">
@@ -21,6 +23,8 @@
<?= $this->task->selectTimeSpent($values, $errors) ?>
<?= $this->task->selectStartDate($values, $errors) ?>
<?= $this->task->selectDueDate($values, $errors) ?>
+
+ <?= $this->hook->render('template:task:form:right-column', array('values' => $values, 'errors' => $errors)) ?>
</div>
<div class="form-clear">
@@ -32,4 +36,4 @@
<?= t('or') ?>
<?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
</div>
-</form> \ No newline at end of file
+</form>
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-27 19:21:45 +0000