AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve comments design

Browse Source
This commit is contained in:
Frederic Guillot
2016-03-19 11:56:28 -04:00
parent 9d4ba1471d
commit 344f585a32
8 changed files with 116 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Controller/BoardTooltip.php
View File

@@ -77,6 +77,7 @@ class BoardTooltip extends Base
$task = $this->getTask();
$this->response->html($this->template->render('board/tooltip_comments', array(
'task' => $task,
'comments' => $this->comment->getAll($task['id'], $this->userSession->getCommentSorting())
)));
}

21
app/Template/board/tooltip_comments.php
View File

@@ -1,16 +1,9 @@
<section>
<div class="comment-tooltip">
<?php foreach ($comments as $comment): ?>
<p class="comment-title">
<?php if (! empty($comment['username'])): ?>
<span class="comment-username"><?= $this->text->e($comment['name'] ?: $comment['username']) ?></span> @
<?php endif ?>
<span class="comment-date"><?= $this->dt->datetime($comment['date_creation']) ?></span>
</p>
<div class="comment-inner">
<div class="markdown">
<?= $this->text->markdown($comment['comment']) ?>
</div>
</div>
<?= $this->render('comment/show', array(
'comment' => $comment,
'task' => $task,
'hide_actions' => true,
)) ?>
<?php endforeach ?>
</section>
</div>

6
app/Template/comment/remove.php
View File

@@ -7,7 +7,11 @@
<?= t('Do you really want to remove this comment?') ?>
</p>
<?= $this->render('comment/show', array('comment' => $comment, 'task' => $task, 'preview' => true)) ?>
<?= $this->render('comment/show', array(
'comment' => $comment,
'task' => $task,
'hide_actions' => true
)) ?>
<div class="form-actions">
<?= $this->url->link(t('Yes'), 'comment', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id']), true, 'btn btn-red') ?>

48
app/Template/comment/show.php
View File

@@ -1,30 +1,16 @@
<div class="comment <?= isset($preview) ? 'comment-preview' : '' ?>" id="comment-<?= $comment['id'] ?>">
<p class="comment-title">
<?= $this->user->avatar($comment['user_id'], $comment['username'], $comment['name'], $comment['email']) ?>
<?= $this->user->avatar($comment['user_id'], $comment['username'], $comment['name'], $comment['email']) ?>
<div class="comment-title">
<?php if (! empty($comment['username'])): ?>
<span class="comment-username"><?= $this->text->e($comment['name'] ?: $comment['username']) ?></span> @
<span class="comment-username"><?= $this->text->e($comment['name'] ?: $comment['username']) ?></span>
<?php endif ?>
<span class="comment-date"><?= $this->dt->datetime($comment['date_creation']) ?></span>
</p>
<div class="comment-inner">
<?php if (! isset($preview)): ?>
<ul class="comment-actions">
<li><a href="#comment-<?= $comment['id'] ?>"><?= t('link') ?></a></li>
<?php if ($editable && ($this->user->isAdmin() || $this->user->isCurrentUser($comment['user_id']))): ?>
<li>
<?= $this->url->link(t('remove'), 'comment', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id']), false, 'popover') ?>
</li>
<li>
<?= $this->url->link(t('edit'), 'comment', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id']), false, 'popover') ?>
</li>
<?php endif ?>
</ul>
<?php endif ?>
</div>
<div class="comment-content">
<div class="markdown">
<?php if (isset($is_public) && $is_public): ?>
<?= $this->text->markdown(
@@ -50,6 +36,26 @@
) ?>
<?php endif ?>
</div>
</div>
</div>
<?php if (! isset($hide_actions)): ?>
<div class="comment-actions">
<ul>
<li>
<i class="fa fa-link fa-fw"></i>
<a href="#comment-<?= $comment['id'] ?>"><?= t('link') ?></a>
</li>
<?php if ($editable && ($this->user->isAdmin() || $this->user->isCurrentUser($comment['user_id']))): ?>
<li>
<i class="fa fa-remove fa-fw"></i>
<?= $this->url->link(t('remove'), 'comment', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id']), false, 'popover') ?>
</li>
<li>
<i class="fa fa-edit fa-fw"></i>
<?= $this->url->link(t('edit'), 'comment', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id']), false, 'popover') ?>
</li>
<?php endif ?>
</ul>
</div>
<?php endif ?>
</div>