Merge branch 'master' of https://github.com/fguillot/kanboard into 1245_bug_with_subtask_timer

1 files changed, 27 insertions, 8 deletions

diff --git a/app/Template/board/table_container.php b/app/Template/board/table_container.php
index 98b40eb4..83587c44 100644
--- a/app/Template/board/table_container.php
+++ b/app/Template/board/table_container.php
@@ -13,18 +13,37 @@
         >
     <?php endif ?>
 
-    <?php foreach ($swimlanes as $swimlane): ?>
+    <?php foreach ($swimlanes as $index => $swimlane): ?>
         <?php if (empty($swimlane['columns'])): ?>
             <p class="alert alert-error"><?= t('There is no column in your project!') ?></p>
             <?php break ?>
         <?php else: ?>
-            <?= $this->render('board/table_swimlane', array(
-                'project' => $project,
-                'swimlane' => $swimlane,
-                'board_highlight_period' => $board_highlight_period,
-                'hide_swimlane' => count($swimlanes) === 1,
-                'not_editable' => isset($not_editable),
-            )) ?>
+            <?php if ($index === 0): ?>
+                <?= $this->render('board/table_column', array(
+                    'swimlane' => $swimlane,
+                    'not_editable' => isset($not_editable),
+                )) ?>
+            <?php endif ?>
+
+            <?php if (! ($swimlane['nb_tasks'] === 0 && isset($not_editable))): ?>
+
+                <?php if ($swimlane['nb_swimlanes'] > 1): ?>
+                    <?= $this->render('board/table_swimlane', array(
+                        'project' => $project,
+                        'swimlane' => $swimlane,
+                        'not_editable' => isset($not_editable),
+                    )) ?>
+                <?php endif ?>
+
+                <?= $this->render('board/table_tasks', array(
+                    'project' => $project,
+                    'swimlane' => $swimlane,
+                    'not_editable' => isset($not_editable),
+                    'board_highlight_period' => $board_highlight_period,
+                )) ?>
+
+            <?php endif ?>
+
         <?php endif ?>
     <?php endforeach ?>
     </table>