From 749136361e6eedbc868778db17bdc67aa0f3b677 Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fred@kanboard.net>
Date: Wed, 3 Sep 2014 14:25:17 -0700
Subject: Change a category directly from the board

---
 app/Templates/board_assign.php   | 26 --------------------------
 app/Templates/board_assignee.php | 24 ++++++++++++++++++++++++
 app/Templates/board_category.php | 24 ++++++++++++++++++++++++
 app/Templates/board_task.php     | 16 ++++++++++------
 4 files changed, 58 insertions(+), 32 deletions(-)
 delete mode 100644 app/Templates/board_assign.php
 create mode 100644 app/Templates/board_assignee.php
 create mode 100644 app/Templates/board_category.php

(limited to 'app/Templates')

diff --git a/app/Templates/board_assign.php b/app/Templates/board_assign.php
deleted file mode 100644
index 45cb4b4f..00000000
--- a/app/Templates/board_assign.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<section id="main">
-
-    <div class="page-header board">
-        <h2>
-            <?= t('Project "%s"', $current_project_name) ?>
-        </h2>
-    </div>
-
-    <section>
-        <h3><?= t('Change assignee for the task "%s"', $values['title']) ?></h3>
-        <form method="post" action="?controller=board&amp;action=assignTask" autocomplete="off">
-            <?= Helper\form_csrf() ?>
-            <?= Helper\form_hidden('id', $values) ?>
-            <?= Helper\form_hidden('project_id', $values) ?>
-
-            <?= Helper\form_label(t('Assignee'), 'owner_id') ?>
-            <?= Helper\form_select('owner_id', $users_list, $values, $errors) ?><br/>
-
-            <div class="form-actions">
-                <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
-                <?= t('or') ?> <a href="?controller=board&amp;action=show&amp;project_id=<?= $values['project_id'] ?>"><?= t('cancel') ?></a>
-            </div>
-        </form>
-    </section>
-
-</section>
\ No newline at end of file
diff --git a/app/Templates/board_assignee.php b/app/Templates/board_assignee.php
new file mode 100644
index 00000000..41ede32b
--- /dev/null
+++ b/app/Templates/board_assignee.php
@@ -0,0 +1,24 @@
+<section id="main">
+
+    <div class="page-header board">
+        <h2><?= t('Project "%s"', $current_project_name) ?></h2>
+    </div>
+
+    <section>
+        <h3><?= t('Change assignee for the task "%s"', $values['title']) ?></h3>
+        <form method="post" action="?controller=board&amp;action=updateAssignee" autocomplete="off">
+            <?= Helper\form_csrf() ?>
+            <?= Helper\form_hidden('id', $values) ?>
+            <?= Helper\form_hidden('project_id', $values) ?>
+
+            <?= Helper\form_label(t('Assignee'), 'owner_id') ?>
+            <?= Helper\form_select('owner_id', $users_list, $values, $errors) ?><br/>
+
+            <div class="form-actions">
+                <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
+                <?= t('or') ?> <a href="?controller=board&amp;action=show&amp;project_id=<?= $values['project_id'] ?>"><?= t('cancel') ?></a>
+            </div>
+        </form>
+    </section>
+
+</section>
\ No newline at end of file
diff --git a/app/Templates/board_category.php b/app/Templates/board_category.php
new file mode 100644
index 00000000..36126a1d
--- /dev/null
+++ b/app/Templates/board_category.php
@@ -0,0 +1,24 @@
+<section id="main">
+
+    <div class="page-header board">
+        <h2><?= t('Project "%s"', $current_project_name) ?></h2>
+    </div>
+
+    <section>
+        <h3><?= t('Change category for the task "%s"', $values['title']) ?></h3>
+        <form method="post" action="?controller=board&amp;action=updateCategory" autocomplete="off">
+            <?= Helper\form_csrf() ?>
+            <?= Helper\form_hidden('id', $values) ?>
+            <?= Helper\form_hidden('project_id', $values) ?>
+
+            <?= Helper\form_label(t('Category'), 'category_id') ?>
+            <?= Helper\form_select('category_id', $categories_list, $values, $errors) ?><br/>
+
+            <div class="form-actions">
+                <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
+                <?= t('or') ?> <a href="?controller=board&amp;action=show&amp;project_id=<?= $values['project_id'] ?>"><?= t('cancel') ?></a>
+            </div>
+        </form>
+    </section>
+
+</section>
\ No newline at end of file
diff --git a/app/Templates/board_task.php b/app/Templates/board_task.php
index 4370558b..40590a65 100644
--- a/app/Templates/board_task.php
+++ b/app/Templates/board_task.php
@@ -23,11 +23,13 @@
     <a class="task-edit-popover" href="?controller=task&amp;action=edit&amp;task_id=<?= $task['id'] ?>" title="<?= t('Edit this task') ?>">#<?= $task['id'] ?></a> -
 
     <span class="task-board-user">
-    <?php if (! empty($task['owner_id'])): ?>
-        <a class="assignee-popover" href="?controller=board&amp;action=assign&amp;task_id=<?= $task['id'] ?>" title="<?= t('Change assignee') ?>"><?= t('Assigned to %s', $task['assignee_name'] ?: $task['assignee_username']) ?></a>
-    <?php else: ?>
-        <a class="assignee-popover" href="?controller=board&amp;action=assign&amp;task_id=<?= $task['id'] ?>" title="<?= t('Change assignee') ?>" class="task-board-nobody"><?= t('Nobody assigned') ?></a>
-    <?php endif ?>
+        <a class="assignee-popover" href="?controller=board&amp;action=changeAssignee&amp;task_id=<?= $task['id'] ?>" title="<?= t('Change assignee') ?>">
+        <?php if (! empty($task['owner_id'])): ?>
+            <?= t('Assigned to %s', $task['assignee_name'] ?: $task['assignee_username']) ?></a>
+        <?php else: ?>
+            <?= t('Nobody assigned') ?>
+        <?php endif ?>
+        </a>
     </span>
 
     <?php if ($task['score']): ?>
@@ -44,7 +46,9 @@
 <?php if ($task['category_id']): ?>
 <div class="task-board-category-container">
     <span class="task-board-category">
-        <?= Helper\in_list($task['category_id'], $categories) ?>
+        <a class="category-popover" href="?controller=board&amp;action=changeCategory&amp;task_id=<?= $task['id'] ?>" title="<?= t('Change category') ?>">
+            <?= Helper\in_list($task['category_id'], $categories) ?>
+        </a>
     </span>
 </div>
 <?php endif ?>
-- 
cgit v1.2.3