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

Merge pull-request #2975

Browse Source
This commit is contained in:
Frederic Guillot
2017-02-23 17:43:30 -05:00
parent 437fc1b7d9 6f649b7d21
commit 6ae59a4f0e
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/Template/board/table_column.php
View File

@@ -53,18 +53,27 @@
<?php endif ?> <?php endif ?>
</span> </span>
<?php if (! $not_editable && ! empty($column['description'])): ?> <span class="pull-right">
<span class="tooltip pull-right" title="<?= $this->text->markdownAttribute($column['description']) ?>"> <?php if ($swimlane['nb_swimlanes'] > 1 && ! empty($column['column_score'])): ?>
&nbsp;<i class="fa fa-info-circle"></i> <span title="<?= t('Total score in this column across all swimlanes') ?>">
(<span><?= $column['column_score'] ?></span>)
</span> </span>
<?php endif ?> <?php endif ?>
<?php if (! empty($column['score'])): ?> <?php if (! empty($column['score'])): ?>
<span class="pull-right" title="<?= t('Score') ?>"> <span title="<?= t('Score') ?>">
<?= $column['score'] ?> <?= $column['score'] ?>
</span> </span>
<?php endif ?> <?php endif ?>
<?php if (! $not_editable && ! empty($column['description'])): ?>
<span class="tooltip" title="<?= $this->text->markdownAttribute($column['description']) ?>">
&nbsp;<i class="fa fa-info-circle"></i>
</span>
<?php endif ?>
</span>
<?php if ($column['task_limit']): ?> <?php if ($column['task_limit']): ?>
<span title="<?= t('Task limit') ?>"> <span title="<?= t('Task limit') ?>">
(<span id="task-number-column-<?= $column['id'] ?>"><?= $column['nb_tasks'] ?></span>/<?= $this->text->e($column['task_limit']) ?>) (<span id="task-number-column-<?= $column['id'] ?>"><?= $column['nb_tasks'] ?></span>/<?= $this->text->e($column['task_limit']) ?>)