From e41254ed746f543dd23f8ace60b37d776c2257b3 Mon Sep 17 00:00:00 2001
From: Manfred Hoffmann <48651533+manne65-hd@users.noreply.github.com>
Date: Thu, 22 Apr 2021 05:29:58 +0200
Subject: [PATCH] Use consistent swimlane and column headers

Column headers now always appear above the swimlane header to allow the collapsing to work correctly.

Having the swimlane headers above column headers should be better but the current HTML/CSS implementation is limited.
---
 app/Template/board/table_container.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/Template/board/table_container.php b/app/Template/board/table_container.php
index 2289eaf05..712ba7303 100644
--- a/app/Template/board/table_container.php
+++ b/app/Template/board/table_container.php
@@ -21,8 +21,14 @@
         <?php foreach ($swimlanes as $index => $swimlane): ?>
             <?php if (! ($swimlane['nb_tasks'] === 0 && isset($not_editable))): ?>
 
-                <!-- Note: Do not show swimlane row on the top otherwise we can't collapse columns -->
-                <?php if ($index > 0 && $swimlane['nb_swimlanes'] > 1): ?>
+                <!-- Note: Columns must render first otherwise we can't collapse them -->
+                <?= $this->render('board/table_column', array(
+                    'swimlane' => $swimlane,
+                    'not_editable' => isset($not_editable),
+                )) ?>
+
+                <!-- Hide first swimlane-header if project has only 1 swimlane -->
+                <?php if ($index === 0 && $swimlane['nb_swimlanes'] > 1): ?>
                     <?= $this->render('board/table_swimlane', array(
                         'project' => $project,
                         'swimlane' => $swimlane,
@@ -30,12 +36,7 @@
                     )) ?>
                 <?php endif ?>
 
-                <?= $this->render('board/table_column', array(
-                    'swimlane' => $swimlane,
-                    'not_editable' => isset($not_editable),
-                )) ?>
-
-                <?php if ($index === 0 && $swimlane['nb_swimlanes'] > 1): ?>
+                <?php if ($index > 0 && $swimlane['nb_swimlanes'] > 1): ?>
                     <?= $this->render('board/table_swimlane', array(
                         'project' => $project,
                         'swimlane' => $swimlane,