diff options
Diffstat (limited to 'app/Templates')
| -rw-r--r-- | app/Templates/event_comment_create.php | 8 | ||||
| -rw-r--r-- | app/Templates/event_comment_update.php | 8 | ||||
| -rw-r--r-- | app/Templates/event_subtask_create.php | 25 | ||||
| -rw-r--r-- | app/Templates/event_subtask_update.php | 25 | ||||
| -rw-r--r-- | app/Templates/event_task_assignee_change.php | 10 | ||||
| -rw-r--r-- | app/Templates/event_task_close.php | 2 | ||||
| -rw-r--r-- | app/Templates/event_task_create.php | 2 | ||||
| -rw-r--r-- | app/Templates/event_task_move_column.php | 4 | ||||
| -rw-r--r-- | app/Templates/event_task_move_position.php | 4 | ||||
| -rw-r--r-- | app/Templates/event_task_open.php | 2 | ||||
| -rw-r--r-- | app/Templates/event_task_update.php | 2 | ||||
| -rw-r--r-- | app/Templates/project_activity.php | 16 | ||||
| -rw-r--r-- | app/Templates/project_feed.php | 4 | ||||
| -rw-r--r-- | app/Templates/task_public.php | 2 |
14 files changed, 67 insertions, 47 deletions
diff --git a/app/Templates/event_comment_create.php b/app/Templates/event_comment_create.php index 4af59614..d2f6f97b 100644 --- a/app/Templates/event_comment_create.php +++ b/app/Templates/event_comment_create.php @@ -1,7 +1,7 @@ <p class="activity-title"> <?= e('%s commented the task <a href="?controller=task&action=show&task_id=%d">#%d</a>', Helper\escape($author), $task_id, $task_id) ?> </p> -<p class="activity-description"> - <em><?= Helper\escape($task_title) ?></em><br/> - <div class="markdown"><?= Helper\markdown($comment) ?></div> -</p>
\ No newline at end of file +<div class="activity-description"> + <em><?= Helper\escape($task['title']) ?></em><br/> + <div class="markdown"><?= Helper\markdown($comment['comment']) ?></div> +</div>
\ No newline at end of file diff --git a/app/Templates/event_comment_update.php b/app/Templates/event_comment_update.php index fe93b691..27cc0be6 100644 --- a/app/Templates/event_comment_update.php +++ b/app/Templates/event_comment_update.php @@ -1,7 +1,7 @@ <p class="activity-title"> <?= e('%s updated a comment on the task <a href="?controller=task&action=show&task_id=%d">#%d</a>', Helper\escape($author), $task_id, $task_id) ?> </p> -<p class="activity-description"> - <em><?= Helper\escape($task_title) ?></em><br/> - <div class="markdown"><?= Helper\markdown($comment) ?></div> -</p>
\ No newline at end of file +<div class="activity-description"> + <em><?= Helper\escape($task['title']) ?></em><br/> + <div class="markdown"><?= Helper\markdown($comment['comment']) ?></div> +</div>
\ No newline at end of file diff --git a/app/Templates/event_subtask_create.php b/app/Templates/event_subtask_create.php index 9772d807..664e9da2 100644 --- a/app/Templates/event_subtask_create.php +++ b/app/Templates/event_subtask_create.php @@ -1,12 +1,19 @@ <p class="activity-title"> <?= e('%s created a subtask for the task <a href="?controller=task&action=show&task_id=%d">#%d</a>', Helper\escape($author), $task_id, $task_id) ?> </p> -<p class="activity-description"> - <em><?= Helper\escape($task_title) ?></em><br/> - <p><?= Helper\escape($subtask_title) ?> <strong>(<?= Helper\in_list($subtask_status, $subtask_status_list) ?>)</strong></p> - <?php if ($subtask_assignee): ?> - <p><?= t('Assigned to %s with an estimate of %s/%sh', $subtask_assignee, $subtask_time_spent, $subtask_time_estimated) ?></p> - <?php else: ?> - <p><?= t('Not assigned, estimate of %sh', $subtask_time_estimated) ?></p> - <?php endif ?> -</p>
\ No newline at end of file +<div class="activity-description"> + <p><em><?= Helper\escape($task['title']) ?></em></p> + + <ul> + <li> + <?= Helper\escape($subtask['title']) ?> (<strong><?= Helper\escape($subtask['status_name']) ?></strong>) + </li> + <li> + <?php if ($subtask['username']): ?> + <?= t('Assigned to %s with an estimate of %s/%sh', $subtask['name'] ?: $subtask['username'], $subtask['time_spent'], $subtask['time_estimated']) ?> + <?php else: ?> + <?= t('Not assigned, estimate of %sh', $subtask['time_estimated']) ?> + <?php endif ?> + </li> + </ul> +</div>
\ No newline at end of file diff --git a/app/Templates/event_subtask_update.php b/app/Templates/event_subtask_update.php index 70f9d76d..96a589dd 100644 --- a/app/Templates/event_subtask_update.php +++ b/app/Templates/event_subtask_update.php @@ -1,12 +1,19 @@ <p class="activity-title"> <?= e('%s updated a subtask for the task <a href="?controller=task&action=show&task_id=%d">#%d</a>', Helper\escape($author), $task_id, $task_id) ?> </p> -<p class="activity-description"> - <em><?= Helper\escape($task_title) ?></em><br/> - <p><?= Helper\escape($subtask_title) ?> <strong>(<?= Helper\in_list($subtask_status, $subtask_status_list) ?>)</strong></p> - <?php if ($subtask_assignee): ?> - <p><?= t('Assigned to %s with an estimate of %s/%sh', $subtask_assignee, $subtask_time_spent, $subtask_time_estimated) ?></p> - <?php else: ?> - <p><?= t('Not assigned, estimate of %sh', $subtask_time_estimated) ?></p> - <?php endif ?> -</p>
\ No newline at end of file +<div class="activity-description"> + <p><em><?= Helper\escape($task['title']) ?></em></p> + + <ul> + <li> + <?= Helper\escape($subtask['title']) ?> (<strong><?= Helper\escape($subtask['status_name']) ?></strong>) + </li> + <li> + <?php if ($subtask['username']): ?> + <?= t('Assigned to %s with an estimate of %s/%sh', $subtask['name'] ?: $subtask['username'], $subtask['time_spent'], $subtask['time_estimated']) ?> + <?php else: ?> + <?= t('Not assigned, estimate of %sh', $subtask['time_estimated']) ?> + <?php endif ?> + </li> + </ul> +</div> diff --git a/app/Templates/event_task_assignee_change.php b/app/Templates/event_task_assignee_change.php index ac18af2f..b346325e 100644 --- a/app/Templates/event_task_assignee_change.php +++ b/app/Templates/event_task_assignee_change.php @@ -1,6 +1,12 @@ <p class="activity-title"> - <?= e('%s change the assignee of the task <a href="?controller=task&action=show&task_id=%d">#%d</a>', Helper\escape($author), $task_id, $task_id) ?> + <?= e( + '%s change the assignee of the task <a href="?controller=task&action=show&task_id=%d">#%d</a> to %s', + Helper\escape($author), + $task_id, + $task_id, + Helper\escape($task['assignee_name'] ?: $task['assignee_username']) + ) ?> </p> <p class="activity-description"> - <em><?= Helper\escape($task_title) ?></em> + <em><?= Helper\escape($task['title']) ?></em> </p>
\ No newline at end of file diff --git a/app/Templates/event_task_close.php b/app/Templates/event_task_close.php index 9d92ea55..48d25678 100644 --- a/app/Templates/event_task_close.php +++ b/app/Templates/event_task_close.php @@ -2,5 +2,5 @@ <?= e('%s closed the task <a href="?controller=task&action=show&task_id=%d">#%d</a>', Helper\escape($author), $task_id, $task_id) ?> </p> <p class="activity-description"> - <em><?= Helper\escape($task_title) ?></em> + <em><?= Helper\escape($task['title']) ?></em> </p>
\ No newline at end of file diff --git a/app/Templates/event_task_create.php b/app/Templates/event_task_create.php index 7ceab4bb..2515af05 100644 --- a/app/Templates/event_task_create.php +++ b/app/Templates/event_task_create.php @@ -2,5 +2,5 @@ <?= e('%s created the task <a href="?controller=task&action=show&task_id=%d">#%d</a>', Helper\escape($author), $task_id, $task_id) ?> </p> <p class="activity-description"> - <em><?= Helper\escape($task_title) ?></em> + <em><?= Helper\escape($task['title']) ?></em> </p>
\ No newline at end of file diff --git a/app/Templates/event_task_move_column.php b/app/Templates/event_task_move_column.php index a674f80a..f2aac8f7 100644 --- a/app/Templates/event_task_move_column.php +++ b/app/Templates/event_task_move_column.php @@ -1,6 +1,6 @@ <p class="activity-title"> - <?= e('%s moved the task <a href="?controller=task&action=show&task_id=%d">#%d</a> to the column "%s"', Helper\escape($author), $task_id, $task_id, Helper\escape($task_column_name)) ?> + <?= e('%s moved the task <a href="?controller=task&action=show&task_id=%d">#%d</a> to the column "%s"', Helper\escape($author), $task_id, $task_id, Helper\escape($task['column_title'])) ?> </p> <p class="activity-description"> - <em><?= Helper\escape($task_title) ?></em> + <em><?= Helper\escape($task['title']) ?></em> </p>
\ No newline at end of file diff --git a/app/Templates/event_task_move_position.php b/app/Templates/event_task_move_position.php index 0b7e9615..26cdeb13 100644 --- a/app/Templates/event_task_move_position.php +++ b/app/Templates/event_task_move_position.php @@ -1,6 +1,6 @@ <p class="activity-title"> - <?= e('%s moved the task <a href="?controller=task&action=show&task_id=%d">#%d</a> to the position #%d in the column "%s"', Helper\escape($author), $task_id, $task_id, $task_position, Helper\escape($task_column_name)) ?> + <?= e('%s moved the task <a href="?controller=task&action=show&task_id=%d">#%d</a> to the position #%d in the column "%s"', Helper\escape($author), $task_id, $task_id, $task['position'], Helper\escape($task['column_title'])) ?> </p> <p class="activity-description"> - <em><?= Helper\escape($task_title) ?></em> + <em><?= Helper\escape($task['title']) ?></em> </p>
\ No newline at end of file diff --git a/app/Templates/event_task_open.php b/app/Templates/event_task_open.php index 763b0dfc..9623be74 100644 --- a/app/Templates/event_task_open.php +++ b/app/Templates/event_task_open.php @@ -2,5 +2,5 @@ <?= e('%s open the task <a href="?controller=task&action=show&task_id=%d">#%d</a>', Helper\escape($author), $task_id, $task_id) ?> </p> <p class="activity-description"> - <em><?= Helper\escape($task_title) ?></em> + <em><?= Helper\escape($task['title']) ?></em> </p>
\ No newline at end of file diff --git a/app/Templates/event_task_update.php b/app/Templates/event_task_update.php index 313e79cb..a270b936 100644 --- a/app/Templates/event_task_update.php +++ b/app/Templates/event_task_update.php @@ -2,5 +2,5 @@ <?= e('%s updated the task <a href="?controller=task&action=show&task_id=%d">#%d</a>', Helper\escape($author), $task_id, $task_id) ?> </p> <p class="activity-description"> - <em><?= Helper\escape($task_title) ?></em> + <em><?= Helper\escape($task['title']) ?></em> </p>
\ No newline at end of file diff --git a/app/Templates/project_activity.php b/app/Templates/project_activity.php index ad91f8b8..50743d68 100644 --- a/app/Templates/project_activity.php +++ b/app/Templates/project_activity.php @@ -2,10 +2,10 @@ <div class="page-header"> <h2><?= t('%s\'s activity', $project['name']) ?></h2> <ul> - <li><a href="?controller=board&action=show&project_id=<?= $project['id'] ?>"><?= t('Back to the board') ?></a></li> - <li><a href="?controller=project&action=search&project_id=<?= $project['id'] ?>"><?= t('Search') ?></a></li> - <li><a href="?controller=project&action=tasks&project_id=<?= $project['id'] ?>"><?= t('Completed tasks') ?></a></li> - <li><a href="?controller=project&action=index"><?= t('List of projects') ?></a></li> + <li><?= Helper\a(t('Back to the board'), 'board', 'show', array('project_id' => $project['id'])) ?></li> + <li><?= Helper\a(t('Search'), 'project', 'search', array('project_id' => $project['id'])) ?></li> + <li><?= Helper\a(t('Completed tasks'), 'project', 'tasks', array('project_id' => $project['id'])) ?></li> + <li><?= Helper\a(t('List of projects'), 'project', 'index') ?></li> </ul> </div> <section> @@ -14,17 +14,17 @@ <?php else: ?> <?php if ($project['is_public']): ?> - <p class="pull-right"><i class="fa fa-rss-square"></i> <a href="?controller=project&action=feed&token=<?= $project['token'] ?>" target="_blank"><?= t('RSS feed') ?></a></p> + <p class="pull-right"><i class="fa fa-rss-square"></i> <?= Helper\a(t('RSS feed'), 'project', 'feed', array('token' => $project['token'])) ?></p> <?php endif ?> <?php foreach ($events as $event): ?> <div class="activity-event"> <p class="activity-datetime"> - <?php if ($event['event_type'] === 'task'): ?> + <?php if (Helper\contains($event['event_name'], 'task')): ?> <i class="fa fa-newspaper-o"></i> - <?php elseif ($event['event_type'] === 'subtask'): ?> + <?php elseif (Helper\contains($event['event_name'], 'subtask')): ?> <i class="fa fa-tasks"></i> - <?php elseif ($event['event_type'] === 'comment'): ?> + <?php elseif (Helper\contains($event['event_name'], 'comment')): ?> <i class="fa fa-comments-o"></i> <?php endif ?> <?= dt('%B %e, %Y at %k:%M %p', $event['date_creation']) ?> diff --git a/app/Templates/project_feed.php b/app/Templates/project_feed.php index b47c87ad..9d10ecb1 100644 --- a/app/Templates/project_feed.php +++ b/app/Templates/project_feed.php @@ -2,7 +2,7 @@ <feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom"> <title><?= t('%s\'s activity', $project['name']) ?></title> <link rel="alternate" type="text/html" href="<?= Helper\get_current_base_url() ?>"/> - <link rel="self" type="application/atom+xml" href="<?= Helper\get_current_base_url() ?>?controller=project&action=feed&token=<?= $project['token'] ?>"/> + <link rel="self" type="application/atom+xml" href="<?= Helper\get_current_base_url().Helper\u('project', 'feed', array('token' => $project['token'])) ?>"/> <updated><?= date(DATE_ATOM) ?></updated> <id><?= Helper\get_current_base_url() ?></id> <icon><?= Helper\get_current_base_url() ?>assets/img/favicon.png</icon> @@ -10,7 +10,7 @@ <?php foreach ($events as $e): ?> <entry> <title type="text"><?= $e['event_title'] ?></title> - <link rel="alternate" href="<?= Helper\get_current_base_url().'?controller=task&action=show&task_id='.$e['task_id'] ?>"/> + <link rel="alternate" href="<?= Helper\get_current_base_url().Helper\u('task', 'show', array('task_id' => $e['task_id'])) ?>"/> <id><?= $e['id'].'-'.$e['event_name'].'-'.$e['task_id'].'-'.$e['date_creation'] ?></id> <published><?= date(DATE_ATOM, $e['date_creation']) ?></published> <updated><?= date(DATE_ATOM, $e['date_creation']) ?></updated> diff --git a/app/Templates/task_public.php b/app/Templates/task_public.php index bc4608d1..3f44ceec 100644 --- a/app/Templates/task_public.php +++ b/app/Templates/task_public.php @@ -2,7 +2,7 @@ <?= Helper\template('task_details', array('task' => $task, 'project' => $project)) ?> - <p class="align-right"><?= Helper\a(t('Back to the board'), 'board', 'readonly', array('token' => $project['token'])) ?></p> + <p class="pull-right"><?= Helper\a(t('Back to the board'), 'board', 'readonly', array('token' => $project['token'])) ?></p> <?= Helper\template('task_show_description', array('task' => $task)) ?> |