Improve task creation popover

2 files changed, 79 insertions, 80 deletions

diff --git a/app/Controller/Task.php b/app/Controller/Task.php
index 907c42cc..481d0ccd 100644
--- a/app/Controller/Task.php
+++ b/app/Controller/Task.php
@@ -86,20 +86,25 @@ class Task extends Base
      *
      * @access public
      */
-    public function create()
+    public function create(array $values = array(), array $errors = array())
     {
         $project = $this->getProject();
         $method = $this->request->isAjax() ? 'load' : 'layout';
 
-        $this->response->html($this->template->$method('task_new', array(
-            'errors' => array(),
-            'values' => array(
-                'project_id' => $project['id'],
+        if (empty($values)) {
+
+            $values = array(
                 'column_id' => $this->request->getIntegerParam('column_id'),
                 'color_id' => $this->request->getStringParam('color_id'),
                 'owner_id' => $this->request->getIntegerParam('owner_id'),
                 'another_task' => $this->request->getIntegerParam('another_task'),
-            ),
+            );
+        }
+
+        $this->response->html($this->template->$method('task_new', array(
+            'ajax' => $this->request->isAjax(),
+            'errors' => $errors,
+            'values' => $values + array('project_id' => $project['id']),
             'projects_list' => $this->project->getListByStatus(ProjectModel::ACTIVE),
             'columns_list' => $this->board->getColumnsList($project['id']),
             'users_list' => $this->projectPermission->getMemberList($project['id'], true, false, true),
@@ -122,7 +127,7 @@ class Task extends Base
         $values = $this->request->getValues();
         $values['creator_id'] = $this->acl->getUserId();
 
-        $this->checkProjectPermissions($values['project_id']);
+        $this->checkProjectPermissions($project['id']);
 
         list($valid, $errors) = $this->taskValidator->validateCreation($values);
 
@@ -145,18 +150,7 @@ class Task extends Base
             }
         }
 
-        $this->response->html($this->template->layout('task_new', array(
-            'errors' => $errors,
-            'values' => $values,
-            'projects_list' => $this->project->getListByStatus(ProjectModel::ACTIVE),
-            'columns_list' => $this->board->getColumnsList($project['id']),
-            'users_list' => $this->projectPermission->getMemberList($project['id']),
-            'colors_list' => $this->color->getList(),
-            'categories_list' => $this->category->getList($project['id']),
-            'date_format' => $this->config->get('application_date_format'),
-            'date_formats' => $this->dateParser->getAvailableFormats(),
-            'title' => $project['name'].' > '.t('New task')
-        )));
+        $this->create($values, $errors);
     }
 
     /**
diff --git a/app/Template/task_new.php b/app/Template/task_new.php
index ee8aed7c..72e7d25b 100644
--- a/app/Template/task_new.php
+++ b/app/Template/task_new.php
@@ -1,74 +1,79 @@
-<section id="main">
-    <div class="page-header">
-        <ul>
-            <li><i class="fa fa-table fa-fw"></i><?= Helper\a(t('Back to the board'), 'board', 'show', array('project_id' => $values['project_id'])) ?></li>
-        </ul>
-    </div>
-    <section id="task-section">
-    <form method="post" action="<?= Helper\u('task', 'save', array('project_id' => $values['project_id'])) ?>" autocomplete="off">
-
-        <?= Helper\form_csrf() ?>
-
-        <div class="form-column">
-            <?= Helper\form_label(t('Title'), 'title') ?>
-            <?= Helper\form_text('title', $values, $errors, array('autofocus', 'required'), 'form-input-large') ?><br/>
-
-            <?= Helper\form_label(t('Description'), 'description') ?>
-
-            <div class="form-tabs">
-                <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 class="write-area">
-                    <?= Helper\form_textarea('description', $values, $errors, array('placeholder="'.t('Leave a description').'"')) ?>
-                </div>
-                <div class="preview-area">
-                    <div class="markdown"></div>
-                </div>
-            </div>
+<?php if (! $ajax): ?>
+<div class="page-header">
+    <ul>
+        <li><i class="fa fa-table fa-fw"></i><?= Helper\a(t('Back to the board'), 'board', 'show', array('project_id' => $values['project_id'])) ?></li>
+    </ul>
+</div>
+<?php else: ?>
+<div class="page-header">
+    <h2><?= t('New task') ?></h2>
+</div>
+<?php endif ?>
+
+<section id="task-section">
+<form method="post" action="<?= Helper\u('task', 'save', array('project_id' => $values['project_id'])) ?>" autocomplete="off">
+
+    <?= Helper\form_csrf() ?>
 
-            <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 class="form-column">
+        <?= Helper\form_label(t('Title'), 'title') ?>
+        <?= Helper\form_text('title', $values, $errors, array('autofocus', 'required'), 'form-input-large') ?><br/>
 
-            <?php if (! isset($duplicate)): ?>
-                <?= Helper\form_checkbox('another_task', t('Create another task'), 1, isset($values['another_task']) && $values['another_task'] == 1) ?>
-            <?php endif ?>
+        <?= Helper\form_label(t('Description'), 'description') ?>
+
+        <div class="form-tabs">
+            <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 class="write-area">
+                <?= Helper\form_textarea('description', $values, $errors, array('placeholder="'.t('Leave a description').'"')) ?>
+            </div>
+            <div class="preview-area">
+                <div class="markdown"></div>
+            </div>
         </div>
 
-        <div class="form-column">
-            <?= Helper\form_hidden('project_id', $values) ?>
+        <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('Assignee'), 'owner_id') ?>
-            <?= Helper\form_select('owner_id', $users_list, $values, $errors) ?><br/>
+        <?php if (! isset($duplicate)): ?>
+            <?= Helper\form_checkbox('another_task', t('Create another task'), 1, isset($values['another_task']) && $values['another_task'] == 1) ?>
+        <?php endif ?>
+    </div>
 
-            <?= Helper\form_label(t('Category'), 'category_id') ?>
-            <?= Helper\form_select('category_id', $categories_list, $values, $errors) ?><br/>
+    <div class="form-column">
+        <?= Helper\form_hidden('project_id', $values) ?>
 
-            <?= Helper\form_label(t('Column'), 'column_id') ?>
-            <?= Helper\form_select('column_id', $columns_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('Color'), 'color_id') ?>
-            <?= Helper\form_select('color_id', $colors_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('Complexity'), 'score') ?>
-            <?= Helper\form_number('score', $values, $errors) ?><br/>
+        <?= Helper\form_label(t('Column'), 'column_id') ?>
+        <?= Helper\form_select('column_id', $columns_list, $values, $errors) ?><br/>
 
-            <?= Helper\form_label(t('Original estimate'), 'time_estimated') ?>
-            <?= Helper\form_numeric('time_estimated', $values, $errors) ?> <?= t('hours') ?><br/>
+        <?= Helper\form_label(t('Color'), 'color_id') ?>
+        <?= Helper\form_select('color_id', $colors_list, $values, $errors) ?><br/>
 
-            <?= Helper\form_label(t('Due Date'), 'date_due') ?>
-            <?= Helper\form_text('date_due', $values, $errors, array('placeholder="'.Helper\in_list($date_format, $date_formats).'"'), '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('Complexity'), 'score') ?>
+        <?= Helper\form_number('score', $values, $errors) ?><br/>
 
-        <div class="form-actions">
-            <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
-            <?= t('or') ?> <?= Helper\a(t('cancel'), 'board', 'show', array('project_id' => $values['project_id'])) ?>
-        </div>
-    </form>
-    </section>
+        <?= Helper\form_label(t('Original estimate'), 'time_estimated') ?>
+        <?= Helper\form_numeric('time_estimated', $values, $errors) ?> <?= t('hours') ?><br/>
+
+        <?= Helper\form_label(t('Due Date'), 'date_due') ?>
+        <?= Helper\form_text('date_due', $values, $errors, array('placeholder="'.Helper\in_list($date_format, $date_formats).'"'), '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') ?> <?= Helper\a(t('cancel'), 'board', 'show', array('project_id' => $values['project_id'])) ?>
+    </div>
+</form>
 </section>