Merge https://github.com/kanboard/kanboard

3 files changed, 44 insertions, 65 deletions

diff --git a/app/Template/task_modification/edit_description.php b/app/Template/task_modification/edit_description.php
deleted file mode 100644
index 339ed036..00000000
--- a/app/Template/task_modification/edit_description.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<div class="page-header">
-    <h2><?= t('Edit the description') ?></h2>
-</div>
-
-<form class="popover-form" method="post" action="<?= $this->url->href('TaskModificationController', 'updateDescription', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
-
-    <?= $this->form->csrf() ?>
-    <?= $this->form->hidden('id', $values) ?>
-
-    <?= $this->form->textarea(
-        'description',
-        $values,
-        $errors,
-        array(
-            'autofocus',
-            'placeholder="'.t('Leave a description').'"',
-            'data-mention-search-url="'.$this->url->href('UserAjaxController', 'mention', array('project_id' => $task['project_id'])).'"'
-        ),
-        'markdown-editor'
-    ) ?>
-
-    <div class="form-actions">
-        <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
-        <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
-    </div>
-</form>
diff --git a/app/Template/task_modification/edit_task.php b/app/Template/task_modification/edit_task.php
deleted file mode 100644
index 0707fd9a..00000000
--- a/app/Template/task_modification/edit_task.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<div class="page-header">
-    <h2><?= t('Edit a task') ?></h2>
-</div>
-<form class="popover-form" method="post" action="<?= $this->url->href('TaskModificationController', '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->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:left-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:right-column', array('values' => $values, 'errors' => $errors)) ?>
-    </div>
-
-    <div class="form-clear">
-        <?= $this->render('task/color_picker', array('colors_list' => $colors_list, 'values' => $values)) ?>
-    </div>
-
-    <div class="form-actions">
-        <button type="submit" class="btn btn-blue" tabindex="15"><?= t('Save') ?></button>
-        <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
-    </div>
-</form>
diff --git a/app/Template/task_modification/show.php b/app/Template/task_modification/show.php
new file mode 100644
index 00000000..734b247a
--- /dev/null
+++ b/app/Template/task_modification/show.php
@@ -0,0 +1,44 @@
+<div class="page-header">
+    <h2><?= $this->text->e($project['name']) ?> &gt; <?= $this->text->e($task['title']) ?></h2>
+</div>
+<form class="popover-form" method="post" action="<?= $this->url->href('TaskModificationController', '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-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: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->selectPriority($project, $values) ?>
+            <?= $this->task->selectScore($values, $errors) ?>
+            <?= $this->task->selectReference($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">
+        <button type="submit" class="btn btn-blue" tabindex="15"><?= t('Save') ?></button>
+        <?= t('or') ?>
+        <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
+    </div>
+</form>