8 files changed, 26 insertions, 47 deletions
diff --git a/app/Template/notification/comment_creation.php b/app/Template/notification/comment_create.php
index 747c4f43..747c4f43 100644
--- a/app/Template/notification/comment_creation.php
+++ b/app/Template/notification/comment_create.php
diff --git a/app/Template/notification/file_creation.php b/app/Template/notification/file_create.php
index 63f7d1b8..63f7d1b8 100644
--- a/app/Template/notification/file_creation.php
+++ b/app/Template/notification/file_create.php
diff --git a/app/Template/notification/footer.php b/app/Template/notification/footer.php
index 7041c43b..69d2cf82 100644
--- a/app/Template/notification/footer.php
+++ b/app/Template/notification/footer.php
@@ -2,5 +2,6 @@
 Kanboard
 
 <?php if (isset($application_url) && ! empty($application_url)): ?>
-    - <a href="<?= $application_url.$this->url->href('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><?= t('view the task on Kanboard') ?></a>.
+    - <a href="<?= $application_url.$this->url->href('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><?= t('view the task on Kanboard') ?></a>
+    - <a href="<?= $application_url.$this->url->href('board', 'show', array('project_id' => $task['project_id'])) ?>"><?= t('view the board on Kanboard') ?></a>
 <?php endif ?>
diff --git a/app/Template/notification/subtask_creation.php b/app/Template/notification/subtask_create.php
index e1c62b73..e1c62b73 100644
--- a/app/Template/notification/subtask_creation.php
+++ b/app/Template/notification/subtask_create.php
diff --git a/app/Template/notification/task_creation.php b/app/Template/notification/task_create.php
index 0905d3f5..1d834d44 100644
--- a/app/Template/notification/task_creation.php
+++ b/app/Template/notification/task_create.php
@@ -9,14 +9,14 @@
         <strong><?= dt('Must be done before %B %e, %Y', $task['date_due']) ?></strong>
     </li>
     <?php endif ?>
-    <?php if ($task['creator_username']): ?>
+    <?php if (! empty($task['creator_username'])): ?>
     <li>
         <?= t('Created by %s', $task['creator_name'] ?: $task['creator_username']) ?>
     </li>
     <?php endif ?>
     <li>
         <strong>
-        <?php if ($task['assignee_username']): ?>
+        <?php if (! empty($task['assignee_username'])): ?>
             <?= t('Assigned to %s', $task['assignee_name'] ?: $task['assignee_username']) ?>
         <?php else: ?>
             <?= t('There is nobody assigned') ?>
@@ -28,7 +28,7 @@
         <strong><?= $this->e($task['column_title']) ?></strong>
     </li>
     <li><?= t('Task position:').' '.$this->e($task['position']) ?></li>
-    <?php if ($task['category_name']): ?>
+    <?php if (! empty($task['category_name'])): ?>
     <li>
         <?= t('Category:') ?> <strong><?= $this->e($task['category_name']) ?></strong>
     </li>
diff --git a/app/Template/notification/task_move_swimlane.php b/app/Template/notification/task_move_swimlane.php
new file mode 100644
index 00000000..04de7cc6
--- /dev/null
+++ b/app/Template/notification/task_move_swimlane.php
@@ -0,0 +1,19 @@
+<h2><?= $this->e($task['title']) ?> (#<?= $task['id'] ?>)</h2>
+
+<ul>
+    <li>
+        <?php if ($task['swimlane_id'] == 0): ?>
+            <?= t('The task have been moved to the first swimlane') ?>
+        <?php else: ?>
+            <?= t('The task have been moved to another swimlane:') ?>
+            <strong><?= $this->e($task['swimlane_name']) ?></strong>
+        <?php endif ?>
+    </li>
+    <li>
+        <?= t('Column on the board:') ?>
+        <strong><?= $this->e($task['column_title']) ?></strong>
+    </li>
+    <li><?= t('Task position:').' '.$this->e($task['position']) ?></li>
+</ul>
+
+<?= $this->render('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
+\ No newline at end of file
diff --git a/app/Template/notification/task_due.php b/app/Template/notification/task_overdue.php
index 7482424a..dc2659dc 100644
--- a/app/Template/notification/task_due.php
+++ b/app/Template/notification/task_overdue.php
@@ -1,4 +1,4 @@
-<h2><?= t('List of due tasks for the project "%s"', $project) ?></h2>
+<h2><?= t('Overdue tasks for the project "%s"', $project_name) ?></h2>
 
 <ul>
     <?php foreach ($tasks as $task): ?>
@@ -16,5 +16,3 @@
         </li>
     <?php endforeach ?>
 </ul>
-
-<?= $this->render('notification/footer', array('task' => $task)) ?>
diff --git a/app/Template/notification/task_update.php b/app/Template/notification/task_update.php
index ffea49cd..54f5c6d1 100644
--- a/app/Template/notification/task_update.php
+++ b/app/Template/notification/task_update.php
@@ -1,43 +1,4 @@
 <h2><?= $this->e($task['title']) ?> (#<?= $task['id'] ?>)</h2>
 
-<ul>
-    <li>
-        <?= dt('Created on %B %e, %Y at %k:%M %p', $task['date_creation']) ?>
-    </li>
-    <?php if ($task['date_due']): ?>
-    <li>
-        <strong><?= dt('Must be done before %B %e, %Y', $task['date_due']) ?></strong>
-    </li>
-    <?php endif ?>
-    <?php if ($task['creator_username']): ?>
-    <li>
-        <?= t('Created by %s', $task['creator_name'] ?: $task['creator_username']) ?>
-    </li>
-    <?php endif ?>
-    <li>
-        <strong>
-        <?php if ($task['assignee_username']): ?>
-            <?= t('Assigned to %s', $task['assignee_name'] ?: $task['assignee_username']) ?>
-        <?php else: ?>
-            <?= t('There is nobody assigned') ?>
-        <?php endif ?>
-        </strong>
-    </li>
-    <li>
-        <?= t('Column on the board:') ?>
-        <strong><?= $this->e($task['column_title']) ?></strong>
-    </li>
-    <li><?= t('Task position:').' '.$this->e($task['position']) ?></li>
-    <?php if ($task['category_name']): ?>
-    <li>
-        <?= t('Category:') ?> <strong><?= $this->e($task['category_name']) ?></strong>
-    </li>
-    <?php endif ?>
-</ul>
-
-<?php if (! empty($task['description'])): ?>
-    <h2><?= t('Description') ?></h2>
-    <?= $this->text->markdown($task['description']) ?: t('There is no description.') ?>
-<?php endif ?>
-
+<?= $this->render('task/changes', array('changes' => $changes, 'task' => $task)) ?>
 <?= $this->render('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
 \ No newline at end of file