diff options
Diffstat (limited to 'app/Template/board/table_column.php')
| -rw-r--r-- | app/Template/board/table_column.php | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/app/Template/board/table_column.php b/app/Template/board/table_column.php index da8db52d..2a6b496a 100644 --- a/app/Template/board/table_column.php +++ b/app/Template/board/table_column.php @@ -1,13 +1,12 @@ <!-- column titles --> -<?php ?> -<tr> +<tr class="board-swimlane-columns-<?= $swimlane['id'] ?>"> <?php foreach ($swimlane['columns'] as $column): ?> <th class="board-column-header board-column-header-<?= $column['id'] ?>" data-column-id="<?= $column['id'] ?>"> <!-- column in collapsed mode --> <div class="board-column-collapsed"> <span title="<?= t('Task count') ?>" class="board-column-header-task-count" title="<?= t('Show this column') ?>"> - <span id="task-number-column-<?= $column['id'] ?>"><?= $column['nb_column_tasks'] ?></span> + <span id="task-number-column-<?= $column['id'] ?>"><?= $column['nb_tasks'] ?></span> </span> </div> @@ -19,6 +18,12 @@ </div> <?php endif ?> + <?php if ($swimlane['nb_swimlanes'] > 1 && ! empty($column['nb_column_tasks'])): ?> + <span title="<?= t('Total number of tasks in this column across all swimlanes') ?>" class="board-column-header-task-count"> + (<span><?= $column['nb_column_tasks'] ?></span>) + </span> + <?php endif ?> + <span class="board-column-title" data-column-id="<?= $column['id'] ?>" title="<?= t('Hide this column') ?>"> <?= $this->e($column['title']) ?> </span> @@ -31,17 +36,17 @@ <?php if (! empty($column['score'])): ?> <span class="pull-right" title="<?= t('Score') ?>"> - <?= $column['total_score'] ?> + <?= $column['score'] ?> </span> <?php endif ?> - <span title="<?= t('Total number of tasks in this column across all swimlanes') ?>" class="board-column-header-task-count"> - (<span id="task-number-column-<?= $column['id'] ?>"><?= $column['nb_column_tasks'] ?></span>) - </span> - <?php if ($column['task_limit']): ?> <span title="<?= t('Task limit') ?>"> - (<span id="task-number-column-<?= $column['id'] ?>"><?= $this->e($column['task_limit']) ?></span>) + (<span id="task-number-column-<?= $column['id'] ?>"><?= $column['nb_tasks'] ?></span>/<?= $this->e($column['task_limit']) ?>) + </span> + <?php else: ?> + <span title="<?= t('Task count') ?>" class="board-column-header-task-count"> + (<span id="task-number-column-<?= $column['id'] ?>"><?= $column['nb_tasks'] ?></span>) </span> <?php endif ?> </div> |