Helpers refactoring

12 files changed, 27 insertions, 27 deletions

diff --git a/app/Template/event/comment_create.php b/app/Template/event/comment_create.php
index 79238aba..462f15ca 100644
--- a/app/Template/event/comment_create.php
+++ b/app/Template/event/comment_create.php
@@ -1,12 +1,12 @@
-<?= $this->avatar($email, $author) ?>
+<?= $this->user->avatar($email, $author) ?>
 
 <p class="activity-title">
     <?= e('%s commented the task %s',
             $this->e($author),
-            $this->a(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
+            $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/>
-    <div class="markdown"><?= $this->markdown($comment['comment']) ?></div>
+    <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 5d22a2ce..0cb10bf6 100644
--- a/app/Template/event/comment_update.php
+++ b/app/Template/event/comment_update.php
@@ -1,9 +1,9 @@
-<?= $this->avatar($email, $author) ?>
+<?= $this->user->avatar($email, $author) ?>
 
 <p class="activity-title">
     <?= e('%s updated a comment on the task %s',
             $this->e($author),
-            $this->a(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
+            $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
         ) ?>
 </p>
 <div class="activity-description">
diff --git a/app/Template/event/events.php b/app/Template/event/events.php
index 93bc6584..2dc79871 100644
--- a/app/Template/event/events.php
+++ b/app/Template/event/events.php
@@ -5,11 +5,11 @@
     <?php foreach ($events as $event): ?>
         <div class="activity-event">
             <p class="activity-datetime">
-                <?php if ($this->contains($event['event_name'], 'subtask')): ?>
+                <?php if ($this->text->contains($event['event_name'], 'subtask')): ?>
                     <i class="fa fa-tasks"></i>
-                <?php elseif ($this->contains($event['event_name'], 'task')): ?>
+                <?php elseif ($this->text->contains($event['event_name'], 'task')): ?>
                     <i class="fa fa-newspaper-o"></i>
-                <?php elseif ($this->contains($event['event_name'], 'comment')): ?>
+                <?php elseif ($this->text->contains($event['event_name'], 'comment')): ?>
                     <i class="fa fa-comments-o"></i>
                 <?php endif ?>
                 &nbsp;<?= dt('%B %e, %Y at %k:%M %p', $event['date_creation']) ?>
diff --git a/app/Template/event/subtask_create.php b/app/Template/event/subtask_create.php
index 4f33069a..ca23aa9c 100644
--- a/app/Template/event/subtask_create.php
+++ b/app/Template/event/subtask_create.php
@@ -1,9 +1,9 @@
-<?= $this->avatar($email, $author) ?>
+<?= $this->user->avatar($email, $author) ?>
 
 <p class="activity-title">
     <?= e('%s created a subtask for the task %s',
             $this->e($author),
-            $this->a(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
+            $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
         ) ?>
 </p>
 <div class="activity-description">
diff --git a/app/Template/event/subtask_update.php b/app/Template/event/subtask_update.php
index 19fe2e56..11a778de 100644
--- a/app/Template/event/subtask_update.php
+++ b/app/Template/event/subtask_update.php
@@ -1,9 +1,9 @@
-<?= $this->avatar($email, $author) ?>
+<?= $this->user->avatar($email, $author) ?>
 
 <p class="activity-title">
     <?= e('%s updated a subtask for the task %s',
             $this->e($author),
-            $this->a(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
+            $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
         ) ?>
 </p>
 <div class="activity-description">
diff --git a/app/Template/event/task_assignee_change.php b/app/Template/event/task_assignee_change.php
index 38e2bca7..cdec8743 100644
--- a/app/Template/event/task_assignee_change.php
+++ b/app/Template/event/task_assignee_change.php
@@ -1,4 +1,4 @@
-<?= $this->avatar($email, $author) ?>
+<?= $this->user->avatar($email, $author) ?>
 
 <p class="activity-title">
     <?php $assignee = $task['assignee_name'] ?: $task['assignee_username'] ?>
@@ -6,11 +6,11 @@
     <?php if (! empty($assignee)): ?>
         <?= e('%s changed the assignee of the task %s to %s',
                 $this->e($author),
-                $this->a(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])),
+                $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])),
                 $this->e($assignee)
             ) ?>
     <?php else: ?>
