Add dropdown menu on each board column title to close all tasks

5 files changed, 66 insertions, 34 deletions

diff --git a/app/Template/board/popover_assignee.php b/app/Template/board/popover_assignee.php
index f395113c..e86ba420 100644
--- a/app/Template/board/popover_assignee.php
+++ b/app/Template/board/popover_assignee.php
@@ -1,21 +1,21 @@
 <section id="main">
-    <section>
-        <h3><?= t('Change assignee for the task "%s"', $values['title']) ?></h3>
-        <form method="post" action="<?= $this->url->href('BoardPopover', 'updateAssignee', array('task_id' => $values['id'], 'project_id' => $values['project_id'])) ?>">
+    <div class="page-header">
+        <h2><?= t('Change assignee for the task "%s"', $values['title']) ?></h2>
+    </div>
+    <form method="post" action="<?= $this->url->href('BoardPopover', 'updateAssignee', array('task_id' => $values['id'], 'project_id' => $project['id'])) ?>">
 
-            <?= $this->form->csrf() ?>
+        <?= $this->form->csrf() ?>
 
-            <?= $this->form->hidden('id', $values) ?>
-            <?= $this->form->hidden('project_id', $values) ?>
+        <?= $this->form->hidden('id', $values) ?>
+        <?= $this->form->hidden('project_id', $values) ?>
 
-            <?= $this->form->label(t('Assignee'), 'owner_id') ?>
-            <?= $this->form->select('owner_id', $users_list, $values, array(), array('autofocus')) ?><br/>
+        <?= $this->form->label(t('Assignee'), 'owner_id') ?>
+        <?= $this->form->select('owner_id', $users_list, $values, array(), array('autofocus')) ?><br/>
 
-            <div class="form-actions">
-                <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
-                <?= t('or') ?>
-                <?= $this->url->link(t('cancel'), 'board', 'show', array('project_id' => $project['id']), false, 'close-popover') ?>
-            </div>
-        </form>
-    </section>
+        <div class="form-actions">
+            <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
+            <?= t('or') ?>
+            <?= $this->url->link(t('cancel'), 'board', 'show', array('project_id' => $project['id']), false, 'close-popover') ?>
+        </div>
+    </form>
 </section>
\ No newline at end of file
diff --git a/app/Template/board/popover_category.php b/app/Template/board/popover_category.php
index 8c2a273d..224ce8d1 100644
--- a/app/Template/board/popover_category.php
+++ b/app/Template/board/popover_category.php
@@ -1,21 +1,21 @@
 <section id="main">
-    <section>
-        <h3><?= t('Change category for the task "%s"', $values['title']) ?></h3>
-        <form method="post" action="<?= $this->url->href('BoardPopover', 'updateCategory', array('task_id' => $values['id'], 'project_id' => $values['project_id'])) ?>">
+    <div class="page-header">
+        <h2><?= t('Change category for the task "%s"', $values['title']) ?></h2>
+    </div>
+    <form method="post" action="<?= $this->url->href('BoardPopover', 'updateCategory', array('task_id' => $values['id'], 'project_id' => $project['id'])) ?>">
 
-            <?= $this->form->csrf() ?>
+        <?= $this->form->csrf() ?>
 
-            <?= $this->form->hidden('id', $values) ?>
-            <?= $this->form->hidden('project_id', $values) ?>
+        <?= $this->form->hidden('id', $values) ?>
+        <?= $this->form->hidden('project_id', $values) ?>
 
-            <?= $this->form->label(t('Category'), 'category_id') ?>
-            <?= $this->form->select('category_id', $categories_list, $values, array(), array('autofocus')) ?><br/>
+        <?= $this->form->label(t('Category'), 'category_id') ?>
+        <?= $this->form->select('category_id', $categories_list, $values, array(), array('autofocus')) ?><br/>
 
-            <div class="form-actions">
-                <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
-                <?= t('or') ?>
-                <?= $this->url->link(t('cancel'), 'board', 'show', array('project_id' => $project['id']), false, 'close-popover') ?>
-            </div>
-        </form>
-    </section>
+        <div class="form-actions">
+            <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
+            <?= t('or') ?>
+            <?= $this->url->link(t('cancel'), 'board', 'show', array('project_id' => $project['id']), false, 'close-popover') ?>
+        </div>
+    </form>
 </section>
