From c6b9a2a92e60cb4488748d597a9df14c556236d3 Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fred@kanboard.net>
Date: Wed, 26 Nov 2014 20:43:08 -0500
Subject: Move event and notification templates to a subfolder

---
 app/Model/Notification.php                         | 52 +++++++++++-----------
 app/Model/ProjectActivity.php                      |  2 +-
 app/Template/event/comment_create.php              |  7 +++
 app/Template/event/comment_update.php              |  6 +++
 app/Template/event/subtask_create.php              | 19 ++++++++
 app/Template/event/subtask_update.php              | 19 ++++++++
 app/Template/event/task_assignee_change.php        | 12 +++++
 app/Template/event/task_close.php                  |  6 +++
 app/Template/event/task_create.php                 |  6 +++
 app/Template/event/task_move_column.php            |  6 +++
 app/Template/event/task_move_position.php          |  6 +++
 app/Template/event/task_open.php                   |  6 +++
 app/Template/event/task_update.php                 |  6 +++
 app/Template/event_comment_create.php              |  7 ---
 app/Template/event_comment_update.php              |  6 ---
 app/Template/event_subtask_create.php              | 19 --------
 app/Template/event_subtask_update.php              | 19 --------
 app/Template/event_task_assignee_change.php        | 12 -----
 app/Template/event_task_close.php                  |  6 ---
 app/Template/event_task_create.php                 |  6 ---
 app/Template/event_task_move_column.php            |  6 ---
 app/Template/event_task_move_position.php          |  6 ---
 app/Template/event_task_open.php                   |  6 ---
 app/Template/event_task_update.php                 |  6 ---
 app/Template/notification/comment_creation.php     |  7 +++
 app/Template/notification/comment_update.php       |  7 +++
 app/Template/notification/file_creation.php        |  5 +++
 app/Template/notification/footer.php               |  6 +++
 app/Template/notification/subtask_creation.php     | 17 +++++++
 app/Template/notification/subtask_update.php       | 21 +++++++++
 app/Template/notification/task_assignee_change.php | 20 +++++++++
 app/Template/notification/task_close.php           |  5 +++
 app/Template/notification/task_creation.php        | 43 ++++++++++++++++++
 app/Template/notification/task_due.php             | 20 +++++++++
 app/Template/notification/task_move_column.php     | 11 +++++
 app/Template/notification/task_move_position.php   | 11 +++++
 app/Template/notification/task_open.php            |  5 +++
 app/Template/notification/task_update.php          | 43 ++++++++++++++++++
 app/Template/notification_comment_creation.php     |  7 ---
 app/Template/notification_comment_update.php       |  7 ---
 app/Template/notification_file_creation.php        |  5 ---
 app/Template/notification_footer.php               |  6 ---
 app/Template/notification_subtask_creation.php     | 17 -------
 app/Template/notification_subtask_update.php       | 21 ---------
 app/Template/notification_task_assignee_change.php | 20 ---------
 app/Template/notification_task_close.php           |  5 ---
 app/Template/notification_task_creation.php        | 43 ------------------
 app/Template/notification_task_due.php             | 20 ---------
 app/Template/notification_task_move_column.php     | 11 -----
 app/Template/notification_task_move_position.php   | 11 -----
 app/Template/notification_task_open.php            |  5 ---
 app/Template/notification_task_update.php          | 43 ------------------
 app/Template/user_notifications.php                | 15 ++++---
 53 files changed, 356 insertions(+), 353 deletions(-)
 create mode 100644 app/Template/event/comment_create.php
 create mode 100644 app/Template/event/comment_update.php
 create mode 100644 app/Template/event/subtask_create.php
 create mode 100644 app/Template/event/subtask_update.php
 create mode 100644 app/Template/event/task_assignee_change.php
 create mode 100644 app/Template/event/task_close.php
 create mode 100644 app/Template/event/task_create.php
 create mode 100644 app/Template/event/task_move_column.php
 create mode 100644 app/Template/event/task_move_position.php
 create mode 100644 app/Template/event/task_open.php
 create mode 100644 app/Template/event/task_update.php
 delete mode 100644 app/Template/event_comment_create.php
 delete mode 100644 app/Template/event_comment_update.php
 delete mode 100644 app/Template/event_subtask_create.php
 delete mode 100644 app/Template/event_subtask_update.php
 delete mode 100644 app/Template/event_task_assignee_change.php
 delete mode 100644 app/Template/event_task_close.php
 delete mode 100644 app/Template/event_task_create.php
 delete mode 100644 app/Template/event_task_move_column.php
 delete mode 100644 app/Template/event_task_move_position.php
 delete mode 100644 app/Template/event_task_open.php
 delete mode 100644 app/Template/event_task_update.php
 create mode 100644 app/Template/notification/comment_creation.php
 create mode 100644 app/Template/notification/comment_update.php
 create mode 100644 app/Template/notification/file_creation.php
 create mode 100644 app/Template/notification/footer.php
 create mode 100644 app/Template/notification/subtask_creation.php
 create mode 100644 app/Template/notification/subtask_update.php
 create mode 100644 app/Template/notification/task_assignee_change.php
 create mode 100644 app/Template/notification/task_close.php
 create mode 100644 app/Template/notification/task_creation.php
 create mode 100644 app/Template/notification/task_due.php
 create mode 100644 app/Template/notification/task_move_column.php
 create mode 100644 app/Template/notification/task_move_position.php
 create mode 100644 app/Template/notification/task_open.php
 create mode 100644 app/Template/notification/task_update.php
 delete mode 100644 app/Template/notification_comment_creation.php
 delete mode 100644 app/Template/notification_comment_update.php
 delete mode 100644 app/Template/notification_file_creation.php
 delete mode 100644 app/Template/notification_footer.php
 delete mode 100644 app/Template/notification_subtask_creation.php
 delete mode 100644 app/Template/notification_subtask_update.php
 delete mode 100644 app/Template/notification_task_assignee_change.php
 delete mode 100644 app/Template/notification_task_close.php
 delete mode 100644 app/Template/notification_task_creation.php
 delete mode 100644 app/Template/notification_task_due.php
 delete mode 100644 app/Template/notification_task_move_column.php
 delete mode 100644 app/Template/notification_task_move_position.php
 delete mode 100644 app/Template/notification_task_open.php
 delete mode 100644 app/Template/notification_task_update.php

