Use the same task form layout everywhere

11 files changed, 157 insertions, 132 deletions

diff --git a/app/Controller/TaskCreationController.php b/app/Controller/TaskCreationController.php
index 819de96e..073b31b0 100644
--- a/app/Controller/TaskCreationController.php
+++ b/app/Controller/TaskCreationController.php
@@ -41,7 +41,6 @@ class TaskCreationController extends BaseController
             'values' => $values + array('project_id' => $project['id']),
             'columns_list' => $this->columnModel->getList($project['id']),
             'users_list' => $this->projectUserRoleModel->getAssignableUsersList($project['id'], true, false, true),
-            'colors_list' => $this->colorModel->getList(),
             'categories_list' => $this->categoryModel->getList($project['id']),
             'swimlanes_list' => $swimlanes_list,
             'title' => $project['name'].' > '.t('New task')
diff --git a/app/Controller/TaskGanttCreationController.php b/app/Controller/TaskGanttCreationController.php
index c2998a3e..07b74a49 100644
--- a/app/Controller/TaskGanttCreationController.php
+++ b/app/Controller/TaskGanttCreationController.php
@@ -36,7 +36,6 @@ class TaskGanttCreationController extends BaseController
             'errors' => $errors,
             'values' => $values,
             'users_list' => $this->projectUserRoleModel->getAssignableUsersList($project['id'], true, false, true),
-            'colors_list' => $this->colorModel->getList(),
             'categories_list' => $this->categoryModel->getList($project['id']),
             'swimlanes_list' => $this->swimlaneModel->getList($project['id'], false, true),
             'title' => $project['name'].' > '.t('New task')
diff --git a/app/Controller/TaskModificationController.php b/app/Controller/TaskModificationController.php
index d55a7193..3c526b3b 100644
--- a/app/Controller/TaskModificationController.php
+++ b/app/Controller/TaskModificationController.php
@@ -100,7 +100,6 @@ class TaskModificationController extends BaseController
             'task' => $task,
             'tags' => $this->taskTagModel->getList($task['id']),
             'users_list' => $this->projectUserRoleModel->getAssignableUsersList($task['project_id']),
-            'colors_list' => $this->colorModel->getList(),
             'categories_list' => $this->categoryModel->getList($task['project_id']),
         )));
     }
diff --git a/app/Helper/TaskHelper.php b/app/Helper/TaskHelper.php
index f272059d..58e9ce4f 100644
--- a/app/Helper/TaskHelper.php
+++ b/app/Helper/TaskHelper.php
@@ -47,6 +47,24 @@ class TaskHelper extends Base
         return $html;
     }
 
+    public function selectDescription(array $values, array $errors)
+    {
+        $html = $this->helper->form->label(t('Description'), 'description');
+        $html .= $this->helper->form->textarea(
+            'description',
+            $values,
+            $errors,
+            array(
+                'placeholder="'.t('Leave a description').'"',
+                'tabindex="2"',
+                'data-mention-search-url="'.$this->helper->url->href('UserAjaxController', 'mention', array('project_id' => $values['project_id'])).'"'
+            ),
+            'markdown-editor'
+        );
+
+        return $html;
+    }
+
     public function selectTags(array $project, array $tags = array())
     {
         $options = $this->tagModel->getAssignableList($project['id']);
@@ -68,6 +86,14 @@ class TaskHelper extends Base
         return $html;
     }
 
