From 8f3e2b2e5c62a6130f6c8867ab335fb4c1a32c5c Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Fri, 4 Mar 2016 20:10:34 -0500
Subject: Helper refactoring

---
 app/Template/event/comment_create.php       | 4 ++--
 app/Template/event/comment_update.php       | 4 ++--
 app/Template/event/subtask_create.php       | 6 +++---
 app/Template/event/subtask_update.php       | 6 +++---
 app/Template/event/task_assignee_change.php | 8 ++++----
 app/Template/event/task_close.php           | 4 ++--
 app/Template/event/task_create.php          | 4 ++--
 app/Template/event/task_file_create.php     | 4 ++--
 app/Template/event/task_move_column.php     | 6 +++---
 app/Template/event/task_move_position.php   | 6 +++---
 app/Template/event/task_move_swimlane.php   | 8 ++++----
 app/Template/event/task_open.php            | 4 ++--
 app/Template/event/task_update.php          | 4 ++--
 13 files changed, 34 insertions(+), 34 deletions(-)

(limited to 'app/Template/event')

diff --git a/app/Template/event/comment_create.php b/app/Template/event/comment_create.php
index 462f15ca..063736b3 100644
--- a/app/Template/event/comment_create.php
+++ b/app/Template/event/comment_create.php
@@ -2,11 +2,11 @@
 
 <p class="activity-title">
     <?= e('%s commented the task %s',
-            $this->e($author),
+            $this->text->e($author),
             $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
         ) ?>
 </p>
 <div class="activity-description">
-    <em><?= $this->e($task['title']) ?></em><br/>
+    <em><?= $this->text->e($task['title']) ?></em><br/>
     <div class="markdown"><?= $this->text->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
index 0cb10bf6..93f24d8a 100644
--- a/app/Template/event/comment_update.php
+++ b/app/Template/event/comment_update.php
@@ -2,10 +2,10 @@
 
 <p class="activity-title">
     <?= e('%s updated a comment on the task %s',
-            $this->e($author),
+            $this->text->e($author),
             $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
         ) ?>
 </p>
 <div class="activity-description">
-    <em><?= $this->e($task['title']) ?></em><br/>
+    <em><?= $this->text->e($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
index ca23aa9c..532783d5 100644
--- a/app/Template/event/subtask_create.php
+++ b/app/Template/event/subtask_create.php
@@ -2,16 +2,16 @@
 
 <p class="activity-title">
     <?= e('%s created a subtask for the task %s',
-            $this->e($author),
+            $this->text->e($author),
             $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
         ) ?>
 </p>
 <div class="activity-description">
-    <p><em><?= $this->e($task['title']) ?></em></p>
+    <p><em><?= $this->text->e($task['title']) ?></em></p>
 
     <ul>
         <li>
-            <?= $this->e($subtask['title']) ?> (<strong><?= $this->e($subtask['status_name']) ?></strong>)
+            <?= $this->text->e($subtask['title']) ?> (<strong><?= $this->text->e($subtask['status_name']) ?></strong>)
         </li>
         <li>
             <?php if ($subtask['username']): ?>
diff --git a/app/Template/event/subtask_update.php b/app/Template/event/subtask_update.php
index 11a778de..e9ff6ac6 100644
--- a/app/Template/event/subtask_update.php
+++ b/app/Template/event/subtask_update.php
@@ -2,16 +2,16 @@
 
 <p class="activity-title">
     <?= e('%s updated a subtask for the task %s',
-            $this->e($author),
+            $this->text->e($author),
             $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
         ) ?>
 </p>
 <div class="activity-description">
-    <p><em><?= $this->e($task['title']) ?></em></p>
+    <p><em><?= $this->text->e($task['title']) ?></em></p>
 
     <ul>
         <li>
-            <?= $this->e($subtask['title']) ?> (<strong><?= $this->e($subtask['status_name']) ?></strong>)
+            <?= $this->text->e($subtask['title']) ?> (<strong><?= $this->text->e($subtask['status_name']) ?></strong>)
         </li>
         <li>
             <?php if ($subtask['username']): ?>
diff --git a/app/Template/event/task_assignee_change.php b/app/Template/event/task_assignee_change.php
index cdec8743..580176c7 100644
--- a/app/Template/event/task_assignee_change.php
+++ b/app/Template/event/task_assignee_change.php
@@ -5,14 +5,14 @@
 
     <?php if (! empty($assignee)): ?>
         <?= e('%s changed the assignee of the task %s to %s',
-                $this->e($author),
+                $this->text->e($author),
                 $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])),
-                $this->e($assignee)
+                $this->text->e($assignee)
             ) ?>
     <?php else: ?>
-        <?= e('%s remove the assignee of the task %s', $this->e($author), $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))) ?>
+        <?= e('%s remove the assignee of the task %s', $this->text->e($author), $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))) ?>
     <?php endif ?>
 </p>
 <p class="activity-description">
