From 4fb57006a08e06a344e1a2671b2c61490d472e7e Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Wed, 4 May 2016 22:08:42 -0400
Subject: Added generic controller for task popovers

---
 app/Template/board/popover_assignee.php              | 20 --------------------
 app/Template/board/popover_category.php              | 20 --------------------
 .../board/popover_close_all_tasks_column.php         | 18 ------------------
 app/Template/board/task_avatar.php                   |  2 +-
 .../board_popover/close_all_tasks_column.php         | 18 ++++++++++++++++++
 app/Template/task/dropdown.php                       |  6 +++---
 app/Template/task_popover/change_assignee.php        | 20 ++++++++++++++++++++
 app/Template/task_popover/change_category.php        | 20 ++++++++++++++++++++
 8 files changed, 62 insertions(+), 62 deletions(-)
 delete mode 100644 app/Template/board/popover_assignee.php
 delete mode 100644 app/Template/board/popover_category.php
 delete mode 100644 app/Template/board/popover_close_all_tasks_column.php
 create mode 100644 app/Template/board_popover/close_all_tasks_column.php
 create mode 100644 app/Template/task_popover/change_assignee.php
 create mode 100644 app/Template/task_popover/change_category.php

(limited to 'app/Template')

diff --git a/app/Template/board/popover_assignee.php b/app/Template/board/popover_assignee.php
deleted file mode 100644
index 87e16816..00000000
--- a/app/Template/board/popover_assignee.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<section id="main">
-    <div class="page-header">
-        <h2><?= t('Change assignee for the task "%s"', $values['title']) ?></h2>
-    </div>
-    <form class="popover-form" method="post" action="<?= $this->url->href('BoardPopover', 'updateAssignee', array('task_id' => $values['id'], 'project_id' => $project['id'])) ?>">
-
-        <?= $this->form->csrf() ?>
-
-        <?= $this->form->hidden('id', $values) ?>
-        <?= $this->form->hidden('project_id', $values) ?>
-
-        <?= $this->task->selectAssignee($users_list, $values, array(), array('autofocus')) ?>
-
-        <div class="form-actions">
-            <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
-            <?= 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
deleted file mode 100644
index e3794760..00000000
--- a/app/Template/board/popover_category.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<section id="main">
-    <div class="page-header">
-        <h2><?= t('Change category for the task "%s"', $values['title']) ?></h2>
-    </div>
-    <form class="popover-form" method="post" action="<?= $this->url->href('BoardPopover', 'updateCategory', array('task_id' => $values['id'], 'project_id' => $project['id'])) ?>">
-
-        <?= $this->form->csrf() ?>
-
-        <?= $this->form->hidden('id', $values) ?>
-        <?= $this->form->hidden('project_id', $values) ?>
-
-        <?= $this->task->selectCategory($categories_list, $values, array(), array('autofocus'), true) ?>
-
-        <div class="form-actions">
-            <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
-            <?= 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
deleted file mode 100644
index 5090f499..00000000
--- a/app/Template/board/popover_close_all_tasks_column.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<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">
-            <button type="submit" class="btn btn-red"><?= t('Save') ?></button>
-            <?= 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/task_avatar.php b/app/Template/board/task_avatar.php
index 39f6b54d..53739b19 100644
--- a/app/Template/board/task_avatar.php
+++ b/app/Template/board/task_avatar.php
@@ -3,7 +3,7 @@
     <span
         <?php if ($this->user->hasProjectAccess('taskmodification', 'edit', $task['project_id'])): ?>
         class="task-board-assignee task-board-change-assignee"
-        data-url="<?= $this->url->href('BoardPopover', 'changeAssignee', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>">
+        data-url="<?= $this->url->href('TaskPopover', 'changeAssignee', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>">
     <?php else: ?>
         class="task-board-assignee">
     <?php endif ?>
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..5090f499
--- /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">
+            <button type="submit" class="btn btn-red"><?= t('Save') ?></button>
+            <?= 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/task/dropdown.php b/app/Template/task/dropdown.php
index 567249df..9771b241 100644
--- a/app/Template/task/dropdown.php
+++ b/app/Template/task/dropdown.php
@@ -9,11 +9,11 @@
         <?php endif ?>
         <li>
             <i class="fa fa-user fa-fw"></i>
-            <?= $this->url->link(t('Change assignee'), 'BoardPopover', 'changeAssignee', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+            <?= $this->url->link(t('Change assignee'), 'TaskPopover', 'changeAssignee', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
         </li>
         <li>
             <i class="fa fa-tag fa-fw"></i>
-            <?= $this->url->link(t('Change category'), 'BoardPopover', 'changeCategory', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+            <?= $this->url->link(t('Change category'), 'TaskPopover', 'changeCategory', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
         </li>
         <li>
             <i class="fa fa-pencil-square-o fa-fw"></i>
@@ -41,7 +41,7 @@
         </li>
         <li>
             <i class="fa fa-camera fa-fw"></i>
-            <?= $this->url->link(t('Add a screenshot'), 'BoardPopover', 'screenshot', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+            <?= $this->url->link(t('Add a screenshot'), 'TaskPopover', 'screenshot', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
         </li>
         <li>
             <i class="fa fa-files-o fa-fw"></i>
diff --git a/app/Template/task_popover/change_assignee.php b/app/Template/task_popover/change_assignee.php
new file mode 100644
index 00000000..bf68c34d
--- /dev/null
+++ b/app/Template/task_popover/change_assignee.php
@@ -0,0 +1,20 @@
+<section id="main">
+    <div class="page-header">
+        <h2><?= t('Change assignee for the task "%s"', $values['title']) ?></h2>
+    </div>
+    <form class="popover-form" method="post" action="<?= $this->url->href('TaskPopover', 'updateAssignee', array('task_id' => $values['id'], 'project_id' => $project['id'])) ?>">
+
+        <?= $this->form->csrf() ?>
+
+        <?= $this->form->hidden('id', $values) ?>
+        <?= $this->form->hidden('project_id', $values) ?>
+
+        <?= $this->task->selectAssignee($users_list, $values, array(), array('autofocus')) ?>
+
+        <div class="form-actions">
+            <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
+            <?= t('or') ?>
+            <?= $this->url->link(t('cancel'), 'board', 'show', array('project_id' => $project['id']), false, 'close-popover') ?>
+        </div>
+    </form>
+</section>
diff --git a/app/Template/task_popover/change_category.php b/app/Template/task_popover/change_category.php
new file mode 100644
index 00000000..0364e660
--- /dev/null
+++ b/app/Template/task_popover/change_category.php
@@ -0,0 +1,20 @@
+<section id="main">
+    <div class="page-header">
+        <h2><?= t('Change category for the task "%s"', $values['title']) ?></h2>
+    </div>
+    <form class="popover-form" method="post" action="<?= $this->url->href('TaskPopover', 'updateCategory', array('task_id' => $values['id'], 'project_id' => $project['id'])) ?>">
+
+        <?= $this->form->csrf() ?>
+
+        <?= $this->form->hidden('id', $values) ?>
+        <?= $this->form->hidden('project_id', $values) ?>
+
+        <?= $this->task->selectCategory($categories_list, $values, array(), array('autofocus'), true) ?>
+
+        <div class="form-actions">
+            <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
+            <?= t('or') ?>
+            <?= $this->url->link(t('cancel'), 'board', 'show', array('project_id' => $project['id']), false, 'close-popover') ?>
+        </div>
+    </form>
+</section>
-- 
cgit v1.2.3