diff options
| author | Frédéric Guillot <fred@kanboard.net> | 2014-10-07 11:27:46 -0400 |
|---|---|---|
| committer | Frédéric Guillot <fred@kanboard.net> | 2014-10-07 11:27:46 -0400 |
| commit | 86928e37bced3d99f5cc2f449fb458c2344fd317 (patch) | |
| tree | c703c69367d514811acd37210be89b451aaede37 /app | |
| parent | cfe69443b7c82e09f764efbc30da45013dc1c77f (diff) | |
Add comment creation form to the task summary page (pull-request #300)
Diffstat (limited to 'app')
| -rw-r--r-- | app/Templates/comment_create.php | 8 | ||||
| -rw-r--r-- | app/Templates/task_comments.php | 12 |
2 files changed, 17 insertions, 3 deletions
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&action=show&task_id=<?= $task['id'] ?>"><?= t('cancel') ?></a> + <?php if (! isset($skip_cancel)): ?> + <?= t('or') ?> + <a href="?controller=task&action=show&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 |