diff options
Diffstat (limited to 'app/Template')
-rw-r--r-- | app/Template/subtask/create.php (renamed from app/Template/subtask_create.php) | 4 | ||||
-rw-r--r-- | app/Template/subtask/edit.php (renamed from app/Template/subtask_edit.php) | 4 | ||||
-rw-r--r-- | app/Template/subtask/remove.php (renamed from app/Template/subtask_remove.php) | 5 | ||||
-rw-r--r-- | app/Template/subtask/show.php (renamed from app/Template/subtask_show.php) | 0 | ||||
-rw-r--r-- | app/Template/task_show.php | 2 |
5 files changed, 8 insertions, 7 deletions
diff --git a/app/Template/subtask_create.php b/app/Template/subtask/create.php index c8ee556b..40a6da3d 100644 --- a/app/Template/subtask_create.php +++ b/app/Template/subtask/create.php @@ -2,7 +2,7 @@ <h2><?= t('Add a sub-task') ?></h2> </div> -<form method="post" action="?controller=subtask&action=save&task_id=<?= $task['id'] ?>" autocomplete="off"> +<form method="post" action="<?= Helper\u('subtask', 'save', array('task_id' => $task['id'])) ?>" autocomplete="off"> <?= Helper\form_csrf() ?> @@ -22,6 +22,6 @@ <div class="form-actions"> <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/> <?= t('or') ?> - <a href="?controller=task&action=show&task_id=<?= $task['id'] ?>"><?= t('cancel') ?></a> + <?= Helper\a(t('cancel'), 'task', 'show', array('task_id' => $task['id'])) ?> </div> </form> diff --git a/app/Template/subtask_edit.php b/app/Template/subtask/edit.php index 91690d0a..88ea6175 100644 --- a/app/Template/subtask_edit.php +++ b/app/Template/subtask/edit.php @@ -2,7 +2,7 @@ <h2><?= t('Edit a sub-task') ?></h2> </div> -<form method="post" action="?controller=subtask&action=update&task_id=<?= $task['id'] ?>&subtask_id=<?= $subtask['id'] ?>" autocomplete="off"> +<form method="post" action="<?= Helper\u('subtask', 'update', array('task_id' => $task['id'], 'subtask_id' => $subtask['id'])) ?>" autocomplete="off"> <?= Helper\form_csrf() ?> @@ -27,6 +27,6 @@ <div class="form-actions"> <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/> <?= t('or') ?> - <a href="?controller=task&action=show&task_id=<?= $task['id'] ?>"><?= t('cancel') ?></a> + <?= Helper\a(t('cancel'), 'task', 'show', array('task_id' => $task['id'])) ?> </div> </form> diff --git a/app/Template/subtask_remove.php b/app/Template/subtask/remove.php index 12c99cf1..74245a7a 100644 --- a/app/Template/subtask_remove.php +++ b/app/Template/subtask/remove.php @@ -10,7 +10,8 @@ <p><strong><?= Helper\escape($subtask['title']) ?></strong></p> <div class="form-actions"> - <a href="?controller=subtask&action=remove&task_id=<?= $task['id'] ?>&subtask_id=<?= $subtask['id'].Helper\param_csrf() ?>" class="btn btn-red"><?= t('Yes') ?></a> - <?= t('or') ?> <a href="?controller=task&action=show&task_id=<?= $task['id'] ?>#subtasks"><?= t('cancel') ?></a> + <?= Helper\a(t('Yes'), 'subtask', 'remove', array('task_id' => $task['id'], 'subtask_id' => $subtask['id']), true, 'btn btn-red') ?> + <?= t('or') ?> + <?= Helper\a(t('cancel'), 'task', 'show', array('task_id' => $task['id'])) ?> </div> </div>
\ No newline at end of file diff --git a/app/Template/subtask_show.php b/app/Template/subtask/show.php index 686b160e..686b160e 100644 --- a/app/Template/subtask_show.php +++ b/app/Template/subtask/show.php diff --git a/app/Template/task_show.php b/app/Template/task_show.php index a4b49cef..d1264d2e 100644 --- a/app/Template/task_show.php +++ b/app/Template/task_show.php @@ -1,7 +1,7 @@ <?= Helper\template('task_details', array('task' => $task, 'project' => $project)) ?> <?= Helper\template('task_time', array('values' => $values, 'date_format' => $date_format, 'date_formats' => $date_formats)) ?> <?= Helper\template('task_show_description', array('task' => $task)) ?> -<?= Helper\template('subtask_show', array('task' => $task, 'subtasks' => $subtasks)) ?> +<?= Helper\template('subtask/show', array('task' => $task, 'subtasks' => $subtasks)) ?> <?= Helper\template('task_timesheet', array('timesheet' => $timesheet)) ?> <?= Helper\template('file/show', array('task' => $task, 'files' => $files)) ?> <?= Helper\template('task_comments', array('task' => $task, 'comments' => $comments, 'project' => $project)) ?>
\ No newline at end of file |