diff options
| author | Frédéric Guillot <fred@kanboard.net> | 2014-09-01 21:10:27 -0800 |
|---|---|---|
| committer | Frédéric Guillot <fred@kanboard.net> | 2014-09-01 21:10:27 -0800 |
| commit | 7bb09c3f9b3440cf297104f32e80050601d61533 (patch) | |
| tree | 3d5f2d014ffcabd3fd674d116ee1e3053aad527e /app/Templates | |
| parent | 457e181ffb915e36e5da77317a6c824e10f5d5b3 (diff) | |
Improve task controller and fix bug description popover
Diffstat (limited to 'app/Templates')
| -rw-r--r-- | app/Templates/board_task.php | 2 | ||||
| -rw-r--r-- | app/Templates/task_close.php | 2 | ||||
| -rw-r--r-- | app/Templates/task_edit_description.php | 2 | ||||
| -rw-r--r-- | app/Templates/task_open.php | 2 | ||||
| -rw-r--r-- | app/Templates/task_remove.php | 2 | ||||
| -rw-r--r-- | app/Templates/task_sidebar.php | 8 |
6 files changed, 9 insertions, 9 deletions
diff --git a/app/Templates/board_task.php b/app/Templates/board_task.php index 0bc96579..4370558b 100644 --- a/app/Templates/board_task.php +++ b/app/Templates/board_task.php @@ -69,7 +69,7 @@ <?php endif ?> <?php if (! empty($task['description'])): ?> - <a class="task-board-popover" href='?controller=task&action=editDescription&task_id=<?= $task['id'] ?>'><i class="fa fa-file-text-o" title="<?= t('Description') ?>"></i></a> + <a class="task-description-popover" href="?controller=task&action=description&task_id=<?= $task['id'] ?>"><i class="fa fa-file-text-o" title="<?= t('Description') ?>" data-href="?controller=task&action=description&task_id=<?= $task['id'] ?>"></i></a> <?php endif ?> </div> </div> diff --git a/app/Templates/task_close.php b/app/Templates/task_close.php index 5c75b72b..2abfd032 100644 --- a/app/Templates/task_close.php +++ b/app/Templates/task_close.php @@ -8,7 +8,7 @@ </p> <div class="form-actions"> - <a href="?controller=task&action=close&task_id=<?= $task['id'].Helper\param_csrf() ?>" class="btn btn-red"><?= t('Yes') ?></a> + <a href="?controller=task&action=close&confirmation=yes&task_id=<?= $task['id'].Helper\param_csrf() ?>" class="btn btn-red"><?= t('Yes') ?></a> <?= t('or') ?> <a href="?controller=task&action=show&task_id=<?= $task['id'] ?>"><?= t('cancel') ?></a> </div> </div>
\ No newline at end of file diff --git a/app/Templates/task_edit_description.php b/app/Templates/task_edit_description.php index d403190f..2d2a4d0b 100644 --- a/app/Templates/task_edit_description.php +++ b/app/Templates/task_edit_description.php @@ -2,7 +2,7 @@ <h2><?= t('Edit the description') ?></h2> </div> -<form method="post" action="?controller=task&action=saveDescription&task_id=<?= $task['id'] ?>&ajax=<?= $ajax ?>" autocomplete="off"> +<form method="post" action="?controller=task&action=description&task_id=<?= $task['id'] ?>&ajax=<?= $ajax ?>" autocomplete="off"> <?= Helper\form_csrf() ?> diff --git a/app/Templates/task_open.php b/app/Templates/task_open.php index 3526ec81..d28970e3 100644 --- a/app/Templates/task_open.php +++ b/app/Templates/task_open.php @@ -8,7 +8,7 @@ </p> <div class="form-actions"> - <a href="?controller=task&action=open&task_id=<?= $task['id'].Helper\param_csrf() ?>" class="btn btn-red"><?= t('Yes') ?></a> + <a href="?controller=task&action=open&confirmation=yes&task_id=<?= $task['id'].Helper\param_csrf() ?>" class="btn btn-red"><?= t('Yes') ?></a> <?= t('or') ?> <a href="?controller=task&action=show&task_id=<?= $task['id'] ?>"><?= t('cancel') ?></a> </div> </div>
\ No newline at end of file diff --git a/app/Templates/task_remove.php b/app/Templates/task_remove.php index dd4841db..496ac2d8 100644 --- a/app/Templates/task_remove.php +++ b/app/Templates/task_remove.php @@ -8,7 +8,7 @@ </p> <div class="form-actions"> - <a href="?controller=task&action=remove&task_id=<?= $task['id'].Helper\param_csrf() ?>" class="btn btn-red"><?= t('Yes') ?></a> + <a href="?controller=task&action=remove&confirmation=yes&task_id=<?= $task['id'].Helper\param_csrf() ?>" class="btn btn-red"><?= t('Yes') ?></a> <?= t('or') ?> <a href="?controller=task&action=show&task_id=<?= $task['id'] ?>"><?= t('cancel') ?></a> </div> </div>
\ No newline at end of file diff --git a/app/Templates/task_sidebar.php b/app/Templates/task_sidebar.php index 5d93d7b1..4d363fec 100644 --- a/app/Templates/task_sidebar.php +++ b/app/Templates/task_sidebar.php @@ -4,7 +4,7 @@ <ul> <li><a href="?controller=task&action=show&task_id=<?= $task['id'] ?>"><?= t('Summary') ?></a></li> <li><a href="?controller=task&action=edit&task_id=<?= $task['id'] ?>"><?= t('Edit the task') ?></a></li> - <li><a href="?controller=task&action=editDescription&task_id=<?= $task['id'] ?>"><?= t('Edit the description') ?></a></li> + <li><a href="?controller=task&action=description&task_id=<?= $task['id'] ?>"><?= t('Edit the description') ?></a></li> <li><a href="?controller=subtask&action=create&task_id=<?= $task['id'] ?>"><?= t('Add a sub-task') ?></a></li> <li><a href="?controller=comment&action=create&task_id=<?= $task['id'] ?>"><?= t('Add a comment') ?></a></li> <li><a href="?controller=file&action=create&task_id=<?= $task['id'] ?>"><?= t('Attach a document') ?></a></li> @@ -13,12 +13,12 @@ <li><a href="?controller=task&action=move&project_id=<?= $task['project_id'] ?>&task_id=<?= $task['id'] ?>"><?= t('Move to another project') ?></a></li> <li> <?php if ($task['is_active'] == 1): ?> - <a href="?controller=task&action=confirmClose&task_id=<?= $task['id'] ?>"><?= t('Close this task') ?></a> + <a href="?controller=task&action=close&task_id=<?= $task['id'] ?>"><?= t('Close this task') ?></a> <?php else: ?> - <a href="?controller=task&action=confirmOpen&task_id=<?= $task['id'] ?>"><?= t('Open this task') ?></a> + <a href="?controller=task&action=open&task_id=<?= $task['id'] ?>"><?= t('Open this task') ?></a> <?php endif ?> </li> - <li><a href="?controller=task&action=confirmRemove&task_id=<?= $task['id'] ?>"><?= t('Remove') ?></a></li> + <li><a href="?controller=task&action=remove&task_id=<?= $task['id'] ?>"><?= t('Remove') ?></a></li> </ul> </div> </div>
\ No newline at end of file |