diff options
| author | Gerardo Zamudio <gerardozamudio@users.noreply.github.com> | 2016-02-24 23:48:50 -0600 |
|---|---|---|
| committer | Gerardo Zamudio <gerardozamudio@users.noreply.github.com> | 2016-02-24 23:48:50 -0600 |
| commit | e4de6b3898b64b26d29aff31f21df5fda8055686 (patch) | |
| tree | 575f8a65440f291d70a070d168eafca8c82a6459 /app/Template/event | |
| parent | d9ffbea174ea6524d0a22f8375ca8b3aa04a3c96 (diff) | |
| parent | a6540bc604c837d92c9368540c145606723e97f7 (diff) | |
Merge pull request #1 from fguillot/master
Update from upstream
Diffstat (limited to 'app/Template/event')
| -rw-r--r-- | app/Template/event/events.php | 2 | ||||
| -rw-r--r-- | app/Template/event/task_file_create.php | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/app/Template/event/events.php b/app/Template/event/events.php index aec0b29e..bbb01be4 100644 --- a/app/Template/event/events.php +++ b/app/Template/event/events.php @@ -14,7 +14,7 @@ <?php elseif ($this->text->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']) ?> + <?= $this->dt->datetime($event['date_creation']) ?> </p> <div class="activity-content"><?= $event['event_content'] ?></div> </div> diff --git a/app/Template/event/task_file_create.php b/app/Template/event/task_file_create.php new file mode 100644 index 00000000..1a36bc8f --- /dev/null +++ b/app/Template/event/task_file_create.php @@ -0,0 +1,11 @@ +<?= $this->user->avatar($email, $author) ?> + +<p class="activity-title"> + <?= e('%s attached a new file to the task %s', + $this->e($author), + $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) + ) ?> +</p> +<p class="activity-description"> + <em><?= $this->e($file['name']) ?></em> +</p>
\ No newline at end of file |