-    <em><?= $this->e($task['title']) ?></em>
+    <em><?= $this->text->e($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
index 3d8670a6..361458d3 100644
--- a/app/Template/event/task_close.php
+++ b/app/Template/event/task_close.php
@@ -2,10 +2,10 @@
 
 <p class="activity-title">
     <?= e('%s closed the task %s',
-            $this->e($author),
+            $this->text->e($author),
             $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
         ) ?>
 </p>
 <p class="activity-description">
-    <em><?= $this->e($task['title']) ?></em>
+    <em><?= $this->text->e($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
index 773f401c..655bf8f3 100644
--- a/app/Template/event/task_create.php
+++ b/app/Template/event/task_create.php
@@ -2,10 +2,10 @@
 
 <p class="activity-title">
     <?= e('%s created the task %s',
-            $this->e($author),
+            $this->text->e($author),
             $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
         ) ?>
 </p>
 <p class="activity-description">
-    <em><?= $this->e($task['title']) ?></em>
+    <em><?= $this->text->e($task['title']) ?></em>
 </p>
\ No newline at end of file
diff --git a/app/Template/event/task_file_create.php b/app/Template/event/task_file_create.php
index 1a36bc8f..61bf3d61 100644
--- a/app/Template/event/task_file_create.php
+++ b/app/Template/event/task_file_create.php
@@ -2,10 +2,10 @@
 
 <p class="activity-title">
     <?= e('%s attached a new file to the task %s',
-            $this->e($author),
+            $this->text->e($author),
             $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
         ) ?>
 </p>
 <p class="activity-description">
-    <em><?= $this->e($file['name']) ?></em>
+    <em><?= $this->text->e($file['name']) ?></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
index ca482e46..904c956c 100644
--- a/app/Template/event/task_move_column.php
+++ b/app/Template/event/task_move_column.php
@@ -2,11 +2,11 @@
 
 <p class="activity-title">
     <?= e('%s moved the task %s to the column "%s"',
-            $this->e($author),
+            $this->text->e($author),
             $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])),
-            $this->e($task['column_title'])
+            $this->text->e($task['column_title'])
         ) ?>
 </p>
 <p class="activity-description">
-    <em><?= $this->e($task['title']) ?></em>
+    <em><?= $this->text->e($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
index dcdd3e1b..6580bb79 100644
--- a/app/Template/event/task_move_position.php
+++ b/app/Template/event/task_move_position.php
@@ -2,12 +2,12 @@
 
 <p class="activity-title">
     <?= e('%s moved the task %s to the position #%d in the column "%s"',
-            $this->e($author),
+            $this->text->e($author),
             $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])),
             $task['position'],
-            $this->e($task['column_title'])
+            $this->text->e($task['column_title'])
         ) ?>
 </p>
 <p class="activity-description">
-    <em><?= $this->e($task['title']) ?></em>
+    <em><?= $this->text->e($task['title']) ?></em>
 </p>
\ No newline at end of file
diff --git a/app/Template/event/task_move_swimlane.php b/app/Template/event/task_move_swimlane.php
index ca440dbf..9ffa554c 100644
--- a/app/Template/event/task_move_swimlane.php
+++ b/app/Template/event/task_move_swimlane.php
@@ -3,17 +3,17 @@
 <p class="activity-title">
     <?php if ($task['swimlane_id'] == 0): ?>
         <?= e('%s moved the task %s to the first swimlane',
-                $this->e($author),
+                $this->text->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->text->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'])
+                $this->text->e($task['swimlane_name'])
             ) ?>
     <?php endif ?>
 </p>
 <p class="activity-description">
-    <em><?= $this->e($task['title']) ?></em>
+    <em><?= $this->text->e($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
index 11fec64b..9db2e3c9 100644
--- a/app/Template/event/task_open.php
+++ b/app/Template/event/task_open.php
@@ -2,10 +2,10 @@
 
 <p class="activity-title">
     <?= e('%s opened the task %s',
-            $this->e($author),
+            $this->text->e($author),
             $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
         ) ?>
 </p>
 <p class="activity-description">
-    <em><?= $this->e($task['title']) ?></em>
+    <em><?= $this->text->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 e8254bcb..72d70495 100644
--- a/app/Template/event/task_update.php
+++ b/app/Template/event/task_update.php
@@ -2,12 +2,12 @@
 
 <p class="activity-title">
     <?= e('%s updated the task %s',
-            $this->e($author),
+            $this->text->e($author),
             $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
         ) ?>
 </p>
 <p class="activity-description">
-    <em><?= $this->e($task['title']) ?></em>
+    <em><?= $this->text->e($task['title']) ?></em>
     <?php if (isset($changes)): ?>
         <div class="activity-changes">
             <?= $this->render('task/changes', array('changes' => $changes, 'task' => $task)) ?>
-- 
cgit v1.2.3