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/hourlyrate/index.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'app/Template/hourlyrate/index.php')

diff --git a/app/Template/hourlyrate/index.php b/app/Template/hourlyrate/index.php
index 9d0b77c8..af305d07 100644
--- a/app/Template/hourlyrate/index.php
+++ b/app/Template/hourlyrate/index.php
@@ -17,7 +17,7 @@
         <td><?= $rate['currency'] ?></td>
         <td><?= dt('%b %e, %Y', $rate['date_effective']) ?></td>
         <td>
-            <?= $this->a(t('Remove'), 'hourlyrate', 'confirm', array('user_id' => $user['id'], 'rate_id' => $rate['id'])) ?>
+            <?= $this->url->link(t('Remove'), 'hourlyrate', 'confirm', array('user_id' => $user['id'], 'rate_id' => $rate['id'])) ?>
         </td>
     </tr>
     <?php endforeach ?>
@@ -26,19 +26,19 @@
 <h3><?= t('Add new rate') ?></h3>
 <?php endif ?>
 
-<form method="post" action="<?= $this->u('hourlyrate', 'save', array('user_id' => $user['id'])) ?>" autocomplete="off">
+<form method="post" action="<?= $this->url->href('hourlyrate', 'save', array('user_id' => $user['id'])) ?>" autocomplete="off">
 
-    <?= $this->formHidden('user_id', $values) ?>
-    <?= $this->formCsrf() ?>
+    <?= $this->form->hidden('user_id', $values) ?>
+    <?= $this->form->csrf() ?>
 
-    <?= $this->formLabel(t('Hourly rate'), 'rate') ?>
-    <?= $this->formText('rate', $values, $errors, array('required'), 'form-numeric') ?>
+    <?= $this->form->label(t('Hourly rate'), 'rate') ?>
+    <?= $this->form->text('rate', $values, $errors, array('required'), 'form-numeric') ?>
 
-    <?= $this->formLabel(t('Currency'), 'currency') ?>
-    <?= $this->formSelect('currency', $currencies_list, $values, $errors, array('required')) ?>
+    <?= $this->form->label(t('Currency'), 'currency') ?>
+    <?= $this->form->select('currency', $currencies_list, $values, $errors, array('required')) ?>
 
-    <?= $this->formLabel(t('Effective date'), 'date_effective') ?>
-    <?= $this->formText('date_effective', $values, $errors, array('required'), 'form-date') ?>
+    <?= $this->form->label(t('Effective date'), 'date_effective') ?>
+    <?= $this->form->text('date_effective', $values, $errors, array('required'), 'form-date') ?>
 
     <div class="form-actions">
         <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
-- 
cgit v1.2.3