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/task/edit_recurrence.php | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'app/Template/task/edit_recurrence.php')

diff --git a/app/Template/task/edit_recurrence.php b/app/Template/task/edit_recurrence.php
index 76894bd4..c261e368 100644
--- a/app/Template/task/edit_recurrence.php
+++ b/app/Template/task/edit_recurrence.php
@@ -15,36 +15,36 @@
 
 <?php if ($task['recurrence_status'] != \Model\Task::RECURRING_STATUS_PROCESSED): ?>
 
-    <form method="post" action="<?= $this->u('task', 'recurrence', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'ajax' => $ajax)) ?>" autocomplete="off">
+    <form method="post" action="<?= $this->url->href('task', 'recurrence', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'ajax' => $ajax)) ?>" autocomplete="off">
 
-        <?= $this->formCsrf() ?>
+        <?= $this->form->csrf() ?>
 
-        <?= $this->formHidden('id', $values) ?>
-        <?= $this->formHidden('project_id', $values) ?>
+        <?= $this->form->hidden('id', $values) ?>
+        <?= $this->form->hidden('project_id', $values) ?>
 
-        <?= $this->formLabel(t('Generate recurrent task'), 'recurrence_status') ?>
-        <?= $this->formSelect('recurrence_status', $recurrence_status_list, $values, $errors) ?>
+        <?= $this->form->label(t('Generate recurrent task'), 'recurrence_status') ?>
+        <?= $this->form->select('recurrence_status', $recurrence_status_list, $values, $errors) ?>
 
-        <?= $this->formLabel(t('Trigger to generate recurrent task'), 'recurrence_trigger') ?>
-        <?= $this->formSelect('recurrence_trigger', $recurrence_trigger_list, $values, $errors) ?>
+        <?= $this->form->label(t('Trigger to generate recurrent task'), 'recurrence_trigger') ?>
+        <?= $this->form->select('recurrence_trigger', $recurrence_trigger_list, $values, $errors) ?>
 
-        <?= $this->formLabel(t('Factor to calculate new due date'), 'recurrence_factor') ?>
-        <?= $this->formNumber('recurrence_factor', $values, $errors) ?>
+        <?= $this->form->label(t('Factor to calculate new due date'), 'recurrence_factor') ?>
+        <?= $this->form->number('recurrence_factor', $values, $errors) ?>
 
-        <?= $this->formLabel(t('Timeframe to calculate new due date'), 'recurrence_timeframe') ?>
-        <?= $this->formSelect('recurrence_timeframe', $recurrence_timeframe_list, $values, $errors) ?>
+        <?= $this->form->label(t('Timeframe to calculate new due date'), 'recurrence_timeframe') ?>
+        <?= $this->form->select('recurrence_timeframe', $recurrence_timeframe_list, $values, $errors) ?>
 
-        <?= $this->formLabel(t('Base date to calculate new due date'), 'recurrence_basedate') ?>
-        <?= $this->formSelect('recurrence_basedate', $recurrence_basedate_list, $values, $errors) ?>
+        <?= $this->form->label(t('Base date to calculate new due date'), 'recurrence_basedate') ?>
+        <?= $this->form->select('recurrence_basedate', $recurrence_basedate_list, $values, $errors) ?>
 
         <div class="form-actions">
             <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
             <?= t('or') ?>
 
             <?php if ($ajax): ?>
-                <?= $this->a(t('cancel'), 'board', 'show', array('project_id' => $task['project_id'])) ?>
+                <?= $this->url->link(t('cancel'), 'board', 'show', array('project_id' => $task['project_id'])) ?>
             <?php else: ?>
-                <?= $this->a(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+                <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
             <?php endif ?>
         </div>
     </form>
-- 
cgit v1.2.3