From 34d7450d3c13342715e90ec21bceaa13e1baa876 Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fred@kanboard.net>
Date: Sun, 28 Dec 2014 11:28:50 -0500
Subject: Template helpers refactoring

---
 app/Template/notification/comment_creation.php     |  6 +++---
 app/Template/notification/comment_update.php       |  6 +++---
 app/Template/notification/file_creation.php        |  4 ++--
 app/Template/notification/subtask_creation.php     | 12 ++++++------
 app/Template/notification/subtask_update.php       | 14 +++++++-------
 app/Template/notification/task_assignee_change.php |  6 +++---
 app/Template/notification/task_close.php           |  4 ++--
 app/Template/notification/task_creation.php        | 12 ++++++------
 app/Template/notification/task_due.php             |  6 +++---
 app/Template/notification/task_move_column.php     |  8 ++++----
 app/Template/notification/task_move_position.php   |  8 ++++----
 app/Template/notification/task_open.php            |  4 ++--
 app/Template/notification/task_update.php          | 12 ++++++------
 13 files changed, 51 insertions(+), 51 deletions(-)

(limited to 'app/Template/notification')

diff --git a/app/Template/notification/comment_creation.php b/app/Template/notification/comment_creation.php
index 52f82a92..b28e261a 100644
--- a/app/Template/notification/comment_creation.php
+++ b/app/Template/notification/comment_creation.php
@@ -1,7 +1,7 @@
-<h2><?= Helper\escape($task['title']) ?> (#<?= $task['id'] ?>)</h2>
+<h2><?= $this->e($task['title']) ?> (#<?= $task['id'] ?>)</h2>
 
 <h3><?= t('New comment posted by %s', $comment['name'] ?: $comment['username']) ?></h3>
 
-<?= Helper\markdown($comment['comment']) ?>
+<?= $this->markdown($comment['comment']) ?>
 
-<?= Helper\template('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
+<?= $this->render('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
index 8f613eb2..88154f0b 100644
--- a/app/Template/notification/comment_update.php
+++ b/app/Template/notification/comment_update.php
@@ -1,7 +1,7 @@
-<h2><?= Helper\escape($task['title']) ?> (#<?= $task['id'] ?>)</h2>
+<h2><?= $this->e($task['title']) ?> (#<?= $task['id'] ?>)</h2>
 
 <h3><?= t('Comment updated') ?></h3>
 
-<?= Helper\markdown($comment['comment']) ?>
+<?= $this->markdown($comment['comment']) ?>
 
-<?= Helper\template('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
+<?= $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
index aae6fee9..63f7d1b8 100644
--- a/app/Template/notification/file_creation.php
+++ b/app/Template/notification/file_creation.php
@@ -1,5 +1,5 @@
-<h2><?= Helper\escape($task['title']) ?> (#<?= $task['id'] ?>)</h2>
+<h2><?= $this->e($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
+<?= $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
index b264ef49..e1c62b73 100644
--- a/app/Template/notification/subtask_creation.php
+++ b/app/Template/notification/subtask_creation.php
@@ -1,17 +1,17 @@
-<h2><?= Helper\escape($task['title']) ?> (#<?= $task['id'] ?>)</h2>
+<h2><?= $this->e($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('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><?= Helper\escape($subtask['time_estimated']).'h' ?></strong> <?= t('estimated') ?>
+            <strong><?= $this->e($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
+<?= $this->render('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
index 08b7d97f..cfde9db6 100644
--- a/app/Template/notification/subtask_update.php
+++ b/app/Template/notification/subtask_update.php
@@ -1,21 +1,21 @@
-<h2><?= Helper\escape($task['title']) ?> (#<?= $task['id'] ?>)</h2>
+<h2><?= $this->e($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('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_spent'])): ?>
-            <strong><?= Helper\escape($subtask['time_spent']).'h' ?></strong> <?= t('spent') ?>
+            <strong><?= $this->e($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') ?>
+            <strong><?= $this->e($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
+<?= $this->render('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
index 14beef13..faab92f3 100644
--- a/app/Template/notification/task_assignee_change.php
+++ b/app/Template/notification/task_assignee_change.php
@@ -1,4 +1,4 @@
-<h2><?= Helper\escape($task['title']) ?> (#<?= $task['id'] ?>)</h2>
+<h2><?= $this->e($task['title']) ?> (#<?= $task['id'] ?>)</h2>
 
 <ul>
     <li>
@@ -14,7 +14,7 @@
 
 <?php if (! empty($task['description'])): ?>
     <h2><?= t('Description') ?></h2>
-    <?= Helper\markdown($task['description']) ?: t('There is no description.') ?>
+    <?= $this->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
+<?= $this->render('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
index 1a5ec553..463223a0 100644
--- a/app/Template/notification/task_close.php
+++ b/app/Template/notification/task_close.php
@@ -1,5 +1,5 @@
-<h2><?= Helper\escape($task['title']) ?> (#<?= $task['id'] ?>)</h2>
+<h2><?= $this->e($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
+<?= $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
index 99ebcbe5..dfd3e591 100644
--- a/app/Template/notification/task_creation.php
+++ b/app/Template/notification/task_creation.php
@@ -1,4 +1,4 @@
-<h2><?= Helper\escape($task['title']) ?> (#<?= $task['id'] ?>)</h2>
+<h2><?= $this->e($task['title']) ?> (#<?= $task['id'] ?>)</h2>
 
 <ul>
     <li>
@@ -25,19 +25,19 @@
     </li>
     <li>
         <?= t('Column on the board:') ?>
-        <strong><?= Helper\escape($task['column_title']) ?></strong>
+        <strong><?= $this->e($task['column_title']) ?></strong>
     </li>
-    <li><?= t('Task position:').' '.Helper\escape($task['position']) ?></li>
+    <li><?= t('Task position:').' '.$this->e($task['position']) ?></li>
     <?php if ($task['category_name']): ?>
     <li>
-        <?= t('Category:') ?> <strong><?= Helper\escape($task['category_name']) ?></strong>
+        <?= t('Category:') ?> <strong><?= $this->e($task['category_name']) ?></strong>
     </li>
     <?php endif ?>
 </ul>
 
 <?php if (! empty($task['description'])): ?>
     <h2><?= t('Description') ?></h2>
-    <?= Helper\markdown($task['description']) ?>
+    <?= $this->markdown($task['description']) ?>
 <?php endif ?>
 
-<?= Helper\template('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
+<?= $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_due.php
index c7ea010f..066ada64 100644
--- a/app/Template/notification/task_due.php
+++ b/app/Template/notification/task_due.php
@@ -5,9 +5,9 @@
         <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>
+                <a href="<?= $application_url.'?controller=task&action=show&task_id='.$task['id'] ?>"><?= $this->e($task['title']) ?></a>
             <?php else: ?>
-                <?= Helper\escape($task['title']) ?>
+                <?= $this->e($task['title']) ?>
             <?php endif ?>
             (<?= dt('%B %e, %Y', $task['date_due']) ?>)
             <?php if ($task['assignee_username']): ?>
@@ -17,4 +17,4 @@
     <?php endforeach ?>
 </ul>
 
-<?= Helper\template('notification/footer', array('task' => $task)) ?>
+<?= $this->render('notification/footer', array('task' => $task)) ?>
diff --git a/app/Template/notification/task_move_column.php b/app/Template/notification/task_move_column.php
index 36f4daed..88ab8ab5 100644
--- a/app/Template/notification/task_move_column.php
+++ b/app/Template/notification/task_move_column.php
@@ -1,11 +1,11 @@
-<h2><?= Helper\escape($task['title']) ?> (#<?= $task['id'] ?>)</h2>
+<h2><?= $this->e($task['title']) ?> (#<?= $task['id'] ?>)</h2>
 
 <ul>
     <li>
         <?= t('Column on the board:') ?>
-        <strong><?= Helper\escape($task['column_title']) ?></strong>
+        <strong><?= $this->e($task['column_title']) ?></strong>
     </li>
-    <li><?= t('Task position:').' '.Helper\escape($task['position']) ?></li>
+    <li><?= t('Task position:').' '.$this->e($task['position']) ?></li>
 </ul>
 
-<?= Helper\template('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
+<?= $this->render('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
index 36f4daed..88ab8ab5 100644
--- a/app/Template/notification/task_move_position.php
+++ b/app/Template/notification/task_move_position.php
@@ -1,11 +1,11 @@
-<h2><?= Helper\escape($task['title']) ?> (#<?= $task['id'] ?>)</h2>
+<h2><?= $this->e($task['title']) ?> (#<?= $task['id'] ?>)</h2>
 
 <ul>
     <li>
         <?= t('Column on the board:') ?>
-        <strong><?= Helper\escape($task['column_title']) ?></strong>
+        <strong><?= $this->e($task['column_title']) ?></strong>
     </li>
-    <li><?= t('Task position:').' '.Helper\escape($task['position']) ?></li>
+    <li><?= t('Task position:').' '.$this->e($task['position']) ?></li>
 </ul>
 
-<?= Helper\template('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
+<?= $this->render('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
index 6ee10242..cb02a79c 100644
--- a/app/Template/notification/task_open.php
+++ b/app/Template/notification/task_open.php
@@ -1,5 +1,5 @@
-<h2><?= Helper\escape($task['title']) ?> (#<?= $task['id'] ?>)</h2>
+<h2><?= $this->e($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
+<?= $this->render('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
index cbd6b2e1..71e949dd 100644
--- a/app/Template/notification/task_update.php
+++ b/app/Template/notification/task_update.php
@@ -1,4 +1,4 @@
-<h2><?= Helper\escape($task['title']) ?> (#<?= $task['id'] ?>)</h2>
+<h2><?= $this->e($task['title']) ?> (#<?= $task['id'] ?>)</h2>
 
 <ul>
     <li>
@@ -25,19 +25,19 @@
     </li>
     <li>
         <?= t('Column on the board:') ?>
-        <strong><?= Helper\escape($task['column_title']) ?></strong>
+        <strong><?= $this->e($task['column_title']) ?></strong>
     </li>
-    <li><?= t('Task position:').' '.Helper\escape($task['position']) ?></li>
+    <li><?= t('Task position:').' '.$this->e($task['position']) ?></li>
     <?php if ($task['category_name']): ?>
     <li>
-        <?= t('Category:') ?> <strong><?= Helper\escape($task['category_name']) ?></strong>
+        <?= t('Category:') ?> <strong><?= $this->e($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.') ?>
+    <?= $this->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
+<?= $this->render('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
-- 
cgit v1.2.3