From 6c7c73613aeb25cf995f61e0acda7c648a1ddf55 Mon Sep 17 00:00:00 2001
From: Andrew Berzley <aberzley@berzley.engineering.signatureresearchinc.com>
Date: Mon, 20 Nov 2017 14:45:33 -0500
Subject: Changed board column headings to show swimlane-column total in bold.
 Also, board column total to be shown at end of column heading with limit
 across the sum of all swimlanes.

---
 app/Template/board/table_column.php | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'app/Template/board/table_column.php')

diff --git a/app/Template/board/table_column.php b/app/Template/board/table_column.php
index a9652a2b..f63438c3 100644
--- a/app/Template/board/table_column.php
+++ b/app/Template/board/table_column.php
@@ -19,11 +19,10 @@
                 <?= $this->task->getNewBoardTaskButton($swimlane, $column) ?>
             <?php endif ?>
 
-            <?php if ($swimlane['nb_swimlanes'] > 1 && ! 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>)
-                </span>
-            <?php endif ?>
+
+            <span title="<?= t('Task count') ?>">
+                (<span id="task-number-column-<?= $column['id'] ?>"><?= $column['nb_tasks'] ?></span>)
+            </span>
 
             <span class="board-column-title">
                 <?php if ($not_editable): ?>
@@ -75,16 +74,17 @@
 
             </span>
 
-            <?php if ($column['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>
-            <?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 ?>
-	    <?= $this->hook->render('template:board:column:header', array('swimlane' => $swimlane, 'column' => $column)) ?> 
+            <?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 endif ?>
+                )
+            </span>
+            <?php endif; ?>
+	    <?= $this->hook->render('template:board:column:header', array('swimlane' => $swimlane, 'column' => $column)) ?>
         </div>
 
     </th>
-- 
cgit v1.2.3