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/task_file/remove.php | 2 +-
 app/Template/task_file/show.php   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'app/Template/task_file')

diff --git a/app/Template/task_file/remove.php b/app/Template/task_file/remove.php
index 5e6c83f2..fe601f6f 100644
--- a/app/Template/task_file/remove.php
+++ b/app/Template/task_file/remove.php
@@ -4,7 +4,7 @@
 
 <div class="confirm">
     <p class="alert alert-info">
-        <?= t('Do you really want to remove this file: "%s"?', $this->e($file['name'])) ?>
+        <?= t('Do you really want to remove this file: "%s"?', $this->text->e($file['name'])) ?>
     </p>
 
     <div class="form-actions">
diff --git a/app/Template/task_file/show.php b/app/Template/task_file/show.php
index c3f2bb98..21bf79ef 100644
--- a/app/Template/task_file/show.php
+++ b/app/Template/task_file/show.php
@@ -8,11 +8,11 @@
         <div class="file-thumbnails">
             <?php foreach ($images as $file): ?>
                 <div class="file-thumbnail">
-                    <a href="<?= $this->url->href('FileViewer', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>" class="popover"><img src="<?= $this->url->href('FileViewer', 'thumbnail', array('file_id' => $file['id'], 'project_id' => $task['project_id'], 'task_id' => $file['task_id'])) ?>" title="<?= $this->e($file['name']) ?>" alt="<?= $this->e($file['name']) ?>"></a>
+                    <a href="<?= $this->url->href('FileViewer', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>" class="popover"><img src="<?= $this->url->href('FileViewer', 'thumbnail', array('file_id' => $file['id'], 'project_id' => $task['project_id'], 'task_id' => $file['task_id'])) ?>" title="<?= $this->text->e($file['name']) ?>" alt="<?= $this->text->e($file['name']) ?>"></a>
                     <div class="file-thumbnail-content">
                         <div class="file-thumbnail-title">
                             <div class="dropdown">
-                            <a href="#" class="dropdown-menu dropdown-menu-link-text"><?= $this->e($file['name']) ?> <i class="fa fa-caret-down"></i></a>
+                            <a href="#" class="dropdown-menu dropdown-menu-link-text"><?= $this->text->e($file['name']) ?> <i class="fa fa-caret-down"></i></a>
                             <ul>
                                 <li>
                                     <i class="fa fa-download fa-fw"></i>
@@ -52,7 +52,7 @@
                     <td>
                         <i class="fa <?= $this->file->icon($file['name']) ?> fa-fw"></i>
                         <div class="dropdown">
-                            <a href="#" class="dropdown-menu dropdown-menu-link-text"><?= $this->e($file['name']) ?> <i class="fa fa-caret-down"></i></a>
+                            <a href="#" class="dropdown-menu dropdown-menu-link-text"><?= $this->text->e($file['name']) ?> <i class="fa fa-caret-down"></i></a>
                             <ul>
                                 <?php if ($this->file->getPreviewType($file['name']) !== null): ?>
                                 <li>
@@ -74,7 +74,7 @@
                         </div>
                     </td>
                     <td>
-                        <?= $this->e($file['user_name'] ?: $file['username']) ?>
+                        <?= $this->text->e($file['user_name'] ?: $file['username']) ?>
                     </td>
                     <td>
                         <?= $this->dt->date($file['date']) ?>
-- 
cgit v1.2.3