+    public function selectColor(array $values)
+    {
+        $colors = $this->colorModel->getList();
+        $html = $this->helper->form->label(t('Color'), 'color_id');
+        $html .= $this->helper->form->select('color_id', $colors, $values, array(), array(), 'color-picker');
+        return $html;
+    }
+
     public function selectAssignee(array $users, array $values, array $errors = array(), array $attributes = array())
     {
         $attributes = array_merge(array('tabindex="3"'), $attributes);
diff --git a/app/Template/task/color_picker.php b/app/Template/task/color_picker.php
deleted file mode 100644
index 0c62fa70..00000000
--- a/app/Template/task/color_picker.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="color-picker">
-<?php foreach ($colors_list as $color_id => $color_name): ?>
-    <div
-        data-color-id="<?= $color_id ?>"
-        class="color-square color-<?= $color_id ?> <?= isset($values['color_id']) && $values['color_id'] === $color_id ? 'color-square-selected' : '' ?>"
-        title="<?= $this->text->e($color_name) ?>">
-    </div>
-<?php endforeach ?>
-</div>
-
-<?= $this->form->hidden('color_id', $values) ?>
\ No newline at end of file
diff --git a/app/Template/task_bulk/show.php b/app/Template/task_bulk/show.php
index 1391c2c1..e9b138d5 100644
--- a/app/Template/task_bulk/show.php
+++ b/app/Template/task_bulk/show.php
@@ -8,6 +8,7 @@
     <?= $this->form->hidden('swimlane_id', $values) ?>
     <?= $this->form->hidden('project_id', $values) ?>
 
+    <?= $this->task->selectColor($values) ?>
     <?= $this->task->selectAssignee($users_list, $values, $errors) ?>
     <?= $this->task->selectCategory($categories_list, $values, $errors) ?>
 
@@ -15,8 +16,6 @@
     <?= $this->form->textarea('tasks', $values, $errors, array('placeholder="'.t('My task title').'"')) ?>
     <p class="form-help"><?= t('Enter one task by line.') ?></p>
 
-    <?= $this->render('task/color_picker', array('colors_list' => $colors_list, 'values' => $values)) ?>
-
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
         <?= t('or') ?> <?= $this->url->link(t('cancel'), 'BoardViewController', 'show', array('project_id' => $project['id']), false, 'close-popover') ?>
diff --git a/app/Template/task_creation/show.php b/app/Template/task_creation/show.php
index cd752eba..f799919a 100644
--- a/app/Template/task_creation/show.php
+++ b/app/Template/task_creation/show.php
@@ -3,47 +3,42 @@
 </div>
 
 <form class="popover-form" method="post" action="<?= $this->url->href('TaskCreationController', 'save', array('project_id' => $values['project_id'])) ?>" autocomplete="off">
-
     <?= $this->form->csrf() ?>
 
-    <div class="form-column">
-        <?= $this->task->selectTitle($values, $errors) ?>
-
-        <?= $this->form->label(t('Description'), 'description') ?>
-        <?= $this->form->textarea(
-            'description',
-            $values,
-            $errors,
-            array(
-                'placeholder="'.t('Leave a description').'"',
-                'tabindex="2"',
-                'data-mention-search-url="'.$this->url->href('UserAjaxController', 'mention', array('project_id' => $values['project_id'])).'"'
-            ),
-            'markdown-editor'
-        ) ?>
-
-        <?= $this->task->selectTags($project) ?>
-        <?= $this->render('task/color_picker', array('colors_list' => $colors_list, 'values' => $values)) ?>
-
-        <?php if (! isset($duplicate)): ?>
-            <?= $this->form->checkbox('another_task', t('Create another task'), 1, isset($values['another_task']) && $values['another_task'] == 1) ?>
-        <?php endif ?>
-
-        <?= $this->hook->render('template:task:form:left-column', array('values' => $values, 'errors' => $errors)) ?>
-    </div>
-
-    <div class="form-column">
-        <?= $this->form->hidden('project_id', $values) ?>
-        <?= $this->task->selectAssignee($users_list, $values, $errors) ?>
-        <?= $this->task->selectCategory($categories_list, $values, $errors) ?>
-        <?= $this->task->selectSwimlane($swimlanes_list, $values, $errors) ?>
-        <?= $this->task->selectColumn($columns_list, $values, $errors) ?>
-        <?= $this->task->selectPriority($project, $values) ?>
-        <?= $this->task->selectScore($values, $errors) ?>
-        <?= $this->task->selectTimeEstimated($values, $errors) ?>
-        <?= $this->task->selectDueDate($values, $errors) ?>
-
-        <?= $this->hook->render('template:task:form:right-column', array('values' => $values, 'errors' => $errors)) ?>
+    <div class="form-columns">
+        <div class="form-column">
+            <?= $this->task->selectTitle($values, $errors) ?>
+            <?= $this->task->selectDescription($values, $errors) ?>
+            <?= $this->task->selectTags($project) ?>
+
+            <?php if (! isset($duplicate)): ?>
+                <?= $this->form->checkbox('another_task', t('Create another task'), 1, isset($values['another_task']) && $values['another_task'] == 1) ?>
+            <?php endif ?>
+
+            <?= $this->hook->render('template:task:form:first-column', array('values' => $values, 'errors' => $errors)) ?>
+        </div>
+
+        <div class="form-column">
+            <?= $this->form->hidden('project_id', $values) ?>
+            <?= $this->task->selectColor($values) ?>
+            <?= $this->task->selectAssignee($users_list, $values, $errors) ?>
+            <?= $this->task->selectCategory($categories_list, $values, $errors) ?>
+            <?= $this->task->selectSwimlane($swimlanes_list, $values, $errors) ?>
+            <?= $this->task->selectColumn($columns_list, $values, $errors) ?>
+            <?= $this->task->selectPriority($project, $values) ?>
+            <?= $this->task->selectScore($values, $errors) ?>
+
+            <?= $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) ?>
+
+            <?= $this->hook->render('template:task:form:third-column', array('values' => $values, 'errors' => $errors)) ?>
+        </div>
     </div>
 
     <div class="form-actions">
