From 8dd68247349c8df89408b41de37b3dc144712a48 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Thu, 11 Jun 2015 20:36:42 -0400
Subject: Fix notification template issues

---
 app/Template/notification/comment_create.php   |  7 +++++
 app/Template/notification/comment_creation.php |  7 -----
 app/Template/notification/file_create.php      |  5 +++
 app/Template/notification/file_creation.php    |  5 ---
 app/Template/notification/subtask_create.php   | 17 ++++++++++
 app/Template/notification/subtask_creation.php | 17 ----------
 app/Template/notification/task_create.php      | 43 ++++++++++++++++++++++++++
 app/Template/notification/task_creation.php    | 43 --------------------------
 8 files changed, 72 insertions(+), 72 deletions(-)
 create mode 100644 app/Template/notification/comment_create.php
 delete mode 100644 app/Template/notification/comment_creation.php
 create mode 100644 app/Template/notification/file_create.php
 delete mode 100644 app/Template/notification/file_creation.php
 create mode 100644 app/Template/notification/subtask_create.php
 delete mode 100644 app/Template/notification/subtask_creation.php
 create mode 100644 app/Template/notification/task_create.php
 delete mode 100644 app/Template/notification/task_creation.php

(limited to 'app/Template/notification')

diff --git a/app/Template/notification/comment_create.php b/app/Template/notification/comment_create.php
new file mode 100644
index 00000000..747c4f43
--- /dev/null
+++ b/app/Template/notification/comment_create.php
@@ -0,0 +1,7 @@
+<h2><?= $this->e($task['title']) ?> (#<?= $task['id'] ?>)</h2>
+
+<h3><?= t('New comment posted by %s', $comment['name'] ?: $comment['username']) ?></h3>
+
+<?= $this->text->markdown($comment['comment']) ?>
+
+<?= $this->render('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 747c4f43..00000000
--- a/app/Template/notification/comment_creation.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<h2><?= $this->e($task['title']) ?> (#<?= $task['id'] ?>)</h2>
-
-<h3><?= t('New comment posted by %s', $comment['name'] ?: $comment['username']) ?></h3>
-
-<?= $this->text->markdown($comment['comment']) ?>
-
-<?= $this->render('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
diff --git a/app/Template/notification/file_create.php b/app/Template/notification/file_create.php
new file mode 100644
index 00000000..63f7d1b8
--- /dev/null
+++ b/app/Template/notification/file_create.php
@@ -0,0 +1,5 @@
+<h2><?= $this->e($task['title']) ?> (#<?= $task['id'] ?>)</h2>
+
+<p><?= t('New attachment added "%s"', $file['name']) ?></p>
+
+<?= $this->render('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 63f7d1b8..00000000
--- a/app/Template/notification/file_creation.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<h2><?= $this->e($task['title']) ?> (#<?= $task['id'] ?>)</h2>
-
-<p><?= t('New attachment added "%s"', $file['name']) ?></p>
-
-<?= $this->render('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
diff --git a/app/Template/notification/subtask_create.php b/app/Template/notification/subtask_create.php
new file mode 100644
index 00000000..e1c62b73
--- /dev/null
+++ b/app/Template/notification/subtask_create.php
@@ -0,0 +1,17 @@
+<h2><?= $this->e($task['title']) ?> (#<?= $task['id'] ?>)</h2>
+
+<h3><?= t('New sub-task') ?></h3>
+
+<ul>
+    <li><?= t('Title:') ?> <?= $this->e($subtask['title']) ?></li>
+    <li><?= t('Status:') ?> <?= $this->e($subtask['status_name']) ?></li>
+    <li><?= t('Assignee:') ?> <?= $this->e($subtask['name'] ?: $subtask['username'] ?: '?') ?></li>
+    <li>
+        <?= t('Time tracking:') ?>
+        <?php if (! empty($subtask['time_estimated'])): ?>
+            <strong><?= $this->e($subtask['time_estimated']).'h' ?></strong> <?= t('estimated') ?>
+        <?php endif ?>
+    </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/subtask_creation.php b/app/Template/notification/subtask_creation.php
deleted file mode 100644
index e1c62b73..00000000
--- a/app/Template/notification/subtask_creation.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<h2><?= $this->e($task['title']) ?> (#<?= $task['id'] ?>)</h2>
-
-<h3><?= t('New sub-task') ?></h3>
-
-<ul>
-    <li><?= t('Title:') ?> <?= $this->e($subtask['title']) ?></li>
-    <li><?= t('Status:') ?> <?= $this->e($subtask['status_name']) ?></li>
-    <li><?= t('Assignee:') ?> <?= $this->e($subtask['name'] ?: $subtask['username'] ?: '?') ?></li>
-    <li>
-        <?= t('Time tracking:') ?>
-        <?php if (! empty($subtask['time_estimated'])): ?>
-            <strong><?= $this->e($subtask['time_estimated']).'h' ?></strong> <?= t('estimated') ?>
-        <?php endif ?>
-    </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_create.php b/app/Template/notification/task_create.php
new file mode 100644
index 00000000..1d834d44
--- /dev/null
+++ b/app/Template/notification/task_create.php
@@ -0,0 +1,43 @@
+<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 (! empty($task['creator_username'])): ?>
+    <li>
+        <?= t('Created by %s', $task['creator_name'] ?: $task['creator_username']) ?>
+    </li>
+    <?php endif ?>
+    <li>
+        <strong>
+        <?php if (! empty($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 (! empty($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']) ?>
+<?php endif ?>
+
+<?= $this->render('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 0905d3f5..00000000
--- a/app/Template/notification/task_creation.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<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']) ?>
-<?php endif ?>
-
-<?= $this->render('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
-- 
cgit v1.2.3