diff options
| author | Frederic Guillot <fred@kanboard.net> | 2017-02-23 17:43:30 -0500 |
|---|---|---|
| committer | Frederic Guillot <fred@kanboard.net> | 2017-02-23 17:43:30 -0500 |
| commit | 6ae59a4f0e5a1b2a2f003335ca8afaa65e5f136a (patch) | |
| tree | 87e234f4962093e002a2f7395f1c725482b82366 /app | |
| parent | 437fc1b7d9d8a510342d16fc8f68fdb369e6ad8a (diff) | |
| parent | 6f649b7d21e6f04518e51642aed14d1c4f0ddca8 (diff) | |
Merge pull-request #2975
Diffstat (limited to 'app')
| -rw-r--r-- | app/Template/board/table_column.php | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/app/Template/board/table_column.php b/app/Template/board/table_column.php index df16715f..c2d6b9fc 100644 --- a/app/Template/board/table_column.php +++ b/app/Template/board/table_column.php @@ -53,17 +53,26 @@ <?php endif ?> </span> - <?php if (! $not_editable && ! empty($column['description'])): ?> - <span class="tooltip pull-right" title="<?= $this->text->markdownAttribute($column['description']) ?>"> - <i class="fa fa-info-circle"></i> - </span> - <?php endif ?> + <span class="pull-right"> + <?php if ($swimlane['nb_swimlanes'] > 1 && ! empty($column['column_score'])): ?> + <span title="<?= t('Total score in this column across all swimlanes') ?>"> + (<span><?= $column['column_score'] ?></span>) + </span> + <?php endif ?> - <?php if (! empty($column['score'])): ?> - <span class="pull-right" title="<?= t('Score') ?>"> - <?= $column['score'] ?> - </span> - <?php endif ?> + <?php if (! empty($column['score'])): ?> + <span title="<?= t('Score') ?>"> + <?= $column['score'] ?> + </span> + <?php endif ?> + + <?php if (! $not_editable && ! empty($column['description'])): ?> + <span class="tooltip" title="<?= $this->text->markdownAttribute($column['description']) ?>"> + <i class="fa fa-info-circle"></i> + </span> + <?php endif ?> + + </span> <?php if ($column['task_limit']): ?> <span title="<?= t('Task limit') ?>"> |