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/timetable_off/index.php  | 26 +++++++++++++-------------
 app/Template/timetable_off/remove.php |  4 ++--
 2 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'app/Template/timetable_off')

diff --git a/app/Template/timetable_off/index.php b/app/Template/timetable_off/index.php
index f35d331e..75e02dbd 100644
--- a/app/Template/timetable_off/index.php
+++ b/app/Template/timetable_off/index.php
@@ -21,7 +21,7 @@
         <td><?= $slot['end'] ?></td>
         <td><?= $this->e($slot['comment']) ?></td>
         <td>
-            <?= $this->a(t('Remove'), 'timetableoff', 'confirm', array('user_id' => $user['id'], 'slot_id' => $slot['id'])) ?>
+            <?= $this->url->link(t('Remove'), 'timetableoff', 'confirm', array('user_id' => $user['id'], 'slot_id' => $slot['id'])) ?>
         </td>
     </tr>
     <?php endforeach ?>
@@ -31,24 +31,24 @@
 
 <?php endif ?>
 
-<form method="post" action="<?= $this->u('timetableoff', 'save', array('user_id' => $user['id'])) ?>" autocomplete="off">
+<form method="post" action="<?= $this->url->href('timetableoff', '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('Day'), 'date') ?>
-    <?= $this->formText('date', $values, $errors, array('required'), 'form-date') ?>
+    <?= $this->form->label(t('Day'), 'date') ?>
+    <?= $this->form->text('date', $values, $errors, array('required'), 'form-date') ?>
 
-    <?= $this->formCheckbox('all_day', t('All day'), 1) ?>
+    <?= $this->form->checkbox('all_day', t('All day'), 1) ?>
 
-    <?= $this->formLabel(t('Start time'), 'start') ?>
-    <?= $this->formSelect('start', $this->getDayHours(), $values, $errors) ?>
+    <?= $this->form->label(t('Start time'), 'start') ?>
+    <?= $this->form->select('start', $this->datetime->getDayHours(), $values, $errors) ?>
 
-    <?= $this->formLabel(t('End time'), 'end') ?>
-    <?= $this->formSelect('end', $this->getDayHours(), $values, $errors) ?>
+    <?= $this->form->label(t('End time'), 'end') ?>
+    <?= $this->form->select('end', $this->datetime->getDayHours(), $values, $errors) ?>
 
-    <?= $this->formLabel(t('Comment'), 'comment') ?>
-    <?= $this->formText('comment', $values, $errors) ?>
+    <?= $this->form->label(t('Comment'), 'comment') ?>
+    <?= $this->form->text('comment', $values, $errors) ?>
 
     <div class="form-actions">
         <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
diff --git a/app/Template/timetable_off/remove.php b/app/Template/timetable_off/remove.php
index 64863781..621e191c 100644
--- a/app/Template/timetable_off/remove.php
+++ b/app/Template/timetable_off/remove.php
@@ -6,8 +6,8 @@
     <p class="alert alert-info"><?= t('Do you really want to remove this time slot?') ?></p>
 
     <div class="form-actions">
-        <?= $this->a(t('Yes'), 'timetableoff', 'remove', array('user_id' => $user['id'], 'slot_id' => $slot_id), true, 'btn btn-red') ?>
+        <?= $this->url->link(t('Yes'), 'timetableoff', 'remove', array('user_id' => $user['id'], 'slot_id' => $slot_id), true, 'btn btn-red') ?>
         <?= t('or') ?>
-        <?= $this->a(t('cancel'), 'timetableoff', 'index', array('user_id' => $user['id'])) ?>
+        <?= $this->url->link(t('cancel'), 'timetableoff', 'index', array('user_id' => $user['id'])) ?>
     </div>
 </div>
\ No newline at end of file
-- 
cgit v1.2.3