Helpers refactoring

app/Template/comment/create.php

@@ -2,10 +2,10 @@
     <h2><?= t('Add a comment') ?></h2>
 </div>
 
-<form method="post" action="<?= $this->u('comment', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'ajax' => isset($ajax))) ?>" autocomplete="off" class="form-comment">
-    <?= $this->formCsrf() ?>
-    <?= $this->formHidden('task_id', $values) ?>
-    <?= $this->formHidden('user_id', $values) ?>
+<form method="post" action="<?= $this->url->href('comment', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'ajax' => isset($ajax))) ?>" autocomplete="off" class="form-comment">
+    <?= $this->form->csrf() ?>
+    <?= $this->form->hidden('task_id', $values) ?>
+    <?= $this->form->hidden('user_id', $values) ?>
 
     <div class="form-tabs">
         <ul class="form-tabs-nav">
@@ -17,7 +17,7 @@
             </li>
         </ul>
         <div class="write-area">
-            <?= $this->formTextarea('comment', $values, $errors, array(! isset($skip_cancel) ? 'autofocus' : '', 'required', 'placeholder="'.t('Leave a comment').'"'), 'comment-textarea') ?>
+            <?= $this->form->textarea('comment', $values, $errors, array(! isset($skip_cancel) ? 'autofocus' : '', 'required', 'placeholder="'.t('Leave a comment').'"'), 'comment-textarea') ?>
         </div>
         <div class="preview-area">
             <div class="markdown"></div>
@@ -31,9 +31,9 @@
         <?php if (! isset($skip_cancel)): ?>
             <?= t('or') ?>
             <?php if (isset($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 ?>
         <?php endif ?>
     </div>

app/Template/comment/edit.php

@@ -2,12 +2,12 @@
     <h2><?= t('Edit a comment') ?></h2>
 </div>
 
-<form method="post" action="<?= $this->u('comment', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id'])) ?>" autocomplete="off">
+<form method="post" action="<?= $this->url->href('comment', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id'])) ?>" autocomplete="off">
 
-    <?= $this->formCsrf() ?>
-    <?= $this->formHidden('id', $values) ?>
-    <?= $this->formHidden('task_id', $values) ?>
-    <?= $this->formHidden('user_id', $values) ?>
+    <?= $this->form->csrf() ?>
+    <?= $this->form->hidden('id', $values) ?>
+    <?= $this->form->hidden('task_id', $values) ?>
+    <?= $this->form->hidden('user_id', $values) ?>
 
     <div class="form-tabs">
         <ul class="form-tabs-nav">
@@ -19,7 +19,7 @@
             </li>
         </ul>
         <div class="write-area">
-            <?= $this->formTextarea('comment', $values, $errors, array('autofocus', 'required', 'placeholder="'.t('Leave a comment').'"'), 'comment-textarea') ?>
+            <?= $this->form->textarea('comment', $values, $errors, array('autofocus', 'required', 'placeholder="'.t('Leave a comment').'"'), 'comment-textarea') ?>
         </div>
         <div class="preview-area">
             <div class="markdown"></div>
@@ -31,6 +31,6 @@
     <div class="form-actions">
         <input type="submit" value="<?= t('Update') ?>" class="btn btn-blue"/>
         <?= t('or') ?>
-        <?= $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'])) ?>
     </div>
 </form>

app/Template/comment/remove.php

@@ -10,8 +10,8 @@
     <?= $this->render('comment/show', array('comment' => $comment, 'task' => $task, 'preview' => true)) ?>
 
     <div class="form-actions">
-        <?= $this->a(t('Yes'), 'comment', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id']), true, 'btn btn-red') ?>
+        <?= $this->url->link(t('Yes'), 'comment', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id']), true, 'btn btn-red') ?>
         <?= t('or') ?>
-        <?= $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'])) ?>
     </div>
 </div>

app/Template/comment/show.php

@@ -2,7 +2,7 @@
 
     <p class="comment-title">
         <?php if (! empty($comment['email'])): ?>
-            <?= $this->avatar($comment['email'], $comment['name'] ?: $comment['username']) ?>
+            <?= $this->user->avatar($comment['email'], $comment['name'] ?: $comment['username']) ?>
         <?php endif ?>
         <span class="comment-username"><?= $this->e($comment['name'] ?: $comment['username']) ?></span> @ <span class="comment-date"><?= dt('%B %e, %Y at %k:%M %p', $comment['date']) ?></span>
     </p>
@@ -11,12 +11,12 @@
         <?php if (! isset($preview)): ?>
         <ul class="comment-actions">
             <li><a href="#comment-<?= $comment['id'] ?>"><?= t('link') ?></a></li>
-            <?php if ((! isset($not_editable) || ! $not_editable) && ($this->userSession->isAdmin() || $this->userSession->isCurrentUser($comment['user_id']))): ?>
+            <?php if ((! isset($not_editable) || ! $not_editable) && ($this->user->isAdmin() || $this->user->isCurrentUser($comment['user_id']))): ?>
                 <li>
-                    <?= $this->a(t('remove'), 'comment', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id'])) ?>
+                    <?= $this->url->link(t('remove'), 'comment', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id'])) ?>
                 </li>
                 <li>
-                    <?= $this->a(t('edit'), 'comment', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id'])) ?>
+                    <?= $this->url->link(t('edit'), 'comment', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id'])) ?>
                 </li>
             <?php endif ?>
         </ul>
@@ -24,7 +24,7 @@
 
         <div class="markdown">
             <?php if (isset($is_public) && $is_public): ?>
-                <?= $this->markdown(
+                <?= $this->text->markdown(
                     $comment['comment'],
                     array(
                         'controller' => 'task',
@@ -35,7 +35,7 @@
                     )
                 ) ?>
             <?php else: ?>
-                <?= $this->markdown(
+                <?= $this->text->markdown(
                     $comment['comment'],
                     array(
                         'controller' => 'task',