-        <?= e('%s remove the assignee of the task %s', $this->e($author), $this->a(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->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">
diff --git a/app/Template/event/task_close.php b/app/Template/event/task_close.php
index afedbef3..3d8670a6 100644
--- a/app/Template/event/task_close.php
+++ b/app/Template/event/task_close.php
@@ -1,9 +1,9 @@
-<?= $this->avatar($email, $author) ?>
+<?= $this->user->avatar($email, $author) ?>
 
 <p class="activity-title">
     <?= e('%s closed the task %s',
             $this->e($author),
-            $this->a(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
+            $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
         ) ?>
 </p>
 <p class="activity-description">
diff --git a/app/Template/event/task_create.php b/app/Template/event/task_create.php
index 4b920234..773f401c 100644
--- a/app/Template/event/task_create.php
+++ b/app/Template/event/task_create.php
@@ -1,9 +1,9 @@
-<?= $this->avatar($email, $author) ?>
+<?= $this->user->avatar($email, $author) ?>
 
 <p class="activity-title">
     <?= e('%s created the task %s',
             $this->e($author),
-            $this->a(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
+            $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
         ) ?>
 </p>
 <p class="activity-description">
diff --git a/app/Template/event/task_move_column.php b/app/Template/event/task_move_column.php
index e97a3ab7..ca482e46 100644
--- a/app/Template/event/task_move_column.php
+++ b/app/Template/event/task_move_column.php
@@ -1,9 +1,9 @@
-<?= $this->avatar($email, $author) ?>
+<?= $this->user->avatar($email, $author) ?>
 
 <p class="activity-title">
     <?= e('%s moved the task %s to the column "%s"',
             $this->e($author),
-            $this->a(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])),
+            $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])),
             $this->e($task['column_title'])
         ) ?>
 </p>
diff --git a/app/Template/event/task_move_position.php b/app/Template/event/task_move_position.php
index 2ed4ffe8..dcdd3e1b 100644
--- a/app/Template/event/task_move_position.php
+++ b/app/Template/event/task_move_position.php
@@ -1,9 +1,9 @@
-<?= $this->avatar($email, $author) ?>
+<?= $this->user->avatar($email, $author) ?>
 
 <p class="activity-title">
     <?= e('%s moved the task %s to the position #%d in the column "%s"',
             $this->e($author),
-            $this->a(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])),
+            $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'])
         ) ?>
diff --git a/app/Template/event/task_open.php b/app/Template/event/task_open.php
index 9a408449..11fec64b 100644
--- a/app/Template/event/task_open.php
+++ b/app/Template/event/task_open.php
@@ -1,9 +1,9 @@
-<?= $this->avatar($email, $author) ?>
+<?= $this->user->avatar($email, $author) ?>
 
 <p class="activity-title">
     <?= e('%s opened the task %s',
             $this->e($author),
-            $this->a(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
+            $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
         ) ?>
 </p>
 <p class="activity-description">
diff --git a/app/Template/event/task_update.php b/app/Template/event/task_update.php
index 0f81870b..7d036d43 100644
--- a/app/Template/event/task_update.php
+++ b/app/Template/event/task_update.php
@@ -1,9 +1,9 @@
-<?= $this->avatar($email, $author) ?>
+<?= $this->user->avatar($email, $author) ?>
 
 <p class="activity-title">
     <?= e('%s updated the task %s',
             $this->e($author),
-            $this->a(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
+            $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
         ) ?>
 </p>
 <p class="activity-description">