Remove description textarea from task edit form

app/Helper/Task.php

@@ -129,10 +129,21 @@ class Task extends Base
         return $html;
     }
 
+    public function selectTimeSpent(array $values, array $errors = array(), array $attributes = array())
+    {
+        $attributes = array_merge(array('tabindex="10"'), $attributes);
+
+        $html = $this->helper->form->label(t('Time spent'), 'time_spent');
+        $html .= $this->helper->form->numeric('time_spent', $values, $errors, $attributes);
+        $html .= ' '.t('hours');
+
+        return $html;
+    }
+
     public function selectStartDate(array $values, array $errors = array(), array $attributes = array())
     {
         $placeholder = $this->helper->text->in($this->config->get('application_date_format'), $this->dateParser->getAvailableFormats());
-        $attributes = array_merge(array('tabindex="10"', 'placeholder="'.$placeholder.'"'), $attributes);
+        $attributes = array_merge(array('tabindex="11"', 'placeholder="'.$placeholder.'"'), $attributes);
 
         $html = $this->helper->form->label(t('Start Date'), 'date_started');
         $html .= $this->helper->form->text('date_started', $values, $errors, $attributes, 'form-date');
@@ -143,7 +154,7 @@ class Task extends Base
     public function selectDueDate(array $values, array $errors = array(), array $attributes = array())
     {
         $placeholder = $this->helper->text->in($this->config->get('application_date_format'), $this->dateParser->getAvailableFormats());
-        $attributes = array_merge(array('tabindex="11"', 'placeholder="'.$placeholder.'"'), $attributes);
+        $attributes = array_merge(array('tabindex="12"', 'placeholder="'.$placeholder.'"'), $attributes);
 
         $html = $this->helper->form->label(t('Due Date'), 'date_due');
         $html .= $this->helper->form->text('date_due', $values, $errors, $attributes, 'form-date');

app/Template/task_modification/edit_task.php

@@ -4,52 +4,28 @@
 <form class="popover-form" method="post" action="<?= $this->url->href('taskmodification', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
 
     <?= $this->form->csrf() ?>
+    <?= $this->form->hidden('id', $values) ?>
+    <?= $this->form->hidden('project_id', $values) ?>
 
     <div class="form-column">
-
         <?= $this->form->label(t('Title'), 'title') ?>
         <?= $this->form->text('title', $values, $errors, array('autofocus', 'required', 'maxlength="200"', 'tabindex="1"')) ?>
-
-        <?= $this->form->label(t('Description'), 'description') ?>
-        <div class="form-tabs">
-            <div class="write-area">
-                <?= $this->form->textarea(
-                    'description',
-                    $values,
-                    $errors,
-                    array(
-                        'placeholder="'.t('Leave a description').'"',
-                        'tabindex="2"',
-                        'data-mention-search-url="'.$this->url->href('UserHelper', 'mention', array('project_id' => $task['project_id'])).'"'
-                    )
-                ) ?>
-            </div>
-            <div class="preview-area">
-                <div class="markdown"></div>
-            </div>
-            <ul class="form-tabs-nav">
-                <li class="form-tab form-tab-selected">
-                    <i class="fa fa-pencil-square-o fa-fw"></i><a id="markdown-write" href="#"><?= t('Write') ?></a>
-                </li>
-                <li class="form-tab">
-                    <a id="markdown-preview" href="#"><i class="fa fa-eye fa-fw"></i><?= t('Preview') ?></a>
-                </li>
-            </ul>
-        </div>
-
-        <?= $this->render('task/color_picker', array('colors_list' => $colors_list, 'values' => $values)) ?>
-    </div>
-
-    <div class="form-column">
-        <?= $this->form->hidden('id', $values) ?>
-        <?= $this->form->hidden('project_id', $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) ?>
+    </div>
+
+    <div class="form-column">
+        <?= $this->task->selectTimeEstimated($values, $errors) ?>
+        <?= $this->task->selectTimeSpent($values, $errors) ?>
         <?= $this->task->selectDueDate($values, $errors) ?>
     </div>
 
+    <div class="form-clear">
+        <?= $this->render('task/color_picker', array('colors_list' => $colors_list, 'values' => $values)) ?>
+    </div>
+
     <div class="form-actions">
         <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue" tabindex="10">
         <?= t('or') ?>

assets/css/src/base.css

@@ -74,4 +74,3 @@ hr {
 .smaller {
     font-size: 0.85em;
 }
-

assets/css/src/form.css

@@ -146,11 +146,6 @@ input.form-input-large {
     width: 400px;
 }
 
-.form-row {
-    margin-top: 10px;
-    margin-bottom: 20px;
-}
-
 .form-column {
     float: left;
     margin-right: 3%;
@@ -161,6 +156,12 @@ input.form-input-large {
     margin-top: 15px;
 }
 
+.form-clear {
+    clear: both;
+    padding-top: 20px;
+    padding-bottom: 10px;
+}
+
 .form-login {
     width: 350px;
     margin: 0 auto;

assets/css/src/task.css

@@ -193,7 +193,7 @@ span.task-board-date-overdue {
 }
 
 .task-summary-column span {
-    color: #777;
+    color: #555;
 }
 
 .task-summary-column li {