From 9b399951f430b26379a2bf8b13ace99290227e61 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sun, 14 Jun 2015 11:50:31 -0400
Subject: Improve activity stream/notification for task update events and add
 new notification for swimlane change

---
 app/Template/event/events.php             |  2 ++
 app/Template/event/task_move_swimlane.php | 19 +++++++++++++++++++
 app/Template/event/task_update.php        |  5 +++++
 3 files changed, 26 insertions(+)
 create mode 100644 app/Template/event/task_move_swimlane.php

(limited to 'app/Template/event')

diff --git a/app/Template/event/events.php b/app/Template/event/events.php
index 2dc79871..971f6587 100644
--- a/app/Template/event/events.php
+++ b/app/Template/event/events.php
@@ -7,6 +7,8 @@
             <p class="activity-datetime">
                 <?php if ($this->text->contains($event['event_name'], 'subtask')): ?>
                     <i class="fa fa-tasks"></i>
+                <?php elseif ($this->text->contains($event['event_name'], 'task.move')): ?>
+                    <i class="fa fa-arrows-alt"></i>
                 <?php elseif ($this->text->contains($event['event_name'], 'task')): ?>
                     <i class="fa fa-newspaper-o"></i>
                 <?php elseif ($this->text->contains($event['event_name'], 'comment')): ?>
diff --git a/app/Template/event/task_move_swimlane.php b/app/Template/event/task_move_swimlane.php
new file mode 100644
index 00000000..ca440dbf
--- /dev/null
+++ b/app/Template/event/task_move_swimlane.php
@@ -0,0 +1,19 @@
+<?= $this->user->avatar($email, $author) ?>
+
+<p class="activity-title">
+    <?php if ($task['swimlane_id'] == 0): ?>
+        <?= e('%s moved the task %s to the first swimlane',
+                $this->e($author),
+                $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
+            ) ?>
+    <?php else: ?>
+        <?= e('%s moved the task %s to the swimlane "%s"',
+                $this->e($author),
+                $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])),
+                $this->e($task['swimlane_name'])
+            ) ?>
+    <?php endif ?>
+</p>
+<p class="activity-description">
+    <em><?= $this->e($task['title']) ?></em>
+</p>
\ No newline at end of file
diff --git a/app/Template/event/task_update.php b/app/Template/event/task_update.php
index 7d036d43..e8254bcb 100644
--- a/app/Template/event/task_update.php
+++ b/app/Template/event/task_update.php
@@ -8,4 +8,9 @@
 </p>
 <p class="activity-description">
     <em><?= $this->e($task['title']) ?></em>
+    <?php if (isset($changes)): ?>
+        <div class="activity-changes">
+            <?= $this->render('task/changes', array('changes' => $changes, 'task' => $task)) ?>
+        </div>
+    <?php endif ?>
 </p>
\ No newline at end of file
-- 
cgit v1.2.3