From 34d7450d3c13342715e90ec21bceaa13e1baa876 Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fred@kanboard.net>
Date: Sun, 28 Dec 2014 11:28:50 -0500
Subject: Template helpers refactoring

---
 app/Template/category/edit.php   | 12 ++++++------
 app/Template/category/index.php  | 16 ++++++++--------
 app/Template/category/remove.php |  4 ++--
 3 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'app/Template/category')

diff --git a/app/Template/category/edit.php b/app/Template/category/edit.php
index 66cf429b..bec175d5 100644
--- a/app/Template/category/edit.php
+++ b/app/Template/category/edit.php
@@ -2,15 +2,15 @@
     <h2><?= t('Category modification for the project "%s"', $project['name']) ?></h2>
 </div>
 
-<form method="post" action="<?= Helper\u('category', 'update', array('project_id' => $project['id'], 'category_id' => $values['id'])) ?>" autocomplete="off">
+<form method="post" action="<?= $this->u('category', 'update', array('project_id' => $project['id'], 'category_id' => $values['id'])) ?>" autocomplete="off">
 
-    <?= Helper\form_csrf() ?>
+    <?= $this->formCsrf() ?>
 
-    <?= Helper\form_hidden('id', $values) ?>
-    <?= Helper\form_hidden('project_id', $values) ?>
+    <?= $this->formHidden('id', $values) ?>
+    <?= $this->formHidden('project_id', $values) ?>
 
-    <?= Helper\form_label(t('Category Name'), 'name') ?>
-    <?= Helper\form_text('name', $values, $errors, array('autofocus required')) ?>
+    <?= $this->formLabel(t('Category Name'), 'name') ?>
+    <?= $this->formText('name', $values, $errors, array('autofocus required')) ?>
 
     <div class="form-actions">
         <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
diff --git a/app/Template/category/index.php b/app/Template/category/index.php
index bd275a67..f876275f 100644
--- a/app/Template/category/index.php
+++ b/app/Template/category/index.php
@@ -9,14 +9,14 @@
     </tr>
     <?php foreach ($categories as $category_id => $category_name): ?>
     <tr>
-        <td><?= Helper\escape($category_name) ?></td>
+        <td><?= $this->e($category_name) ?></td>
         <td>
             <ul>
                 <li>
-                    <?= Helper\a(t('Edit'), 'category', 'edit', array('project_id' => $project['id'], 'category_id' => $category_id)) ?>
+                    <?= $this->a(t('Edit'), 'category', 'edit', array('project_id' => $project['id'], 'category_id' => $category_id)) ?>
                 </li>
                 <li>
-                    <?= Helper\a(t('Remove'), 'category', 'confirm', array('project_id' => $project['id'], 'category_id' => $category_id)) ?>
+                    <?= $this->a(t('Remove'), 'category', 'confirm', array('project_id' => $project['id'], 'category_id' => $category_id)) ?>
                 </li>
             </ul>
         </td>
@@ -28,13 +28,13 @@
 <div class="page-header">
     <h2><?= t('Add a new category') ?></h2>
 </div>
-<form method="post" action="<?= Helper\u('category', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off">
+<form method="post" action="<?= $this->u('category', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off">
 
-    <?= Helper\form_csrf() ?>
-    <?= Helper\form_hidden('project_id', $values) ?>
+    <?= $this->formCsrf() ?>
+    <?= $this->formHidden('project_id', $values) ?>
 
-    <?= Helper\form_label(t('Category Name'), 'name') ?>
-    <?= Helper\form_text('name', $values, $errors, array('autofocus required')) ?>
+    <?= $this->formLabel(t('Category Name'), 'name') ?>
+    <?= $this->formText('name', $values, $errors, array('autofocus required')) ?>
 
     <div class="form-actions">
         <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
diff --git a/app/Template/category/remove.php b/app/Template/category/remove.php
index 39e5c1db..8875b232 100644
--- a/app/Template/category/remove.php
+++ b/app/Template/category/remove.php
@@ -9,9 +9,9 @@
         </p>
 
         <div class="form-actions">
-            <?= Helper\a(t('Yes'), 'category', 'remove', array('project_id' => $project['id'], 'category_id' => $category['id']), true, 'btn btn-red') ?>
+            <?= $this->a(t('Yes'), 'category', 'remove', array('project_id' => $project['id'], 'category_id' => $category['id']), true, 'btn btn-red') ?>
             <?= t('or') ?>
-            <?= Helper\a(t('cancel'), 'category', 'index', array('project_id' => $project['id'])) ?>
+            <?= $this->a(t('cancel'), 'category', 'index', array('project_id' => $project['id'])) ?>
         </div>
     </div>
 </section>
\ No newline at end of file
-- 
cgit v1.2.3