diff --git a/app/Template/task_gantt_creation/show.php b/app/Template/task_gantt_creation/show.php
index d1bfa67c..5e4286bd 100644
--- a/app/Template/task_gantt_creation/show.php
+++ b/app/Template/task_gantt_creation/show.php
@@ -7,23 +7,34 @@
     <?= $this->form->hidden('column_id', $values) ?>
     <?= $this->form->hidden('position', $values) ?>
 
-    <div class="form-column">
-        <?= $this->task->selectTitle($values, $errors) ?>
+    <div class="form-columns">
+        <div class="form-column">
+            <?= $this->task->selectTitle($values, $errors) ?>
+            <?= $this->task->selectDescription($values, $errors) ?>
+            <?= $this->task->selectTags($project) ?>
 
-        <?= $this->form->label(t('Description'), 'description') ?>
-        <?= $this->form->textarea('description', $values, $errors, array('placeholder="'.t('Leave a description').'"', 'tabindex="2"'), 'markdown-editor') ?>
-        <?= $this->task->selectTags($project) ?>
-        <?= $this->render('task/color_picker', array('colors_list' => $colors_list, 'values' => $values)) ?>
-    </div>
+            <?= $this->hook->render('template:task:form:first-column', array('values' => $values, 'errors' => $errors)) ?>
+        </div>
+
+        <div class="form-column">
+            <?= $this->task->selectColor($values) ?>
+            <?= $this->task->selectAssignee($users_list, $values, $errors) ?>
+            <?= $this->task->selectCategory($categories_list, $values, $errors) ?>
+            <?= $this->task->selectSwimlane($swimlanes_list, $values, $errors) ?>
+            <?= $this->task->selectPriority($project, $values) ?>
+            <?= $this->task->selectScore($values, $errors) ?>
+
+            <?= $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-column">
-        <?= $this->task->selectAssignee($users_list, $values, $errors) ?>
-        <?= $this->task->selectCategory($categories_list, $values, $errors) ?>
-        <?= $this->task->selectSwimlane($swimlanes_list, $values, $errors) ?>
-        <?= $this->task->selectPriority($project, $values) ?>
-        <?= $this->task->selectScore($values, $errors) ?>
-        <?= $this->task->selectStartDate($values, $errors) ?>
-        <?= $this->task->selectDueDate($values, $errors) ?>
+            <?= $this->hook->render('template:task:form:third-column', array('values' => $values, 'errors' => $errors)) ?>
+        </div>
     </div>
 
     <div class="form-actions">
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">
diff --git a/app/Template/user_creation/local.php b/app/Template/user_creation/local.php
index 4c224cec..059a0114 100644
--- a/app/Template/user_creation/local.php
+++ b/app/Template/user_creation/local.php
@@ -4,37 +4,39 @@
 <form class="popover-form" method="post" action="<?= $this->url->href('UserCreationController', 'save') ?>" autocomplete="off">
     <?= $this->form->csrf() ?>
 
