diff options
| author | Frédéric Guillot <fred@kanboard.net> | 2017-11-23 11:07:31 -0800 |
|---|---|---|
| committer | Frédéric Guillot <fred@kanboard.net> | 2017-11-23 11:07:31 -0800 |
| commit | 5045c6d8de7854d30843f133641ffdd1337a2114 (patch) | |
| tree | 2838f641426a94263d4f8a1b63052ef526dacb78 | |
| parent | 6c7c73613aeb25cf995f61e0acda7c648a1ddf55 (diff) | |
Minor tweaks on PR #3562
| -rw-r--r-- | app/Formatter/BoardSwimlaneFormatter.php | 4 | ||||
| -rw-r--r-- | app/Template/board/table_column.php | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/app/Formatter/BoardSwimlaneFormatter.php b/app/Formatter/BoardSwimlaneFormatter.php index 17710fc3..c2f5a3b5 100644 --- a/app/Formatter/BoardSwimlaneFormatter.php +++ b/app/Formatter/BoardSwimlaneFormatter.php @@ -97,8 +97,8 @@ class BoardSwimlaneFormatter extends BaseFormatter implements FormatterInterface $this->calculateStatsByColumnAcrossSwimlanes($swimlane['columns']); } - foreach($this->swimlanes as &$swimlane) { - foreach($swimlane['columns'] as $columnIndex => &$column) { + foreach ($this->swimlanes as &$swimlane) { + foreach ($swimlane['columns'] as $columnIndex => &$column) { $column['column_nb_tasks'] = $this->swimlanes[0]['columns'][$columnIndex]['column_nb_tasks']; $column['column_nb_score'] = $this->swimlanes[0]['columns'][$columnIndex]['column_score']; } diff --git a/app/Template/board/table_column.php b/app/Template/board/table_column.php index f63438c3..1bba397d 100644 --- a/app/Template/board/table_column.php +++ b/app/Template/board/table_column.php @@ -19,10 +19,11 @@ <?= $this->task->getNewBoardTaskButton($swimlane, $column) ?> <?php endif ?> - + <?php if ($column['nb_tasks'] > 0): ?> <span title="<?= t('Task count') ?>"> (<span id="task-number-column-<?= $column['id'] ?>"><?= $column['nb_tasks'] ?></span>) </span> + <?php endif ?> <span class="board-column-title"> <?php if ($not_editable): ?> @@ -76,14 +77,13 @@ <?php if (! empty($column['column_nb_tasks'])): ?> <span title="<?= t('Total number of tasks in this column across all swimlanes') ?>" class="board-column-header-task-count"> - ( - <span><?= $column['column_nb_tasks'] ?></span> - <?php if ($column['task_limit']): ?> - /<span title="<?= t('Task limit') ?>"><?= $this->text->e($column['task_limit']) ?></span> + <?php if ($column['task_limit'] > 0): ?> + (<span><?= $column['column_nb_tasks'] ?></span> / <span title="<?= t('Task limit') ?>"><?= $this->text->e($column['task_limit']) ?></span>) + <?php else: ?> + (<span><?= $column['column_nb_tasks'] ?></span>) <?php endif ?> - ) </span> - <?php endif; ?> + <?php endif ?> <?= $this->hook->render('template:board:column:header', array('swimlane' => $swimlane, 'column' => $column)) ?> </div> |