diff options
| author | Frederic Guillot <fred@kanboard.net> | 2016-06-24 17:57:26 -0400 |
|---|---|---|
| committer | Frederic Guillot <fred@kanboard.net> | 2016-06-24 17:57:26 -0400 |
| commit | 17213da5ce60a3da19789cff14544d0a79ee2df1 (patch) | |
| tree | 5b3791d9988f1a02ad71237e8330863f3919eb9e /app/Template/task_creation/show.php | |
| parent | 18cb7ad0a4a96be63030f5207b74a195c8b6cd6c (diff) | |
Use the same task form layout everywhere
Diffstat (limited to 'app/Template/task_creation/show.php')
| -rw-r--r-- | app/Template/task_creation/show.php | 73 |
1 files changed, 34 insertions, 39 deletions
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"> |