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/board/table_column.php           |  8 ++++----
 app/Template/board/table_swimlane.php         |  2 +-
 app/Template/board/table_tasks.php            |  2 +-
 app/Template/board/task_footer.php            |  8 ++++----
 app/Template/board/task_private.php           | 10 +++++-----
 app/Template/board/task_public.php            |  2 +-
 app/Template/board/tooltip_comments.php       |  2 +-
 app/Template/board/tooltip_external_links.php |  4 ++--
 app/Template/board/tooltip_files.php          |  2 +-
 app/Template/board/tooltip_subtasks.php       |  2 +-
 app/Template/board/tooltip_tasklinks.php      |  4 ++--
 11 files changed, 23 insertions(+), 23 deletions(-)

(limited to 'app/Template/board')

diff --git a/app/Template/board/table_column.php b/app/Template/board/table_column.php
index 58dcaf32..48538c88 100644
--- a/app/Template/board/table_column.php
+++ b/app/Template/board/table_column.php
@@ -26,10 +26,10 @@
 
             <span class="board-column-title">
                 <?php if ($not_editable): ?>
-                    <?= $this->e($column['title']) ?>
+                    <?= $this->text->e($column['title']) ?>
                 <?php else: ?>
                     <span class="dropdown">
-                        <a href="#" class="dropdown-menu"><?= $this->e($column['title']) ?> <i class="fa fa-caret-down"></i></a>
+                        <a href="#" class="dropdown-menu"><?= $this->text->e($column['title']) ?> <i class="fa fa-caret-down"></i></a>
                         <ul>
                             <li>
                                 <i class="fa fa-minus-square fa-fw"></i>
@@ -47,7 +47,7 @@
             </span>
 
             <?php if (! $not_editable && ! empty($column['description'])): ?>
-                <span class="tooltip pull-right" title='<?= $this->e($this->text->markdown($column['description'])) ?>'>
+                <span class="tooltip pull-right" title='<?= $this->text->e($this->text->markdown($column['description'])) ?>'>
                     &nbsp;<i class="fa fa-info-circle"></i>
                 </span>
             <?php endif ?>
@@ -60,7 +60,7 @@
 
             <?php if ($column['task_limit']): ?>
                 <span title="<?= t('Task limit') ?>">
-                    (<span id="task-number-column-<?= $column['id'] ?>"><?= $column['nb_tasks'] ?></span>/<?= $this->e($column['task_limit']) ?>)
+                    (<span id="task-number-column-<?= $column['id'] ?>"><?= $column['nb_tasks'] ?></span>/<?= $this->text->e($column['task_limit']) ?>)
                 </span>
             <?php else: ?>
                 <span title="<?= t('Task count') ?>" class="board-column-header-task-count">
diff --git a/app/Template/board/table_swimlane.php b/app/Template/board/table_swimlane.php
index 44607859..349b9acb 100644
--- a/app/Template/board/table_swimlane.php
+++ b/app/Template/board/table_swimlane.php
@@ -8,7 +8,7 @@
             </a>
         <?php endif ?>
 
-        <?= $this->e($swimlane['name']) ?>
+        <?= $this->text->e($swimlane['name']) ?>
 
         <?php if (! $not_editable && ! empty($swimlane['description'])): ?>
             <span
diff --git a/app/Template/board/table_tasks.php b/app/Template/board/table_tasks.php
index e99e14fb..fd9ce5e7 100644
--- a/app/Template/board/table_tasks.php
+++ b/app/Template/board/table_tasks.php
@@ -22,7 +22,7 @@
             <div class="board-column-collapsed">
                 <div class="board-rotation-wrapper">
                     <div class="board-column-title board-rotation board-toggle-column-view" data-column-id="<?= $column['id'] ?>" title="<?= t('Show this column') ?>">
-                        <i class="fa fa-plus-square tooltip" title="<?= $this->e($column['title']) ?>"></i> <?= $this->e($column['title']) ?>
+                        <i class="fa fa-plus-square tooltip" title="<?= $this->text->e($column['title']) ?>"></i> <?= $this->text->e($column['title']) ?>
                     </div>
                 </div>
             </div>
