diff options
| author | Max Kamashev <kamashev@gollard.ru> | 2015-09-30 09:19:33 +0300 |
|---|---|---|
| committer | Max Kamashev <kamashev@gollard.ru> | 2015-09-30 09:19:33 +0300 |
| commit | cabcdc9d9e58d279ac6a5992ae5202568ed4d24e (patch) | |
| tree | eebdc4ec16eb7dc2ed0edd953321fa3e02869f34 /app/Template/task_status | |
| parent | 930406bf70e42413a83114b9530b3f63ccf9419f (diff) | |
| parent | 421e8751ebca5b566ecbd8d08e9d56b93ce81ffa (diff) | |
Merge branch 'master' of https://github.com/fguillot/kanboard into 1245_bug_with_subtask_timer
Diffstat (limited to 'app/Template/task_status')
| -rw-r--r-- | app/Template/task_status/close.php | 2 | ||||
| -rw-r--r-- | app/Template/task_status/open.php | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/Template/task_status/close.php b/app/Template/task_status/close.php index 4de3dcb2..d32863bd 100644 --- a/app/Template/task_status/close.php +++ b/app/Template/task_status/close.php @@ -4,7 +4,7 @@ <div class="confirm"> <p class="alert alert-info"> - <?= t('Do you really want to close the task "%s" as well as all subtasks?', $this->e($task['title'])) ?> + <?= t('Do you really want to close the task "%s" as well as all subtasks?', $task['title']) ?> </p> <div class="form-actions"> diff --git a/app/Template/task_status/open.php b/app/Template/task_status/open.php index 0043fdae..615b2464 100644 --- a/app/Template/task_status/open.php +++ b/app/Template/task_status/open.php @@ -4,12 +4,12 @@ <div class="confirm"> <p class="alert alert-info"> - <?= t('Do you really want to open this task: "%s"?', $this->e($task['title'])) ?> + <?= t('Do you really want to open this task: "%s"?', $task['title']) ?> </p> <div class="form-actions"> - <?= $this->url->link(t('Yes'), 'taskstatus', 'open', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'confirmation' => 'yes'), true, 'btn btn-red') ?> + <?= $this->url->link(t('Yes'), 'taskstatus', 'open', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'confirmation' => 'yes', 'redirect' => $redirect), true, 'btn btn-red') ?> <?= t('or') ?> - <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> + <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> </div> </div>
\ No newline at end of file |