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/analytic/avg_time_columns.php |  2 +-
 app/Template/analytic/compare_hours.php    | 12 ++++++------
 app/Template/analytic/tasks.php            |  2 +-
 app/Template/analytic/users.php            |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'app/Template/analytic')

diff --git a/app/Template/analytic/avg_time_columns.php b/app/Template/analytic/avg_time_columns.php
index 7b9d7cf9..5f6c6b35 100644
--- a/app/Template/analytic/avg_time_columns.php
+++ b/app/Template/analytic/avg_time_columns.php
@@ -16,7 +16,7 @@
         </tr>
         <?php foreach ($metrics as $column): ?>
         <tr>
-            <td><?= $this->e($column['title']) ?></td>
+            <td><?= $this->text->e($column['title']) ?></td>
             <td><?= $this->dt->duration($column['average']) ?></td>
         </tr>
         <?php endforeach ?>
diff --git a/app/Template/analytic/compare_hours.php b/app/Template/analytic/compare_hours.php
index bb145d61..8249e7ba 100644
--- a/app/Template/analytic/compare_hours.php
+++ b/app/Template/analytic/compare_hours.php
@@ -4,8 +4,8 @@
 
 <div class="listing">
     <ul>
-        <li><?= t('Estimated hours: ').'<strong>'.$this->e($metrics['open']['time_estimated'] + $metrics['closed']['time_estimated']) ?></strong></li>
-        <li><?= t('Actual hours: ').'<strong>'.$this->e($metrics['open']['time_spent'] + $metrics['closed']['time_spent']) ?></strong></li>
+        <li><?= t('Estimated hours: ').'<strong>'.$this->text->e($metrics['open']['time_estimated'] + $metrics['closed']['time_estimated']) ?></strong></li>
+        <li><?= t('Actual hours: ').'<strong>'.$this->text->e($metrics['open']['time_spent'] + $metrics['closed']['time_spent']) ?></strong></li>
     </ul>
 </div>
 
@@ -34,10 +34,10 @@
             <?php foreach ($paginator->getCollection() as $task): ?>
             <tr>
                 <td class="task-table color-<?= $task['color_id'] ?>">
-                    <?= $this->url->link('#'.$this->e($task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
+                    <?= $this->url->link('#'.$this->text->e($task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
                 </td>
                 <td>
-                    <?= $this->url->link($this->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
+                    <?= $this->url->link($this->text->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
                 </td>
                 <td>
                     <?php if ($task['is_active'] == \Kanboard\Model\Task::STATUS_OPEN): ?>
@@ -47,10 +47,10 @@
                     <?php endif ?>
                 </td>
                 <td>
-                    <?= $this->e($task['time_estimated']) ?>
+                    <?= $this->text->e($task['time_estimated']) ?>
                 </td>
                 <td>
-                    <?= $this->e($task['time_spent']) ?>
+                    <?= $this->text->e($task['time_spent']) ?>
                 </td>
             </tr>
             <?php endforeach ?>
diff --git a/app/Template/analytic/tasks.php b/app/Template/analytic/tasks.php
index 7392ee56..9e7b1fd7 100644
--- a/app/Template/analytic/tasks.php
+++ b/app/Template/analytic/tasks.php
@@ -18,7 +18,7 @@
         <?php foreach ($metrics as $metric): ?>
         <tr>
             <td>
-                <?= $this->e($metric['column_title']) ?>
+                <?= $this->text->e($metric['column_title']) ?>
             </td>
             <td>
                 <?= $metric['nb_tasks'] ?>
diff --git a/app/Template/analytic/users.php b/app/Template/analytic/users.php
index 514d7133..9d1d3a1e 100644
--- a/app/Template/analytic/users.php
+++ b/app/Template/analytic/users.php
@@ -18,7 +18,7 @@
         <?php foreach ($metrics as $metric): ?>
         <tr>
             <td>
-                <?= $this->e($metric['user']) ?>
+                <?= $this->text->e($metric['user']) ?>
             </td>
             <td>
                 <?= $metric['nb_tasks'] ?>
-- 
cgit v1.2.3