-    <div class="form-column">
-        <?= $this->form->label(t('Username'), 'username') ?>
-        <?= $this->form->text('username', $values, $errors, array('autofocus', 'required', 'maxlength="50"')) ?>
+    <div class="form-columns">
+        <div class="form-column">
+            <?= $this->form->label(t('Username'), 'username') ?>
+            <?= $this->form->text('username', $values, $errors, array('autofocus', 'required', 'maxlength="50"')) ?>
 
-        <?= $this->form->label(t('Name'), 'name') ?>
-        <?= $this->form->text('name', $values, $errors) ?>
+            <?= $this->form->label(t('Name'), 'name') ?>
+            <?= $this->form->text('name', $values, $errors) ?>
 
-        <?= $this->form->label(t('Email'), 'email') ?>
-        <?= $this->form->email('email', $values, $errors) ?>
+            <?= $this->form->label(t('Email'), 'email') ?>
+            <?= $this->form->email('email', $values, $errors) ?>
 
-        <?= $this->form->label(t('Password'), 'password') ?>
-        <?= $this->form->password('password', $values, $errors, array('required')) ?>
+            <?= $this->form->label(t('Password'), 'password') ?>
+            <?= $this->form->password('password', $values, $errors, array('required')) ?>
 
-        <?= $this->form->label(t('Confirmation'), 'confirmation') ?>
-        <?= $this->form->password('confirmation', $values, $errors, array('required')) ?>
-    </div>
+            <?= $this->form->label(t('Confirmation'), 'confirmation') ?>
+            <?= $this->form->password('confirmation', $values, $errors, array('required')) ?>
+        </div>
 
-    <div class="form-column">
-        <?= $this->form->label(t('Add project member'), 'project_id') ?>
-        <?= $this->form->select('project_id', $projects, $values, $errors) ?>
+        <div class="form-column">
+            <?= $this->form->label(t('Add project member'), 'project_id') ?>
+            <?= $this->form->select('project_id', $projects, $values, $errors) ?>
 
-        <?= $this->form->label(t('Timezone'), 'timezone') ?>
-        <?= $this->form->select('timezone', $timezones, $values, $errors) ?>
+            <?= $this->form->label(t('Timezone'), 'timezone') ?>
+            <?= $this->form->select('timezone', $timezones, $values, $errors) ?>
 
-        <?= $this->form->label(t('Language'), 'language') ?>
-        <?= $this->form->select('language', $languages, $values, $errors) ?>
+            <?= $this->form->label(t('Language'), 'language') ?>
+            <?= $this->form->select('language', $languages, $values, $errors) ?>
 
-        <?= $this->form->label(t('Role'), 'role') ?>
-        <?= $this->form->select('role', $roles, $values, $errors) ?>
+            <?= $this->form->label(t('Role'), 'role') ?>
+            <?= $this->form->select('role', $roles, $values, $errors) ?>
 
-        <?= $this->form->checkbox('notifications_enabled', t('Enable email notifications'), 1, isset($values['notifications_enabled']) && $values['notifications_enabled'] == 1 ? true : false) ?>
+            <?= $this->form->checkbox('notifications_enabled', t('Enable email notifications'), 1, isset($values['notifications_enabled']) && $values['notifications_enabled'] == 1 ? true : false) ?>
+        </div>
     </div>
 
     <div class="form-actions">