diff --git a/app/Model/Notification.php b/app/Model/Notification.php
index 32765041..8d1fca09 100644
--- a/app/Model/Notification.php
+++ b/app/Model/Notification.php
@@ -101,18 +101,18 @@ class Notification extends Base
     public function attachEvents()
     {
         $events = array(
-            Task::EVENT_CREATE => 'notification_task_creation',
-            Task::EVENT_UPDATE => 'notification_task_update',
-            Task::EVENT_CLOSE => 'notification_task_close',
-            Task::EVENT_OPEN => 'notification_task_open',
-            Task::EVENT_MOVE_COLUMN => 'notification_task_move_column',
-            Task::EVENT_MOVE_POSITION => 'notification_task_move_position',
-            Task::EVENT_ASSIGNEE_CHANGE => 'notification_task_assignee_change',
-            SubTask::EVENT_CREATE => 'notification_subtask_creation',
-            SubTask::EVENT_UPDATE => 'notification_subtask_update',
-            Comment::EVENT_CREATE => 'notification_comment_creation',
-            Comment::EVENT_UPDATE => 'notification_comment_update',
-            File::EVENT_CREATE => 'notification_file_creation',
+            Task::EVENT_CREATE => 'task_creation',
+            Task::EVENT_UPDATE => 'task_update',
+            Task::EVENT_CLOSE => 'task_close',
+            Task::EVENT_OPEN => 'task_open',
+            Task::EVENT_MOVE_COLUMN => 'task_move_column',
+            Task::EVENT_MOVE_POSITION => 'task_move_position',
+            Task::EVENT_ASSIGNEE_CHANGE => 'task_assignee_change',
+            SubTask::EVENT_CREATE => 'subtask_creation',
+            SubTask::EVENT_UPDATE => 'subtask_update',
+            Comment::EVENT_CREATE => 'comment_creation',
+            Comment::EVENT_UPDATE => 'comment_update',
+            File::EVENT_CREATE => 'file_creation',
         );
 
         foreach ($events as $event_name => $template_name) {
@@ -162,43 +162,43 @@ class Notification extends Base
     public function getMailSubject($template, array $data)
     {
         switch ($template) {
-            case 'notification_file_creation':
+            case 'file_creation':
                 $subject = e('[%s][New attachment] %s (#%d)', $data['task']['project_name'], $data['task']['title'], $data['task']['id']);
                 break;
-            case 'notification_comment_creation':
+            case 'comment_creation':
                 $subject = e('[%s][New comment] %s (#%d)', $data['task']['project_name'], $data['task']['title'], $data['task']['id']);
                 break;
-            case 'notification_comment_update':
+            case 'comment_update':
                 $subject = e('[%s][Comment updated] %s (#%d)', $data['task']['project_name'], $data['task']['title'], $data['task']['id']);
                 break;
-            case 'notification_subtask_creation':
+            case 'subtask_creation':
                 $subject = e('[%s][New subtask] %s (#%d)', $data['task']['project_name'], $data['task']['title'], $data['task']['id']);
                 break;
-            case 'notification_subtask_update':
+            case 'subtask_update':
                 $subject = e('[%s][Subtask updated] %s (#%d)', $data['task']['project_name'], $data['task']['title'], $data['task']['id']);
                 break;
-            case 'notification_task_creation':
+            case 'task_creation':
                 $subject = e('[%s][New task] %s (#%d)', $data['task']['project_name'], $data['task']['title'], $data['task']['id']);
                 break;
-            case 'notification_task_update':
+            case 'task_update':
                 $subject = e('[%s][Task updated] %s (#%d)', $data['task']['project_name'], $data['task']['title'], $data['task']['id']);
                 break;
-            case 'notification_task_close':
+            case 'task_close':
                 $subject = e('[%s][Task closed] %s (#%d)', $data['task']['project_name'], $data['task']['title'], $data['task']['id']);
                 break;
-            case 'notification_task_open':
+            case 'task_open':
                 $subject = e('[%s][Task opened] %s (#%d)', $data['task']['project_name'], $data['task']['title'], $data['task']['id']);
                 break;
-            case 'notification_task_move_column':
+            case 'task_move_column':
                 $subject = e('[%s][Column Change] %s (#%d)', $data['task']['project_name'], $data['task']['title'], $data['task']['id']);
                 break;
-            case 'notification_task_move_position':
+            case 'task_move_position':
                 $subject = e('[%s][Position Change] %s (#%d)', $data['task']['project_name'], $data['task']['title'], $data['task']['id']);
                 break;
-            case 'notification_task_assignee_change':
+            case 'task_assignee_change':
                 $subject = e('[%s][Assignee Change] %s (#%d)', $data['task']['project_name'], $data['task']['title'], $data['task']['id']);
                 break;
-            case 'notification_task_due':
+            case 'task_due':
                 $subject = e('[%s][Due tasks]', $data['project']);
                 break;
             default:
@@ -218,7 +218,7 @@ class Notification extends Base
     public function getMailContent($template, array $data)
     {
         $tpl = new Template;
-        return $tpl->load($template, $data + array('application_url' => $this->config->get('application_url')));
+        return $tpl->load('notification/'.$template, $data + array('application_url' => $this->config->get('application_url')));
     }
 
     /**
diff --git a/app/Model/ProjectActivity.php b/app/Model/ProjectActivity.php
index 9d7ecfac..000dfa09 100644
--- a/app/Model/ProjectActivity.php
+++ b/app/Model/ProjectActivity.php
@@ -164,7 +164,7 @@ class ProjectActivity extends Base
     public function getContent(array $params)
     {
         $tpl = new Template;
-        return $tpl->load('event_'.str_replace('.', '_', $params['event_name']), $params);
+        return $tpl->load('event/'.str_replace('.', '_', $params['event_name']), $params);
     }
 
     /**
diff --git a/app/Template/event/comment_create.php b/app/Template/event/comment_create.php
new file mode 100644
index 00000000..d2f6f97b
--- /dev/null
+++ b/app/Template/event/comment_create.php
@@ -0,0 +1,7 @@
+<p class="activity-title">
+    <?= e('%s commented the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>', Helper\escape($author), $task_id, $task_id) ?>
+</p>
+<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/Template/event/comment_update.php b/app/Template/event/comment_update.php
new file mode 100644
index 00000000..c0b43622
--- /dev/null
+++ b/app/Template/event/comment_update.php
@@ -0,0 +1,6 @@
+<p class="activity-title">
+    <?= e('%s updated a comment on the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>', Helper\escape($author), $task_id, $task_id) ?>
+</p>
+<div class="activity-description">
+    <em><?= Helper\escape($task['title']) ?></em><br/>
+</div>
\ No newline at end of file
diff --git a/app/Template/event/subtask_create.php b/app/Template/event/subtask_create.php
new file mode 100644
index 00000000..664e9da2
--- /dev/null
+++ b/app/Template/event/subtask_create.php
@@ -0,0 +1,19 @@
+<p class="activity-title">
+    <?= e('%s created a subtask for the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>', Helper\escape($author), $task_id, $task_id) ?>
+</p>
+<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/Template/event/subtask_update.php b/app/Template/event/subtask_update.php
new file mode 100644
index 00000000..96a589dd
--- /dev/null
+++ b/app/Template/event/subtask_update.php
@@ -0,0 +1,19 @@
+<p class="activity-title">
+    <?= e('%s updated a subtask for the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>', Helper\escape($author), $task_id, $task_id) ?>
+</p>
+<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/Template/event/task_assignee_change.php b/app/Template/event/task_assignee_change.php
new file mode 100644
index 00000000..b346325e
--- /dev/null
+++ b/app/Template/event/task_assignee_change.php
@@ -0,0 +1,12 @@
+<p class="activity-title">
+    <?= e(
+            '%s change the assignee of the task <a href="?controller=task&amp;action=show&amp;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>
+</p>
\ No newline at end of file
diff --git a/app/Template/event/task_close.php b/app/Template/event/task_close.php
new file mode 100644
index 00000000..48d25678
--- /dev/null
+++ b/app/Template/event/task_close.php
@@ -0,0 +1,6 @@
+<p class="activity-title">
+    <?= e('%s closed the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>', Helper\escape($author), $task_id, $task_id) ?>
+</p>
+<p class="activity-description">
+    <em><?= Helper\escape($task['title']) ?></em>
+</p>
\ No newline at end of file
diff --git a/app/Template/event/task_create.php b/app/Template/event/task_create.php
new file mode 100644
index 00000000..2515af05
--- /dev/null
+++ b/app/Template/event/task_create.php
@@ -0,0 +1,6 @@
+<p class="activity-title">
+    <?= e('%s created the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>', Helper\escape($author), $task_id, $task_id) ?>
+</p>
+<p class="activity-description">
+    <em><?= Helper\escape($task['title']) ?></em>
+</p>
\ No newline at end of file
diff --git a/app/Template/event/task_move_column.php b/app/Template/event/task_move_column.php
new file mode 100644
index 00000000..f2aac8f7
--- /dev/null
+++ b/app/Template/event/task_move_column.php
@@ -0,0 +1,6 @@
+<p class="activity-title">
+    <?= e('%s moved the task <a href="?controller=task&amp;action=show&amp;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>
+</p>
\ No newline at end of file
diff --git a/app/Template/event/task_move_position.php b/app/Template/event/task_move_position.php
new file mode 100644
index 00000000..26cdeb13
--- /dev/null
+++ b/app/Template/event/task_move_position.php
@@ -0,0 +1,6 @@
+<p class="activity-title">
+    <?= e('%s moved the task <a href="?controller=task&amp;action=show&amp;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>
+</p>
\ No newline at end of file
diff --git a/app/Template/event/task_open.php b/app/Template/event/task_open.php
new file mode 100644
index 00000000..9623be74
--- /dev/null
+++ b/app/Template/event/task_open.php
@@ -0,0 +1,6 @@
+<p class="activity-title">
+    <?= e('%s open the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>', Helper\escape($author), $task_id, $task_id) ?>
+</p>
+<p class="activity-description">
+    <em><?= Helper\escape($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
new file mode 100644
index 00000000..a270b936
--- /dev/null
+++ b/app/Template/event/task_update.php
@@ -0,0 +1,6 @@
+<p class="activity-title">
+    <?= e('%s updated the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>', Helper\escape($author), $task_id, $task_id) ?>
+</p>
+<p class="activity-description">
+    <em><?= Helper\escape($task['title']) ?></em>
+</p>
\ No newline at end of file
diff --git a/app/Template/event_comment_create.php b/app/Template/event_comment_create.php
deleted file mode 100644
index d2f6f97b..00000000
--- a/app/Template/event_comment_create.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<p class="activity-title">
-    <?= e('%s commented the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>', Helper\escape($author), $task_id, $task_id) ?>
-</p>
-<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/Template/event_comment_update.php b/app/Template/event_comment_update.php
deleted file mode 100644
index c0b43622..00000000
--- a/app/Template/event_comment_update.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<p class="activity-title">
-    <?= e('%s updated a comment on the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>', Helper\escape($author), $task_id, $task_id) ?>
-</p>
-<div class="activity-description">
-    <em><?= Helper\escape($task['title']) ?></em><br/>
-</div>
\ No newline at end of file
diff --git a/app/Template/event_subtask_create.php b/app/Template/event_subtask_create.php
deleted file mode 100644
index 664e9da2..00000000
--- a/app/Template/event_subtask_create.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<p class="activity-title">
-    <?= e('%s created a subtask for the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>', Helper\escape($author), $task_id, $task_id) ?>
-</p>
-<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/Template/event_subtask_update.php b/app/Template/event_subtask_update.php
deleted file mode 100644
index 96a589dd..00000000
--- a/app/Template/event_subtask_update.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<p class="activity-title">
-    <?= e('%s updated a subtask for the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>', Helper\escape($author), $task_id, $task_id) ?>
-</p>
-<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/Template/event_task_assignee_change.php b/app/Template/event_task_assignee_change.php
deleted file mode 100644
index b346325e..00000000
--- a/app/Template/event_task_assignee_change.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<p class="activity-title">
-    <?= e(
-            '%s change the assignee of the task <a href="?controller=task&amp;action=show&amp;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>
-</p>
\ No newline at end of file
diff --git a/app/Template/event_task_close.php b/app/Template/event_task_close.php
deleted file mode 100644
index 48d25678..00000000
--- a/app/Template/event_task_close.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<p class="activity-title">
-    <?= e('%s closed the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>', Helper\escape($author), $task_id, $task_id) ?>
-</p>
-<p class="activity-description">
-    <em><?= Helper\escape($task['title']) ?></em>
-</p>
\ No newline at end of file
diff --git a/app/Template/event_task_create.php b/app/Template/event_task_create.php
deleted file mode 100644
index 2515af05..00000000
--- a/app/Template/event_task_create.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<p class="activity-title">
-    <?= e('%s created the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>', Helper\escape($author), $task_id, $task_id) ?>
-</p>
-<p class="activity-description">
-    <em><?= Helper\escape($task['title']) ?></em>
-</p>
\ No newline at end of file
diff --git a/app/Template/event_task_move_column.php b/app/Template/event_task_move_column.php
deleted file mode 100644
index f2aac8f7..00000000
--- a/app/Template/event_task_move_column.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<p class="activity-title">
-    <?= e('%s moved the task <a href="?controller=task&amp;action=show&amp;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>
-</p>
\ No newline at end of file
diff --git a/app/Template/event_task_move_position.php b/app/Template/event_task_move_position.php
deleted file mode 100644
index 26cdeb13..00000000
--- a/app/Template/event_task_move_position.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<p class="activity-title">
-    <?= e('%s moved the task <a href="?controller=task&amp;action=show&amp;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>
-</p>
\ No newline at end of file
diff --git a/app/Template/event_task_open.php b/app/Template/event_task_open.php
deleted file mode 100644
index 9623be74..00000000
--- a/app/Template/event_task_open.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<p class="activity-title">
-    <?= e('%s open the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>', Helper\escape($author), $task_id, $task_id) ?>
-</p>
-<p class="activity-description">
-    <em><?= Helper\escape($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
deleted file mode 100644
index a270b936..00000000
--- a/app/Template/event_task_update.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<p class="activity-title">
-    <?= e('%s updated the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>', Helper\escape($author), $task_id, $task_id) ?>
-</p>
-<p class="activity-description">
-    <em><?= Helper\escape($task['title']) ?></em>
-</p>
\ No newline at end of file
diff --git a/app/Template/notification/comment_creation.php b/app/Template/notification/comment_creation.php
new file mode 100644
index 00000000..52f82a92
--- /dev/null
+++ b/app/Template/notification/comment_creation.php
@@ -0,0 +1,7 @@
+<h2><?= Helper\escape($task['title']) ?> (#<?= $task['id'] ?>)</h2>
+
+<h3><?= t('New comment posted by %s', $comment['name'] ?: $comment['username']) ?></h3>
+
+<?= Helper\markdown($comment['comment']) ?>
+
+<?= Helper\template('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
diff --git a/app/Template/notification/comment_update.php b/app/Template/notification/comment_update.php
new file mode 100644
index 00000000..8f613eb2
--- /dev/null
+++ b/app/Template/notification/comment_update.php
@@ -0,0 +1,7 @@
+<h2><?= Helper\escape($task['title']) ?> (#<?= $task['id'] ?>)</h2>
+
+<h3><?= t('Comment updated') ?></h3>
+
+<?= Helper\markdown($comment['comment']) ?>
+
+<?= Helper\template('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
diff --git a/app/Template/notification/file_creation.php b/app/Template/notification/file_creation.php
new file mode 100644
index 00000000..aae6fee9
--- /dev/null
+++ b/app/Template/notification/file_creation.php
@@ -0,0 +1,5 @@
+<h2><?= Helper\escape($task['title']) ?> (#<?= $task['id'] ?>)</h2>
+
+<p><?= t('New attachment added "%s"', $file['name']) ?></p>
+
+<?= Helper\template('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
diff --git a/app/Template/notification/footer.php b/app/Template/notification/footer.php
new file mode 100644
index 00000000..67039e86
--- /dev/null
+++ b/app/Template/notification/footer.php
@@ -0,0 +1,6 @@
+<hr/>
+Kanboard
+
+<?php if (isset($application_url) && ! empty($application_url)): ?>
+    - <a href="<?= $application_url.'?controller=task&action=show&task_id='.$task['id'] ?>"><?= t('view the task on Kanboard') ?></a>.
+<?php endif ?>
diff --git a/app/Template/notification/subtask_creation.php b/app/Template/notification/subtask_creation.php
new file mode 100644
index 00000000..b264ef49
--- /dev/null
+++ b/app/Template/notification/subtask_creation.php
@@ -0,0 +1,17 @@
+<h2><?= Helper\escape($task['title']) ?> (#<?= $task['id'] ?>)</h2>
+
+<h3><?= t('New sub-task') ?></h3>
+
+<ul>
+    <li><?= t('Title:') ?> <?= Helper\escape($subtask['title']) ?></li>
+    <li><?= t('Status:') ?> <?= Helper\escape($subtask['status_name']) ?></li>
+    <li><?= t('Assignee:') ?> <?= Helper\escape($subtask['name'] ?: $subtask['username'] ?: '?') ?></li>
+    <li>
+        <?= t('Time tracking:') ?>
+        <?php if (! empty($subtask['time_estimated'])): ?>
+            <strong><?= Helper\escape($subtask['time_estimated']).'h' ?></strong> <?= t('estimated') ?>
+        <?php endif ?>
+    </li>
+</ul>
+
+<?= Helper\template('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
diff --git a/app/Template/notification/subtask_update.php b/app/Template/notification/subtask_update.php
new file mode 100644
index 00000000..08b7d97f
--- /dev/null
+++ b/app/Template/notification/subtask_update.php
@@ -0,0 +1,21 @@
+<h2><?= Helper\escape($task['title']) ?> (#<?= $task['id'] ?>)</h2>
+
+<h3><?= t('Sub-task updated') ?></h3>
+
+<ul>
+    <li><?= t('Title:') ?> <?= Helper\escape($subtask['title']) ?></li>
+    <li><?= t('Status:') ?> <?= Helper\escape($subtask['status_name']) ?></li>
+    <li><?= t('Assignee:') ?> <?= Helper\escape($subtask['name'] ?: $subtask['username'] ?: '?') ?></li>
+    <li>
+        <?= t('Time tracking:') ?>
+        <?php if (! empty($subtask['time_spent'])): ?>
+            <strong><?= Helper\escape($subtask['time_spent']).'h' ?></strong> <?= t('spent') ?>
+        <?php endif ?>
+
+        <?php if (! empty($subtask['time_estimated'])): ?>
+            <strong><?= Helper\escape($subtask['time_estimated']).'h' ?></strong> <?= t('estimated') ?>
+        <?php endif ?>
+    </li>
+</ul>
+
+<?= Helper\template('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
diff --git a/app/Template/notification/task_assignee_change.php b/app/Template/notification/task_assignee_change.php
new file mode 100644
index 00000000..14beef13
--- /dev/null
+++ b/app/Template/notification/task_assignee_change.php
@@ -0,0 +1,20 @@
+<h2><?= Helper\escape($task['title']) ?> (#<?= $task['id'] ?>)</h2>
+
+<ul>
+    <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>
+</ul>
+
+<?php if (! empty($task['description'])): ?>
+    <h2><?= t('Description') ?></h2>
+    <?= Helper\markdown($task['description']) ?: t('There is no description.') ?>
+<?php endif ?>
+
+<?= Helper\template('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
diff --git a/app/Template/notification/task_close.php b/app/Template/notification/task_close.php
new file mode 100644
index 00000000..1a5ec553
--- /dev/null
+++ b/app/Template/notification/task_close.php
@@ -0,0 +1,5 @@
+<h2><?= Helper\escape($task['title']) ?> (#<?= $task['id'] ?>)</h2>
+
+<p><?= t('The task #%d have been closed.', $task['id']) ?></p>
+
+<?= Helper\template('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
diff --git a/app/Template/notification/task_creation.php b/app/Template/notification/task_creation.php
new file mode 100644
index 00000000..99ebcbe5
--- /dev/null
+++ b/app/Template/notification/task_creation.php
@@ -0,0 +1,43 @@
+<h2><?= Helper\escape($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><?= Helper\escape($task['column_title']) ?></strong>
+    </li>
+    <li><?= t('Task position:').' '.Helper\escape($task['position']) ?></li>
+    <?php if ($task['category_name']): ?>
+    <li>
+        <?= t('Category:') ?> <strong><?= Helper\escape($task['category_name']) ?></strong>
+    </li>
+    <?php endif ?>
+</ul>
+
+<?php if (! empty($task['description'])): ?>
+    <h2><?= t('Description') ?></h2>
+    <?= Helper\markdown($task['description']) ?>
+<?php endif ?>
+
+<?= Helper\template('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_due.php
new file mode 100644
index 00000000..c7ea010f
--- /dev/null
+++ b/app/Template/notification/task_due.php
@@ -0,0 +1,20 @@
+<h2><?= t('List of due tasks for the project "%s"', $project) ?></h2>
+
+<ul>
+    <?php foreach ($tasks as $task): ?>
+        <li>
+            (<strong>#<?= $task['id'] ?></strong>)
+            <?php if ($application_url): ?>
+                <a href="<?= $application_url.'?controller=task&action=show&task_id='.$task['id'] ?>"><?= Helper\escape($task['title']) ?></a>
+            <?php else: ?>
+                <?= Helper\escape($task['title']) ?>
+            <?php endif ?>
+            (<?= dt('%B %e, %Y', $task['date_due']) ?>)
+            <?php if ($task['assignee_username']): ?>
+                (<strong><?= t('Assigned to %s', $task['assignee_name'] ?: $task['assignee_username']) ?></strong>)
+            <?php endif ?>
+        </li>
+    <?php endforeach ?>
+</ul>
+
+<?= Helper\template('notification/footer', array('task' => $task)) ?>
diff --git a/app/Template/notification/task_move_column.php b/app/Template/notification/task_move_column.php
new file mode 100644
index 00000000..36f4daed
--- /dev/null
+++ b/app/Template/notification/task_move_column.php
@@ -0,0 +1,11 @@
+<h2><?= Helper\escape($task['title']) ?> (#<?= $task['id'] ?>)</h2>
+
+<ul>
+    <li>
+        <?= t('Column on the board:') ?>
+        <strong><?= Helper\escape($task['column_title']) ?></strong>
+    </li>
+    <li><?= t('Task position:').' '.Helper\escape($task['position']) ?></li>
+</ul>
+
+<?= Helper\template('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
diff --git a/app/Template/notification/task_move_position.php b/app/Template/notification/task_move_position.php
new file mode 100644
index 00000000..36f4daed
--- /dev/null
+++ b/app/Template/notification/task_move_position.php
@@ -0,0 +1,11 @@
+<h2><?= Helper\escape($task['title']) ?> (#<?= $task['id'] ?>)</h2>
+
+<ul>
+    <li>
+        <?= t('Column on the board:') ?>
+        <strong><?= Helper\escape($task['column_title']) ?></strong>
+    </li>
+    <li><?= t('Task position:').' '.Helper\escape($task['position']) ?></li>
+</ul>
+
+<?= Helper\template('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
diff --git a/app/Template/notification/task_open.php b/app/Template/notification/task_open.php
new file mode 100644
index 00000000..6ee10242
--- /dev/null
+++ b/app/Template/notification/task_open.php
@@ -0,0 +1,5 @@
+<h2><?= Helper\escape($task['title']) ?> (#<?= $task['id'] ?>)</h2>
+
+<p><?= t('The task #%d have been opened.', $task['id']) ?></p>
+
+<?= Helper\template('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
diff --git a/app/Template/notification/task_update.php b/app/Template/notification/task_update.php
new file mode 100644
index 00000000..cbd6b2e1
--- /dev/null
+++ b/app/Template/notification/task_update.php
@@ -0,0 +1,43 @@
+<h2><?= Helper\escape($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><?= Helper\escape($task['column_title']) ?></strong>
+    </li>
+    <li><?= t('Task position:').' '.Helper\escape($task['position']) ?></li>
+    <?php if ($task['category_name']): ?>
+    <li>
+        <?= t('Category:') ?> <strong><?= Helper\escape($task['category_name']) ?></strong>
+    </li>
+    <?php endif ?>
+</ul>
+
+<?php if (! empty($task['description'])): ?>
+    <h2><?= t('Description') ?></h2>
+    <?= Helper\markdown($task['description']) ?: t('There is no description.') ?>
+<?php endif ?>
+
+<?= Helper\template('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
diff --git a/app/Template/notification_comment_creation.php b/app/Template/notification_comment_creation.php
deleted file mode 100644
index 5b334d76..00000000
--- a/app/Template/notification_comment_creation.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<h2><?= Helper\escape($task['title']) ?> (#<?= $task['id'] ?>)</h2>
-
-<h3><?= t('New comment posted by %s', $comment['name'] ?: $comment['username']) ?></h3>
-
-<?= Helper\markdown($comment['comment']) ?>
-
-<?= Helper\template('notification_footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
diff --git a/app/Template/notification_comment_update.php b/app/Template/notification_comment_update.php
deleted file mode 100644
index 04aafb85..00000000
--- a/app/Template/notification_comment_update.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<h2><?= Helper\escape($task['title']) ?> (#<?= $task['id'] ?>)</h2>
-
-<h3><?= t('Comment updated') ?></h3>
-
-<?= Helper\markdown($comment['comment']) ?>
-
-<?= Helper\template('notification_footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
diff --git a/app/Template/notification_file_creation.php b/app/Template/notification_file_creation.php
deleted file mode 100644
index d8636820..00000000
--- a/app/Template/notification_file_creation.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<h2><?= Helper\escape($task['title']) ?> (#<?= $task['id'] ?>)</h2>
-
-<h3><?= t('New attachment added "%s"', $file['name']) ?></h3>
-
-<?= Helper\template('notification_footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
diff --git a/app/Template/notification_footer.php b/app/Template/notification_footer.php
deleted file mode 100644
index 67039e86..00000000
--- a/app/Template/notification_footer.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<hr/>
-Kanboard
-
-<?php if (isset($application_url) && ! empty($application_url)): ?>
-    - <a href="<?= $application_url.'?controller=task&action=show&task_id='.$task['id'] ?>"><?= t('view the task on Kanboard') ?></a>.
-<?php endif ?>
diff --git a/app/Template/notification_subtask_creation.php b/app/Template/notification_subtask_creation.php
deleted file mode 100644
index 2ddfc649..00000000
--- a/app/Template/notification_subtask_creation.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<h2><?= Helper\escape($task['title']) ?> (#<?= $task['id'] ?>)</h2>
-
-<h3><?= t('New sub-task') ?></h3>
-
-<ul>
-    <li><?= t('Title:') ?> <?= Helper\escape($subtask['title']) ?></li>
-    <li><?= t('Status:') ?> <?= Helper\escape($subtask['status_name']) ?></li>
-    <li><?= t('Assignee:') ?> <?= Helper\escape($subtask['name'] ?: $subtask['username'] ?: '?') ?></li>
-    <li>
-        <?= t('Time tracking:') ?>
-        <?php if (! empty($subtask['time_estimated'])): ?>
-            <strong><?= Helper\escape($subtask['time_estimated']).'h' ?></strong> <?= t('estimated') ?>
-        <?php endif ?>
-    </li>
-</ul>
-
-<?= Helper\template('notification_footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
diff --git a/app/Template/notification_subtask_update.php b/app/Template/notification_subtask_update.php
deleted file mode 100644
index 999edbf9..00000000
--- a/app/Template/notification_subtask_update.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<h2><?= Helper\escape($task['title']) ?> (#<?= $task['id'] ?>)</h2>
-
-<h3><?= t('Sub-task updated') ?></h3>
-
-<ul>
-    <li><?= t('Title:') ?> <?= Helper\escape($subtask['title']) ?></li>
-    <li><?= t('Status:') ?> <?= Helper\escape($subtask['status_name']) ?></li>
-    <li><?= t('Assignee:') ?> <?= Helper\escape($subtask['name'] ?: $subtask['username'] ?: '?') ?></li>
-    <li>
-        <?= t('Time tracking:') ?>
-        <?php if (! empty($subtask['time_spent'])): ?>
-            <strong><?= Helper\escape($subtask['time_spent']).'h' ?></strong> <?= t('spent') ?>
-        <?php endif ?>
-
-        <?php if (! empty($subtask['time_estimated'])): ?>
-            <strong><?= Helper\escape($subtask['time_estimated']).'h' ?></strong> <?= t('estimated') ?>
-        <?php endif ?>
-    </li>
-</ul>
-
-<?= Helper\template('notification_footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
diff --git a/app/Template/notification_task_assignee_change.php b/app/Template/notification_task_assignee_change.php
deleted file mode 100644
index d23f769e..00000000
--- a/app/Template/notification_task_assignee_change.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<h2><?= Helper\escape($task['title']) ?> (#<?= $task['id'] ?>)</h2>
-
-<ul>
-    <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>
-</ul>
-
-<?php if (! empty($task['description'])): ?>
-    <h2><?= t('Description') ?></h2>
-    <?= Helper\markdown($task['description']) ?: t('There is no description.') ?>
-<?php endif ?>
-
-<?= Helper\template('notification_footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
diff --git a/app/Template/notification_task_close.php b/app/Template/notification_task_close.php
deleted file mode 100644
index d56e71bb..00000000
--- a/app/Template/notification_task_close.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<h2><?= Helper\escape($task['title']) ?> (#<?= $task['id'] ?>)</h2>
-
-<p><?= t('The task #%d have been closed.', $task['id']) ?></p>
-
-<?= Helper\template('notification_footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
diff --git a/app/Template/notification_task_creation.php b/app/Template/notification_task_creation.php
deleted file mode 100644
index 1b555096..00000000
--- a/app/Template/notification_task_creation.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<h2><?= Helper\escape($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><?= Helper\escape($task['column_title']) ?></strong>
-    </li>
-    <li><?= t('Task position:').' '.Helper\escape($task['position']) ?></li>
-    <?php if ($task['category_name']): ?>
-    <li>
-        <?= t('Category:') ?> <strong><?= Helper\escape($task['category_name']) ?></strong>
-    </li>
-    <?php endif ?>
-</ul>
-
-<?php if (! empty($task['description'])): ?>
-    <h2><?= t('Description') ?></h2>
-    <?= Helper\markdown($task['description']) ?>
-<?php endif ?>
-
-<?= Helper\template('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_due.php
deleted file mode 100644
index a32a9efc..00000000
--- a/app/Template/notification_task_due.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<h2><?= t('List of due tasks for the project "%s"', $project) ?></h2>
-
-<ul>
-    <?php foreach ($tasks as $task): ?>
-        <li>
-            (<strong>#<?= $task['id'] ?></strong>)
-            <?php if ($application_url): ?>
-                <a href="<?= $application_url.'?controller=task&action=show&task_id='.$task['id'] ?>"><?= Helper\escape($task['title']) ?></a>
-            <?php else: ?>
-                <?= Helper\escape($task['title']) ?>
-            <?php endif ?>
-            (<?= dt('%B %e, %Y', $task['date_due']) ?>)
-            <?php if ($task['assignee_username']): ?>
-                (<strong><?= t('Assigned to %s', $task['assignee_name'] ?: $task['assignee_username']) ?></strong>)
-            <?php endif ?>
-        </li>
-    <?php endforeach ?>
-</ul>
-
-<?= Helper\template('notification_footer', array('task' => $task)) ?>
diff --git a/app/Template/notification_task_move_column.php b/app/Template/notification_task_move_column.php
deleted file mode 100644
index c3f94df7..00000000
--- a/app/Template/notification_task_move_column.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<h2><?= Helper\escape($task['title']) ?> (#<?= $task['id'] ?>)</h2>
-
-<ul>
-    <li>
-        <?= t('Column on the board:') ?>
-        <strong><?= Helper\escape($task['column_title']) ?></strong>
-    </li>
-    <li><?= t('Task position:').' '.Helper\escape($task['position']) ?></li>
-</ul>
-
-<?= Helper\template('notification_footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
diff --git a/app/Template/notification_task_move_position.php b/app/Template/notification_task_move_position.php
deleted file mode 100644
index c3f94df7..00000000
--- a/app/Template/notification_task_move_position.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<h2><?= Helper\escape($task['title']) ?> (#<?= $task['id'] ?>)</h2>
-
-<ul>
-    <li>
-        <?= t('Column on the board:') ?>
-        <strong><?= Helper\escape($task['column_title']) ?></strong>
-    </li>
-    <li><?= t('Task position:').' '.Helper\escape($task['position']) ?></li>
-</ul>
-
-<?= Helper\template('notification_footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
diff --git a/app/Template/notification_task_open.php b/app/Template/notification_task_open.php
deleted file mode 100644
index 5d9f7d5b..00000000
--- a/app/Template/notification_task_open.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<h2><?= Helper\escape($task['title']) ?> (#<?= $task['id'] ?>)</h2>
-
-<p><?= t('The task #%d have been opened.', $task['id']) ?></p>
-
-<?= Helper\template('notification_footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
diff --git a/app/Template/notification_task_update.php b/app/Template/notification_task_update.php
deleted file mode 100644
index b3c07911..00000000
--- a/app/Template/notification_task_update.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<h2><?= Helper\escape($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><?= Helper\escape($task['column_title']) ?></strong>
-    </li>
-    <li><?= t('Task position:').' '.Helper\escape($task['position']) ?></li>
-    <?php if ($task['category_name']): ?>
-    <li>
-        <?= t('Category:') ?> <strong><?= Helper\escape($task['category_name']) ?></strong>
-    </li>
-    <?php endif ?>
-</ul>
-
-<?php if (! empty($task['description'])): ?>
-    <h2><?= t('Description') ?></h2>
-    <?= Helper\markdown($task['description']) ?: t('There is no description.') ?>
-<?php endif ?>
-
-<?= Helper\template('notification_footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
diff --git a/app/Template/user_notifications.php b/app/Template/user_notifications.php
index 13dd9809..4a32a41d 100644
--- a/app/Template/user_notifications.php
+++ b/app/Template/user_notifications.php
@@ -8,13 +8,16 @@
 
     <?= Helper\form_checkbox('notifications_enabled', t('Enable email notifications'), '1', $notifications['notifications_enabled'] == 1) ?><br/>
 
-    <p><?= t('I want to receive notifications only for those projects:') ?><br/><br/></p>
+    <?php if (! empty($projects)): ?>
+        <p><?= t('I want to receive notifications only for those projects:') ?><br/><br/></p>
+
+        <div class="form-checkbox-group">
+        <?php foreach ($projects as $project_id => $project_name): ?>
+            <?= Helper\form_checkbox('projects['.$project_id.']', $project_name, '1', isset($notifications['project_'.$project_id])) ?>
+        <?php endforeach ?>
+        </div>
+    <?php endif ?>
 
-    <div class="form-checkbox-group">
-    <?php foreach ($projects as $project_id => $project_name): ?>
-        <?= Helper\form_checkbox('projects['.$project_id.']', $project_name, '1', isset($notifications['project_'.$project_id])) ?>
-    <?php endforeach ?>
-    </div>
     <div class="form-actions">
         <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
         <?= t('or') ?> <a href="?controller=user&amp;action=show&amp;user_id=<?= $user['id'] ?>"><?= t('cancel') ?></a>
-- 
cgit v1.2.3