From 17213da5ce60a3da19789cff14544d0a79ee2df1 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Fri, 24 Jun 2016 17:57:26 -0400
Subject: Use the same task form layout everywhere

---
 app/Template/task_modification/edit_task.php | 41 ++++++++++++++++------------
 1 file changed, 23 insertions(+), 18 deletions(-)

(limited to 'app/Template/task_modification')

diff --git a/app/Template/task_modification/edit_task.php b/app/Template/task_modification/edit_task.php
index d8f18743..d747407e 100644
--- a/app/Template/task_modification/edit_task.php
+++ b/app/Template/task_modification/edit_task.php
@@ -6,28 +6,33 @@
     <?= $this->form->hidden('id', $values) ?>
     <?= $this->form->hidden('project_id', $values) ?>
 
-    <div class="form-column">
-        <?= $this->task->selectTitle($values, $errors) ?>
-        <?= $this->task->selectTags($project, $tags) ?>
-        <?= $this->task->selectAssignee($users_list, $values, $errors) ?>
-        <?= $this->task->selectCategory($categories_list, $values, $errors) ?>
-        <?= $this->task->selectPriority($project, $values) ?>
-        <?= $this->task->selectScore($values, $errors) ?>
+    <div class="form-columns">
+        <div class="form-column">
+            <?= $this->task->selectTitle($values, $errors) ?>
+            <?= $this->task->selectDescription($values, $errors) ?>
+            <?= $this->task->selectTags($project, $tags) ?>
 
-        <?= $this->hook->render('template:task:form:left-column', array('values' => $values, 'errors' => $errors)) ?>
-    </div>
+            <?= $this->hook->render('template:task:form:first-column', array('values' => $values, 'errors' => $errors)) ?>
+        </div>
 
-    <div class="form-column">
-        <?= $this->task->selectTimeEstimated($values, $errors) ?>
-        <?= $this->task->selectTimeSpent($values, $errors) ?>
-        <?= $this->task->selectStartDate($values, $errors) ?>
-        <?= $this->task->selectDueDate($values, $errors) ?>
+        <div class="form-column">
+            <?= $this->task->selectColor($values) ?>
+            <?= $this->task->selectAssignee($users_list, $values, $errors) ?>
+            <?= $this->task->selectCategory($categories_list, $values, $errors) ?>
+            <?= $this->task->selectPriority($project, $values) ?>
+            <?= $this->task->selectScore($values, $errors) ?>
 
-        <?= $this->hook->render('template:task:form:right-column', array('values' => $values, 'errors' => $errors)) ?>
-    </div>
+            <?= $this->hook->render('template:task:form:second-column', array('values' => $values, 'errors' => $errors)) ?>
+        </div>
+
+        <div class="form-column">
+            <?= $this->task->selectTimeEstimated($values, $errors) ?>
+            <?= $this->task->selectTimeSpent($values, $errors) ?>
+            <?= $this->task->selectStartDate($values, $errors) ?>
+            <?= $this->task->selectDueDate($values, $errors) ?>
 
-    <div class="form-clear">
-        <?= $this->render('task/color_picker', array('colors_list' => $colors_list, 'values' => $values)) ?>
+            <?= $this->hook->render('template:task:form:third-column', array('values' => $values, 'errors' => $errors)) ?>
+        </div>
     </div>
 
     <div class="form-actions">
-- 
cgit v1.2.3