diff --git a/app/Template/user_creation/remote.php b/app/Template/user_creation/remote.php
index dc4981a4..41d0d3c7 100644
--- a/app/Template/user_creation/remote.php
+++ b/app/Template/user_creation/remote.php
@@ -2,38 +2,39 @@
     <h2><?= t('New remote user') ?></h2>
 </div>
 <form class="popover-form" method="post" action="<?= $this->url->href('UserCreationController', 'save') ?>" autocomplete="off">
-
     <?= $this->form->csrf() ?>
     <?= $this->form->hidden('is_ldap_user', array('is_ldap_user' => 1)) ?>
 
-    <div class="form-column">
-        <?= $this->form->label(t('Username'), 'username') ?>
-        <?= $this->form->text('username', $values, $errors, array('autofocus', 'required', 'maxlength="50"')) ?>
-
-        <?= $this->form->label(t('Name'), 'name') ?>
-        <?= $this->form->text('name', $values, $errors) ?>
+    <div class="form-columns">
+        <div class="form-column">
+            <?= $this->form->label(t('Username'), 'username') ?>
+            <?= $this->form->text('username', $values, $errors, array('autofocus', 'required', 'maxlength="50"')) ?>
+    
+            <?= $this->form->label(t('Name'), 'name') ?>
+            <?= $this->form->text('name', $values, $errors) ?>
 
-        <?= $this->form->label(t('Email'), 'email') ?>
-        <?= $this->form->email('email', $values, $errors) ?>
+            <?= $this->form->label(t('Email'), 'email') ?>
+            <?= $this->form->email('email', $values, $errors) ?>
 
-        <?= $this->hook->render('template:user:create-remote:form', array('values' => $values, 'errors' => $errors)) ?>
-    </div>
+            <?= $this->hook->render('template:user:create-remote:form', array('values' => $values, 'errors' => $errors)) ?>
+        </div>
 
-    <div class="form-column">
-        <?= $this->form->label(t('Add project member'), 'project_id') ?>
-        <?= $this->form->select('project_id', $projects, $values, $errors) ?>
+        <div class="form-column">
+            <?= $this->form->label(t('Add project member'), 'project_id') ?>
+            <?= $this->form->select('project_id', $projects, $values, $errors) ?>
 
-        <?= $this->form->label(t('Timezone'), 'timezone') ?>
-        <?= $this->form->select('timezone', $timezones, $values, $errors) ?>
+            <?= $this->form->label(t('Timezone'), 'timezone') ?>
+            <?= $this->form->select('timezone', $timezones, $values, $errors) ?>
 
-        <?= $this->form->label(t('Language'), 'language') ?>
-        <?= $this->form->select('language', $languages, $values, $errors) ?>
+            <?= $this->form->label(t('Language'), 'language') ?>
+            <?= $this->form->select('language', $languages, $values, $errors) ?>
 
-        <?= $this->form->label(t('Role'), 'role') ?>
-        <?= $this->form->select('role', $roles, $values, $errors) ?>
+            <?= $this->form->label(t('Role'), 'role') ?>
+            <?= $this->form->select('role', $roles, $values, $errors) ?>
 
-        <?= $this->form->checkbox('notifications_enabled', t('Enable email notifications'), 1, isset($values['notifications_enabled']) && $values['notifications_enabled'] == 1 ? true : false) ?>
-        <?= $this->form->checkbox('disable_login_form', t('Disallow login form'), 1, isset($values['disable_login_form']) && $values['disable_login_form'] == 1) ?>
+            <?= $this->form->checkbox('notifications_enabled', t('Enable email notifications'), 1, isset($values['notifications_enabled']) && $values['notifications_enabled'] == 1 ? true : false) ?>
+            <?= $this->form->checkbox('disable_login_form', t('Disallow login form'), 1, isset($values['disable_login_form']) && $values['disable_login_form'] == 1) ?>
+        </div>
     </div>
 
     <div class="form-actions">