\ No newline at end of file
diff --git a/app/Template/board/popover_close_all_tasks_column.php b/app/Template/board/popover_close_all_tasks_column.php
new file mode 100644
index 00000000..da6b9ad7
--- /dev/null
+++ b/app/Template/board/popover_close_all_tasks_column.php
@@ -0,0 +1,18 @@
+<section id="main">
+    <div class="page-header">
+        <h2><?= t('Do you really want to close all tasks of this column?') ?></h2>
+    </div>
+    <form method="post" action="<?= $this->url->href('BoardPopover', 'closeColumnTasks', array('project_id' => $project['id'])) ?>">
+        <?= $this->form->csrf() ?>
+        <?= $this->form->hidden('column_id', $values) ?>
+        <?= $this->form->hidden('swimlane_id', $values) ?>
+
+        <p class="alert"><?= t('%d task(s) in the column "%s" and the swimlane "%s" will be closed.', $nb_tasks, $column, $swimlane) ?></p>
+
+        <div class="form-actions">
+            <input type="submit" value="<?= t('Save') ?>" class="btn btn-red">
+            <?= t('or') ?>
+            <?= $this->url->link(t('cancel'), 'board', 'show', array('project_id' => $project['id']), false, 'close-popover') ?>
+        </div>
+    </form>
+</section>
\ No newline at end of file
diff --git a/app/Template/board/table_column.php b/app/Template/board/table_column.php
index 10bcfa08..b345c04e 100644
--- a/app/Template/board/table_column.php
+++ b/app/Template/board/table_column.php
@@ -24,8 +24,22 @@
                 </span>
             <?php endif ?>
 
-            <span class="board-column-title" data-column-id="<?= $column['id'] ?>" title="<?= t('Hide this column') ?>">
-                <?= $this->e($column['title']) ?>
+            <span class="board-column-title">
+                <span class="dropdown">
+                    <a href="#" class="dropdown-menu"><?= $this->e($column['title']) ?> <i class="fa fa-caret-down"></i></a>
+                    <ul>
+                        <li>
+                            <i class="fa fa-minus-square fa-fw"></i>
+                            <a href="#" class="board-toggle-column-view" data-column-id="<?= $column['id'] ?>"><?= t('Hide this column') ?></a>
+                        </li>
+                        <?php if ($this->user->hasProjectAccess('BoardPopover', 'closeColumnTasks', $column['project_id']) && $column['nb_tasks'] > 0): ?>
+                            <li>
+                                <i class="fa fa-close fa-fw"></i>
+                                <?= $this->url->link(t('Close all tasks of this column'), 'BoardPopover', 'confirmCloseColumnTasks', array('project_id' => $column['project_id'], 'column_id' => $column['id'], 'swimlane_id' => $swimlane['id']), false, 'popover') ?>
+                            </li>
+                        <?php endif ?>
+                    </ul>
+                </span>
             </span>
 
             <?php if (! $not_editable && ! empty($column['description'])): ?>
diff --git a/app/Template/board/table_tasks.php b/app/Template/board/table_tasks.php
index f10d48e4..e99e14fb 100644
--- a/app/Template/board/table_tasks.php
+++ b/app/Template/board/table_tasks.php
@@ -21,8 +21,8 @@
             <!-- column in collapsed mode (rotated text) -->
             <div class="board-column-collapsed">
                 <div class="board-rotation-wrapper">
-                    <div class="board-column-title board-rotation" data-column-id="<?= $column['id'] ?>" title="<?= t('Show this column') ?>">
-                        <i class="fa fa-chevron-circle-up tooltip" title="<?= $this->e($column['title']) ?>"></i> <?= $this->e($column['title']) ?>
+                    <div class="board-column-title board-rotation board-toggle-column-view" data-column-id="<?= $column['id'] ?>" title="<?= t('Show this column') ?>">
+                        <i class="fa fa-plus-square tooltip" title="<?= $this->e($column['title']) ?>"></i> <?= $this->e($column['title']) ?>
                     </div>
                 </div>
             </div>