From a5337cfe5c688c8b7bc91135af47cbafe7c0527d Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fred@kanboard.net>
Date: Tue, 23 Sep 2014 20:16:07 +0200
Subject: Move task edit form to the task layout

---
 app/Templates/task_edit.php | 83 +++++++++++++++++++++------------------------
 1 file changed, 38 insertions(+), 45 deletions(-)

(limited to 'app/Templates')

diff --git a/app/Templates/task_edit.php b/app/Templates/task_edit.php
index 83a4ca17..4038717e 100644
--- a/app/Templates/task_edit.php
+++ b/app/Templates/task_edit.php
@@ -1,58 +1,51 @@
-<section id="main">
-    <div class="page-header">
-        <h2><?= t('Edit a task') ?></h2>
-        <?php if (! $ajax): ?>
-        <ul>
-            <li><a href="?controller=board&amp;action=show&amp;project_id=<?= $task['project_id'] ?>"><?= t('Back to the board') ?></a></li>
-        </ul>
-        <?php endif ?>
-    </div>
-    <section id="task-section">
-    <form method="post" action="?controller=task&amp;action=update&amp;task_id=<?= $task['id'] ?>&amp;ajax=<?= $ajax ?>" autocomplete="off">
+<div class="page-header">
+    <h2><?= t('Edit a task') ?></h2>
+</div>
+<section id="task-section">
+<form method="post" action="?controller=task&amp;action=update&amp;task_id=<?= $task['id'] ?>&amp;ajax=<?= $ajax ?>" autocomplete="off">
 
-        <?= Helper\form_csrf() ?>
+    <?= Helper\form_csrf() ?>
 
-        <div class="form-column">
+    <div class="form-column">
 
-            <?= Helper\form_label(t('Title'), 'title') ?>
-            <?= Helper\form_text('title', $values, $errors, array('required')) ?><br/>
+        <?= Helper\form_label(t('Title'), 'title') ?>
+        <?= Helper\form_text('title', $values, $errors, array('required')) ?><br/>
 
-            <?= Helper\form_label(t('Description'), 'description') ?>
-            <?= Helper\form_textarea('description', $values, $errors) ?><br/>
-            <div class="form-help"><a href="http://kanboard.net/documentation/syntax-guide" target="_blank" rel="noreferrer"><?= t('Write your text in Markdown') ?></a></div>
+        <?= Helper\form_label(t('Description'), 'description') ?>
+        <?= Helper\form_textarea('description', $values, $errors) ?><br/>
+        <div class="form-help"><a href="http://kanboard.net/documentation/syntax-guide" target="_blank" rel="noreferrer"><?= t('Write your text in Markdown') ?></a></div>
 
-        </div>
+    </div>
 
-        <div class="form-column">
-            <?= Helper\form_hidden('id', $values) ?>
-            <?= Helper\form_hidden('project_id', $values) ?>
+    <div class="form-column">
+        <?= Helper\form_hidden('id', $values) ?>
+        <?= Helper\form_hidden('project_id', $values) ?>
 
-            <?= Helper\form_label(t('Assignee'), 'owner_id') ?>
-            <?= Helper\form_select('owner_id', $users_list, $values, $errors) ?><br/>
+        <?= Helper\form_label(t('Assignee'), 'owner_id') ?>
+        <?= Helper\form_select('owner_id', $users_list, $values, $errors) ?><br/>
 
-            <?= Helper\form_label(t('Category'), 'category_id') ?>
-            <?= Helper\form_select('category_id', $categories_list, $values, $errors) ?><br/>
+        <?= Helper\form_label(t('Category'), 'category_id') ?>
+        <?= Helper\form_select('category_id', $categories_list, $values, $errors) ?><br/>
 
-            <?= Helper\form_label(t('Color'), 'color_id') ?>
-            <?= Helper\form_select('color_id', $colors_list, $values, $errors) ?><br/>
+        <?= Helper\form_label(t('Color'), 'color_id') ?>
+        <?= Helper\form_select('color_id', $colors_list, $values, $errors) ?><br/>
 
-            <?= Helper\form_label(t('Complexity'), 'score') ?>
-            <?= Helper\form_number('score', $values, $errors) ?><br/>
+        <?= Helper\form_label(t('Complexity'), 'score') ?>
+        <?= Helper\form_number('score', $values, $errors) ?><br/>
 
-            <?= Helper\form_label(t('Due Date'), 'date_due') ?>
-            <?= Helper\form_text('date_due', $values, $errors, array('placeholder="'.t('month/day/year').'"'), 'form-date') ?><br/>
-            <div class="form-help"><?= t('Others formats accepted: %s and %s', date('Y-m-d'), date('Y_m_d')) ?></div>
-        </div>
+        <?= Helper\form_label(t('Due Date'), 'date_due') ?>
+        <?= Helper\form_text('date_due', $values, $errors, array('placeholder="'.t('month/day/year').'"'), 'form-date') ?><br/>
+        <div class="form-help"><?= t('Others formats accepted: %s and %s', date('Y-m-d'), date('Y_m_d')) ?></div>
+    </div>
 
-        <div class="form-actions">
-            <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
-            <?= t('or') ?>
-            <?php if ($ajax): ?>
-                <a href="?controller=board&amp;action=show&amp;project_id=<?= $task['project_id'] ?>"><?= t('cancel') ?></a>
-            <?php else: ?>
-                <a href="?controller=task&amp;action=show&amp;task_id=<?= $task['id'] ?>"><?= t('cancel') ?></a>
-            <?php endif ?>
-        </div>
-    </form>
-    </section>
+    <div class="form-actions">
+        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
+        <?= t('or') ?>
+        <?php if ($ajax): ?>
+            <a href="?controller=board&amp;action=show&amp;project_id=<?= $task['project_id'] ?>"><?= t('cancel') ?></a>
+        <?php else: ?>
+            <a href="?controller=task&amp;action=show&amp;task_id=<?= $task['id'] ?>"><?= t('cancel') ?></a>
+        <?php endif ?>
+    </div>
+</form>
 </section>
-- 
cgit v1.2.3