From eeac2329baab1fdae7cbf6c707ed2ffd8beb4c1b Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sun, 24 May 2015 16:02:25 -0400
Subject: Helpers refactoring

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

(limited to 'app/Template/link')

diff --git a/app/Template/link/create.php b/app/Template/link/create.php
index 12589574..2b4ac62c 100644
--- a/app/Template/link/create.php
+++ b/app/Template/link/create.php
@@ -2,15 +2,15 @@
     <h2><?= t('Add a new link') ?></h2>
 </div>
 
-<form action="<?= $this->u('link', 'save') ?>" method="post" autocomplete="off">
+<form action="<?= $this->url->href('link', 'save') ?>" method="post" autocomplete="off">
 
-    <?= $this->formCsrf() ?>
+    <?= $this->form->csrf() ?>
 
-    <?= $this->formLabel(t('Label'), 'label') ?>
-    <?= $this->formText('label', $values, $errors, array('required')) ?>
+    <?= $this->form->label(t('Label'), 'label') ?>
+    <?= $this->form->text('label', $values, $errors, array('required')) ?>
 
-    <?= $this->formLabel(t('Opposite label'), 'opposite_label') ?>
-    <?= $this->formText('opposite_label', $values, $errors) ?>
+    <?= $this->form->label(t('Opposite label'), 'opposite_label') ?>
+    <?= $this->form->text('opposite_label', $values, $errors) ?>
 
     <div class="form-actions">
         <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
diff --git a/app/Template/link/edit.php b/app/Template/link/edit.php
index d9ce280c..516de464 100644
--- a/app/Template/link/edit.php
+++ b/app/Template/link/edit.php
@@ -2,20 +2,20 @@
     <h2><?= t('Link modification') ?></h2>
 </div>
 
-<form action="<?= $this->u('link', 'update', array('link_id' => $link['id'])) ?>" method="post" autocomplete="off">
+<form action="<?= $this->url->href('link', 'update', array('link_id' => $link['id'])) ?>" method="post" autocomplete="off">
 
-    <?= $this->formCsrf() ?>
-    <?= $this->formHidden('id', $values) ?>
+    <?= $this->form->csrf() ?>
+    <?= $this->form->hidden('id', $values) ?>
 
-    <?= $this->formLabel(t('Label'), 'label') ?>
-    <?= $this->formText('label', $values, $errors, array('required')) ?>
+    <?= $this->form->label(t('Label'), 'label') ?>
+    <?= $this->form->text('label', $values, $errors, array('required')) ?>
 
-    <?= $this->formLabel(t('Opposite label'), 'opposite_id') ?>
-    <?= $this->formSelect('opposite_id', $labels, $values, $errors) ?>
+    <?= $this->form->label(t('Opposite label'), 'opposite_id') ?>
+    <?= $this->form->select('opposite_id', $labels, $values, $errors) ?>
 
     <div class="form-actions">
         <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
         <?= t('or') ?>
-        <?= $this->a(t('cancel'), 'link', 'index') ?>
+        <?= $this->url->link(t('cancel'), 'link', 'index') ?>
     </div>
 </form>
\ No newline at end of file
diff --git a/app/Template/link/index.php b/app/Template/link/index.php
index 90d1c357..1475bd50 100644
--- a/app/Template/link/index.php
+++ b/app/Template/link/index.php
@@ -18,9 +18,9 @@
         </td>
         <td>
             <ul>
-                <?= $this->a(t('Edit'), 'link', 'edit', array('link_id' => $link['id'])) ?>
+                <?= $this->url->link(t('Edit'), 'link', 'edit', array('link_id' => $link['id'])) ?>
                 <?= t('or') ?>
-                <?= $this->a(t('Remove'), 'link', 'confirm', array('link_id' => $link['id'])) ?>
+                <?= $this->url->link(t('Remove'), 'link', 'confirm', array('link_id' => $link['id'])) ?>
             </ul>
         </td>
     </tr>
diff --git a/app/Template/link/remove.php b/app/Template/link/remove.php
index a802feb0..12ca14bb 100644
--- a/app/Template/link/remove.php
+++ b/app/Template/link/remove.php
@@ -8,8 +8,8 @@
     </p>
 
     <div class="form-actions">
-        <?= $this->a(t('Yes'), 'link', 'remove', array('link_id' => $link['id']), true, 'btn btn-red') ?>
+        <?= $this->url->link(t('Yes'), 'link', 'remove', array('link_id' => $link['id']), true, 'btn btn-red') ?>
         <?= t('or') ?>
-        <?= $this->a(t('cancel'), 'link', 'index') ?>
+        <?= $this->url->link(t('cancel'), 'link', 'index') ?>
     </div>
 </div>
\ No newline at end of file
-- 
cgit v1.2.3