diff --git a/app/Template/board/task_footer.php b/app/Template/board/task_footer.php
index 73e68602..d8b21a5b 100644
--- a/app/Template/board/task_footer.php
+++ b/app/Template/board/task_footer.php
@@ -2,10 +2,10 @@
 <div class="task-board-category-container">
     <span class="task-board-category">
         <?php if ($not_editable): ?>
-            <?= $this->e($task['category_name']) ?>
+            <?= $this->text->e($task['category_name']) ?>
         <?php else: ?>
             <?= $this->url->link(
-                $this->e($task['category_name']),
+                $this->text->e($task['category_name']),
                 'boardPopover',
                 'changeCategory',
                 array('task_id' => $task['id'], 'project_id' => $task['project_id']),
@@ -61,11 +61,11 @@
     <?php endif ?>
 
     <?php if ($task['score']): ?>
-        <span class="task-score"><?= $this->e($task['score']) ?></span>
+        <span class="task-score"><?= $this->text->e($task['score']) ?></span>
     <?php endif ?>
 
     <?php if (! empty($task['time_estimated'])): ?>
-        <span class="task-time-estimated" title="<?= t('Time estimated') ?>"><?= $this->e($task['time_estimated']).'h' ?></span>
+        <span class="task-time-estimated" title="<?= t('Time estimated') ?>"><?= $this->text->e($task['time_estimated']).'h' ?></span>
     <?php endif ?>
 
     <?php if ($task['is_milestone'] == 1): ?>
diff --git a/app/Template/board/task_private.php b/app/Template/board/task_private.php
index 4880af00..50efe2f6 100644
--- a/app/Template/board/task_private.php
+++ b/app/Template/board/task_private.php
@@ -23,11 +23,11 @@
             <?php endif ?>
 
             <?php if (! empty($task['assignee_username'])): ?>
-                <span title="<?= $this->e($task['assignee_name'] ?: $task['assignee_username']) ?>">
-                    <?= $this->e($this->user->getInitials($task['assignee_name'] ?: $task['assignee_username'])) ?>
+                <span title="<?= $this->text->e($task['assignee_name'] ?: $task['assignee_username']) ?>">
+                    <?= $this->text->e($this->user->getInitials($task['assignee_name'] ?: $task['assignee_username'])) ?>
                 </span> -
             <?php endif ?>
-            <?= $this->url->link($this->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-collapsed-title tooltip', $this->e($task['title'])) ?>
+            <?= $this->url->link($this->text->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-collapsed-title tooltip', $this->text->e($task['title'])) ?>
         </div>
     <?php else: ?>
         <div class="task-board-expanded">
@@ -57,7 +57,7 @@
                         t('Change assignee')
                     ) ?>
                 <?php else: ?>
-                    <?= $this->e($task['assignee_name'] ?: $task['assignee_username']) ?>
+                    <?= $this->text->e($task['assignee_name'] ?: $task['assignee_username']) ?>
                 <?php endif ?>
             </span>
             <?php endif ?>
@@ -72,7 +72,7 @@
             <?php endif ?>
 
             <div class="task-board-title">
-                <?= $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')) ?>
             </div>
 
             <?= $this->render('board/task_footer', array(
diff --git a/app/Template/board/task_public.php b/app/Template/board/task_public.php
index d02722bb..9058f897 100644
--- a/app/Template/board/task_public.php
+++ b/app/Template/board/task_public.php
@@ -19,7 +19,7 @@
     </span>
 
     <div class="task-board-title">
-        <?= $this->url->link($this->e($task['title']), 'task', 'readonly', array('task_id' => $task['id'], 'token' => $project['token'])) ?>
+        <?= $this->url->link($this->text->e($task['title']), 'task', 'readonly', array('task_id' => $task['id'], 'token' => $project['token'])) ?>
     </div>
 
     <?= $this->render('board/task_footer', array(
diff --git a/app/Template/board/tooltip_comments.php b/app/Template/board/tooltip_comments.php
index ca91e13f..6665bc7d 100644
--- a/app/Template/board/tooltip_comments.php
+++ b/app/Template/board/tooltip_comments.php
@@ -2,7 +2,7 @@
     <?php foreach ($comments as $comment): ?>
         <p class="comment-title">
             <?php if (! empty($comment['username'])): ?>
-                <span class="comment-username"><?= $this->e($comment['name'] ?: $comment['username']) ?></span> @
+                <span class="comment-username"><?= $this->text->e($comment['name'] ?: $comment['username']) ?></span> @
             <?php endif ?>
             <span class="comment-date"><?= $this->dt->datetime($comment['date_creation']) ?></span>
         </p>
diff --git a/app/Template/board/tooltip_external_links.php b/app/Template/board/tooltip_external_links.php
index 7681c06c..24cd1d88 100644
--- a/app/Template/board/tooltip_external_links.php
+++ b/app/Template/board/tooltip_external_links.php
@@ -10,10 +10,10 @@
                 <?= $link['type'] ?>
             </td>
             <td>
-                <a href="<?= $link['url'] ?>" target="_blank"><?= $this->e($link['title']) ?></a>
+                <a href="<?= $link['url'] ?>" target="_blank"><?= $this->text->e($link['title']) ?></a>
             </td>
             <td>
-                <?= $this->e($link['dependency_label']) ?>
+                <?= $this->text->e($link['dependency_label']) ?>
             </td>
         </tr>
     <?php endforeach ?>
diff --git a/app/Template/board/tooltip_files.php b/app/Template/board/tooltip_files.php
index 4fa14b57..39823757 100644
--- a/app/Template/board/tooltip_files.php
+++ b/app/Template/board/tooltip_files.php
@@ -3,7 +3,7 @@
     <tr>
         <th>
             <i class="fa <?= $this->file->icon($file['name']) ?> fa-fw"></i>
-            <?= $this->e($file['name']) ?>
+            <?= $this->text->e($file['name']) ?>
         </th>
     </tr>
     <tr>
diff --git a/app/Template/board/tooltip_subtasks.php b/app/Template/board/tooltip_subtasks.php
index dc076d26..126a319f 100644
--- a/app/Template/board/tooltip_subtasks.php
+++ b/app/Template/board/tooltip_subtasks.php
@@ -6,7 +6,7 @@
         </td>
         <td>
             <?php if (! empty($subtask['username'])): ?>
-                    <?= $this->e($subtask['name'] ?: $subtask['username']) ?>
+                    <?= $this->text->e($subtask['name'] ?: $subtask['username']) ?>
             <?php endif ?>
         </td>
     </tr>
diff --git a/app/Template/board/tooltip_tasklinks.php b/app/Template/board/tooltip_tasklinks.php
index b51f90ed..cabe43d8 100644
--- a/app/Template/board/tooltip_tasklinks.php
+++ b/app/Template/board/tooltip_tasklinks.php
@@ -6,13 +6,13 @@
             <dd>
                 <span class="progress"><?= $this->task->getProgress($link).'%' ?></span>
                 <?= $this->url->link(
-                    $this->e('#'.$link['task_id'].' '.$link['title']),
+                    $this->text->e('#'.$link['task_id'].' '.$link['title']),
                     'task', 'show', array('task_id' => $link['task_id'], 'project_id' => $link['project_id']),
                     false,
                     $link['is_active'] ? '' : 'task-link-closed'
                 ) ?>
                 <?php if (! empty($link['task_assignee_username'])): ?>
-                    [<?= $this->e($link['task_assignee_name'] ?: $link['task_assignee_username']) ?>]
+                    [<?= $this->text->e($link['task_assignee_name'] ?: $link['task_assignee_username']) ?>]
                 <?php endif ?>
                 <?php if ($task['project_id'] != $link['project_id']): ?>
                     (<i><?= $link['project_name'] ?></i>)
-- 
cgit v1.2.3