From d534f9fbbcfea7ccb876aed9361914a026c907bc Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fred@kanboard.net>
Date: Tue, 25 Nov 2014 20:59:46 -0500
Subject: Improve task creation popover

---
 app/Template/task_new.php | 127 ++++++++++++++++++++++++----------------------
 1 file changed, 66 insertions(+), 61 deletions(-)

(limited to 'app/Template/task_new.php')

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>
-- 
cgit v1.3.1