diff options
| author | Frédéric Guillot <fred@kanboard.net> | 2014-09-03 14:25:17 -0700 |
|---|---|---|
| committer | Frédéric Guillot <fred@kanboard.net> | 2014-09-03 14:25:17 -0700 |
| commit | 749136361e6eedbc868778db17bdc67aa0f3b677 (patch) | |
| tree | 78845b6f41fa69e4bc52c5e372689904ce8b5ac7 /app/Templates | |
| parent | d68ff648b1995c14506d4c61c9d97dc7f599496f (diff) | |
Change a category directly from the board
Diffstat (limited to 'app/Templates')
| -rw-r--r-- | app/Templates/board_assignee.php (renamed from app/Templates/board_assign.php) | 6 | ||||
| -rw-r--r-- | app/Templates/board_category.php | 24 | ||||
| -rw-r--r-- | app/Templates/board_task.php | 16 |
3 files changed, 36 insertions, 10 deletions
diff --git a/app/Templates/board_assign.php b/app/Templates/board_assignee.php index 45cb4b4f..41ede32b 100644 --- a/app/Templates/board_assign.php +++ b/app/Templates/board_assignee.php @@ -1,14 +1,12 @@ <section id="main"> <div class="page-header board"> - <h2> - <?= t('Project "%s"', $current_project_name) ?> - </h2> + <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&action=assignTask" autocomplete="off"> + <form method="post" action="?controller=board&action=updateAssignee" autocomplete="off"> <?= Helper\form_csrf() ?> <?= Helper\form_hidden('id', $values) ?> <?= Helper\form_hidden('project_id', $values) ?> 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&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&action=show&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&action=edit&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&action=assign&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&action=assign&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&action=changeAssignee&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&action=changeCategory&task_id=<?= $task['id'] ?>" title="<?= t('Change category') ?>"> + <?= Helper\in_list($task['category_id'], $categories) ?> + </a> </span> </div> <?php endif ?> |