summaryrefslogtreecommitdiff
path: root/app/Template
diff options
context:
space:
mode:
Diffstat (limited to 'app/Template')
-rw-r--r--app/Template/board/task_footer.php11
-rw-r--r--app/Template/board/task_private.php4
-rw-r--r--app/Template/board/tooltip_comments.php9
-rw-r--r--app/Template/comment/show.php13
-rw-r--r--app/Template/comment_list/create.php8
-rw-r--r--app/Template/comment_list/show.php27
-rw-r--r--app/Template/task/public.php2
-rw-r--r--app/Template/task/show.php2
-rw-r--r--app/Template/task_comments/create.php (renamed from app/Template/comments/create.php)5
-rw-r--r--app/Template/task_comments/show.php (renamed from app/Template/comments/show.php)10
10 files changed, 58 insertions, 33 deletions
diff --git a/app/Template/board/task_footer.php b/app/Template/board/task_footer.php
index 23f4e32e..4e561f14 100644
--- a/app/Template/board/task_footer.php
+++ b/app/Template/board/task_footer.php
@@ -95,8 +95,15 @@
<span title="<?= t('Attachments') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltipController', 'attachments', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-paperclip"></i>&nbsp;<?= $task['nb_files'] ?></span>
<?php endif ?>
- <?php if (! empty($task['nb_comments'])): ?>
- <span title="<?= $task['nb_comments'] == 1 ? t('%d comment', $task['nb_comments']) : t('%d comments', $task['nb_comments']) ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltipController', 'comments', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-comment-o"></i>&nbsp;<?= $task['nb_comments'] ?></span>
+ <?php if ($task['nb_comments'] > 0): ?>
+ <?= $this->modal->medium(
+ 'comments-o',
+ $task['nb_comments'],
+ 'CommentListController',
+ 'show',
+ array('task_id' => $task['id'], 'project_id' => $task['project_id']),
+ $task['nb_comments'] == 1 ? t('%d comment', $task['nb_comments']) : t('%d comments', $task['nb_comments'])
+ ) ?>
<?php endif ?>
<?php if (! empty($task['description'])): ?>
diff --git a/app/Template/board/task_private.php b/app/Template/board/task_private.php
index 3201d4e2..1be64fcf 100644
--- a/app/Template/board/task_private.php
+++ b/app/Template/board/task_private.php
@@ -28,7 +28,7 @@
<?= $this->text->e($this->user->getInitials($task['assignee_name'] ?: $task['assignee_username'])) ?>
</span> -
<?php endif ?>
- <?= $this->url->link($this->text->e($task['title']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-collapsed-title tooltip', $this->text->e($task['title'])) ?>
+ <?= $this->text->e($task['title']) ?>
</div>
<?php else: ?>
<div class="task-board-expanded">
@@ -50,7 +50,7 @@
<?= $this->hook->render('template:board:private:task:before-title', array('task' => $task)) ?>
<div class="task-board-title">
- <?= $this->url->link($this->text->e($task['title']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
+ <?= $this->text->e($task['title']) ?>
</div>
<?= $this->hook->render('template:board:private:task:after-title', array('task' => $task)) ?>
diff --git a/app/Template/board/tooltip_comments.php b/app/Template/board/tooltip_comments.php
deleted file mode 100644
index a1071848..00000000
--- a/app/Template/board/tooltip_comments.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="tooltip-large">
- <?php foreach ($comments as $comment): ?>
- <?= $this->render('comment/show', array(
- 'comment' => $comment,
- 'task' => $task,
- 'hide_actions' => true,
- )) ?>
- <?php endforeach ?>
-</div>
diff --git a/app/Template/comment/show.php b/app/Template/comment/show.php
index f8d9607e..d8470c24 100644
--- a/app/Template/comment/show.php
+++ b/app/Template/comment/show.php
@@ -9,13 +9,6 @@
<small class="comment-date"><?= t('Created at:') ?> <?= $this->dt->datetime($comment['date_creation']) ?></small>
<small class="comment-date"><?= t('Updated at:')?> <?= $this->dt->datetime($comment['date_modification']) ?></small>
-
- </div>
-
- <div class="comment-content">
- <div class="markdown">
- <?= $this->text->markdown($comment['comment'], isset($is_public) && $is_public) ?>
- </div>
</div>
<?php if (! isset($hide_actions)): ?>
@@ -36,4 +29,10 @@
</ul>
</div>
<?php endif ?>
+
+ <div class="comment-content">
+ <div class="markdown">
+ <?= $this->text->markdown($comment['comment'], isset($is_public) && $is_public) ?>
+ </div>
+ </div>
</div>
diff --git a/app/Template/comment_list/create.php b/app/Template/comment_list/create.php
new file mode 100644
index 00000000..a1bae5eb
--- /dev/null
+++ b/app/Template/comment_list/create.php
@@ -0,0 +1,8 @@
+<div class="page-header">
+ <h2><?= t('Add a comment') ?></h2>
+</div>
+<form method="post" action="<?= $this->url->href('CommentListController', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
+ <?= $this->form->csrf() ?>
+ <?= $this->form->textEditor('comment', array(), array(), array('required' => true)) ?>
+ <?= $this->modal->submitButtons() ?>
+</form>
diff --git a/app/Template/comment_list/show.php b/app/Template/comment_list/show.php
new file mode 100644
index 00000000..6e362560
--- /dev/null
+++ b/app/Template/comment_list/show.php
@@ -0,0 +1,27 @@
+<div class="page-header">
+ <h2><?= $this->text->e($task['title']) ?> &gt; <?= t('Comments') ?></h2>
+ <?php if (!isset($is_public) || !$is_public): ?>
+ <div class="comment-sorting">
+ <small>
+ <?= $this->url->icon('sort', t('change sorting'), 'CommentListController', 'toggleSorting', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'js-modal-replace') ?>
+ </small>
+ </div>
+ <?php endif ?>
+</div>
+<div class="comments">
+ <?php foreach ($comments as $comment): ?>
+ <?= $this->render('comment/show', array(
+ 'comment' => $comment,
+ 'task' => $task,
+ 'project' => $project,
+ 'editable' => $editable,
+ 'is_public' => isset($is_public) && $is_public,
+ )) ?>
+ <?php endforeach ?>
+
+ <?php if ($editable): ?>
+ <?= $this->render('comment_list/create', array(
+ 'task' => $task,
+ )) ?>
+ <?php endif ?>
+</div>
diff --git a/app/Template/task/public.php b/app/Template/task/public.php
index b8405ff7..eb3b9f1d 100644
--- a/app/Template/task/public.php
+++ b/app/Template/task/public.php
@@ -26,7 +26,7 @@
'is_public' => true,
)) ?>
- <?= $this->render('comments/show', array(
+ <?= $this->render('task_comments/show', array(
'task' => $task,
'comments' => $comments,
'project' => $project,
diff --git a/app/Template/task/show.php b/app/Template/task/show.php
index a5c2d5a7..565f0632 100644
--- a/app/Template/task/show.php
+++ b/app/Template/task/show.php
@@ -54,7 +54,7 @@
<?php if (!empty($comments)): ?>
<?= $this->hook->render('template:task:show:before-comments', array('task' => $task, 'project' => $project)) ?>
- <?= $this->render('comments/show', array(
+ <?= $this->render('task_comments/show', array(
'task' => $task,
'comments' => $comments,
'project' => $project,
diff --git a/app/Template/comments/create.php b/app/Template/task_comments/create.php
index 06173575..05b05120 100644
--- a/app/Template/comments/create.php
+++ b/app/Template/task_comments/create.php
@@ -4,8 +4,5 @@
<?= $this->form->hidden('user_id', $values) ?>
<?= $this->form->textEditor('comment', $values, $errors, array('required' => true)) ?>
-
- <div class="form-actions">
- <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
- </div>
+ <?= $this->modal->submitButtons() ?>
</form>
diff --git a/app/Template/comments/show.php b/app/Template/task_comments/show.php
index 3edf7076..18200bc8 100644
--- a/app/Template/comments/show.php
+++ b/app/Template/task_comments/show.php
@@ -2,7 +2,7 @@
<div class="accordion-title">
<h3><a href="#" class="fa accordion-toggle"></a> <?= t('Comments') ?></h3>
</div>
- <div class="accordion-content" id="comments">
+ <div class="accordion-content comments" id="comments">
<?php if (!isset($is_public) || !$is_public): ?>
<div class="comment-sorting">
<small>
@@ -21,12 +21,8 @@
<?php endforeach ?>
<?php if ($editable): ?>
- <?= $this->render('comments/create', array(
- 'values' => array(
- 'user_id' => $this->user->getId(),
- 'task_id' => $task['id'],
- 'project_id' => $task['project_id'],
- ),
+ <?= $this->render('task_comments/create', array(
+ 'values' => array(),
'errors' => array(),
'task' => $task,
)) ?>
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-26 12:31:45 +0000