From 86928e37bced3d99f5cc2f449fb458c2344fd317 Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fred@kanboard.net>
Date: Tue, 7 Oct 2014 11:27:46 -0400
Subject: Add comment creation form to the task summary page (pull-request
 #300)

---
 app/Templates/comment_create.php |  8 +++++---
 app/Templates/task_comments.php  | 12 ++++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

(limited to 'app')

diff --git a/app/Templates/comment_create.php b/app/Templates/comment_create.php
index 71a4f044..11772f75 100644
--- a/app/Templates/comment_create.php
+++ b/app/Templates/comment_create.php
@@ -6,12 +6,14 @@
     <?= Helper\form_csrf() ?>
     <?= Helper\form_hidden('task_id', $values) ?>
     <?= Helper\form_hidden('user_id', $values) ?>
-    <?= Helper\form_textarea('comment', $values, $errors, array('autofocus', 'required', 'placeholder="'.t('Leave a comment').'"'), 'comment-textarea') ?><br/>
+    <?= Helper\form_textarea('comment', $values, $errors, array(! isset($skip_cancel) ? 'autofocus' : '', 'required', 'placeholder="'.t('Leave a comment').'"'), 'comment-textarea') ?><br/>
     <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-actions">
         <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
-        <?= t('or') ?>
-        <a href="?controller=task&amp;action=show&amp;task_id=<?= $task['id'] ?>"><?= t('cancel') ?></a>
+        <?php if (! isset($skip_cancel)): ?>
+            <?= t('or') ?>
+            <a href="?controller=task&amp;action=show&amp;task_id=<?= $task['id'] ?>"><?= t('cancel') ?></a>
+        <?php endif ?>
     </div>
 </form>
diff --git a/app/Templates/task_comments.php b/app/Templates/task_comments.php
index acd84952..12deff98 100644
--- a/app/Templates/task_comments.php
+++ b/app/Templates/task_comments.php
@@ -11,5 +11,17 @@
             'not_editable' => isset($not_editable) && $not_editable,
         )) ?>
     <?php endforeach ?>
+
+    <?php if (! isset($not_editable)): ?>
+        <?= Helper\template('comment_create', array(
+                'skip_cancel' => true,
+                'values' => array(
+                    'user_id' => Helper\get_user_id(),
+                    'task_id' => $task['id'],
+                ),
+                'errors' => array(),
+                'task' => $task
+        )) ?>
+    <?php endif ?>
 </div>
 <?php endif ?>
\ No newline at end of file
-- 
cgit v1.2.3