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

Add icon for subtasks on the board

Browse Source
This commit is contained in:
Frédéric Guillot
2014-09-11 16:27:10 +02:00
parent aa23098995
commit d9850ae66a
3 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Model/Task.php
View File

@@ -195,6 +195,8 @@ class Task extends Base
->columns( ->columns(
'(SELECT count(*) FROM comments WHERE task_id=tasks.id) AS nb_comments', '(SELECT count(*) FROM comments WHERE task_id=tasks.id) AS nb_comments',
'(SELECT count(*) FROM task_has_files WHERE task_id=tasks.id) AS nb_files', '(SELECT count(*) FROM task_has_files WHERE task_id=tasks.id) AS nb_files',
'(SELECT count(*) FROM task_has_subtasks WHERE task_id=tasks.id) AS nb_subtasks',
'(SELECT count(*) FROM task_has_subtasks WHERE task_id=tasks.id AND status=2) AS nb_completed_subtasks',
'tasks.id', 'tasks.id',
'tasks.title', 'tasks.title',
'tasks.description', 'tasks.description',

17
app/Templates/board_task.php
View File

@@ -56,7 +56,7 @@
<?php endif ?> <?php endif ?>
<?php if (! empty($task['date_due']) || ! empty($task['nb_files']) || ! empty($task['nb_comments']) || ! empty($task['description'])): ?> <?php if (! empty($task['date_due']) || ! empty($task['nb_files']) || ! empty($task['nb_comments']) || ! empty($task['description']) || ! empty($task['nb_subtasks'])): ?>
<div class="task-board-footer"> <div class="task-board-footer">
<?php if (! empty($task['date_due'])): ?> <?php if (! empty($task['date_due'])): ?>
@@ -66,20 +66,27 @@
<?php endif ?> <?php endif ?>
<div class="task-board-icons"> <div class="task-board-icons">
<?php if (! empty($task['nb_subtasks'])): ?>
<span title="<?= t('Sub-Tasks') ?>"><?= $task['nb_completed_subtasks'].'/'.$task['nb_subtasks'] ?> <i class="fa fa-bars"></i></span>
<?php endif ?>
<?php if (! empty($task['nb_files'])): ?> <?php if (! empty($task['nb_files'])): ?>
<?= $task['nb_files'] ?> <i class="fa fa-paperclip" title="<?= t('Attachments') ?>"></i> <span title="<?= t('Attachments') ?>"><?= $task['nb_files'] ?> <i class="fa fa-paperclip"></i></span>
<?php endif ?> <?php endif ?>
<?php if (! empty($task['nb_comments'])): ?> <?php if (! empty($task['nb_comments'])): ?>
<?= $task['nb_comments'] ?> <i class="fa fa-comment-o" title="<?= p($task['nb_comments'], t('%d comment', $task['nb_comments']), t('%d comments', $task['nb_comments'])) ?>"></i> <span title="<?= p($task['nb_comments'], t('%d comment', $task['nb_comments']), t('%d comments', $task['nb_comments'])) ?>"><?= $task['nb_comments'] ?> <i class="fa fa-comment-o"></i></span>
<?php endif ?> <?php endif ?>
<?php if (! empty($task['description'])): ?> <?php if (! empty($task['description'])): ?>
<span title="<?= t('Description') ?>">
<?php if (! isset($not_editable)): ?> <?php if (! isset($not_editable)): ?>
<a class="task-description-popover" href="?controller=task&amp;action=description&amp;task_id=<?= $task['id'] ?>"><i class="fa fa-file-text-o" title="<?= t('Description') ?>" data-href="?controller=task&amp;action=description&amp;task_id=<?= $task['id'] ?>"></i></a> <a class="task-description-popover" href="?controller=task&amp;action=description&amp;task_id=<?= $task['id'] ?>"><i class="fa fa-file-text-o" data-href="?controller=task&amp;action=description&amp;task_id=<?= $task['id'] ?>"></i></a>
<?php else: ?> <?php else: ?>
<i class="fa fa-file-text-o" title="<?= t('Description') ?>"></i> <i class="fa fa-file-text-o"></i>
<?php endif ?> <?php endif ?>
</span>
<?php endif ?> <?php endif ?>
</div> </div>
</div> </div>

14
assets/css/app.css
View File

@@ -693,6 +693,20 @@ a.task-board-nobody {
right: 5px; right: 5px;
} }
.task-board-icons a {
opacity: 0.5;
}
.task-board-icons span {
opacity: 0.5;
margin-left: 5px;
}
.task-board-icons a:hover,
.task-board-icons span:hover {
opacity: 1.0;
}
/* task score */ /* task score */
.task-score { .task-score {
font-weight: bold; font-weight: bold;