summaryrefslogtreecommitdiff
path: root/app/Template/task_status
diff options
context:
space:
mode:
authorFrederic Guillot <fred@kanboard.net>2015-09-26 15:03:15 -0400
committerFrederic Guillot <fred@kanboard.net>2015-09-26 15:03:15 -0400
commit02106b474710444cb02f87859c8f0dee8c8bd077 (patch)
tree4ce3d9aac1927d76ec86f672769c7c968a9b686d /app/Template/task_status
parent97430b94654ab93abe019d7e98f82f81bd3f7899 (diff)
Show "Open this task" in dropdown menu for closed tasks
Diffstat (limited to 'app/Template/task_status')
-rw-r--r--app/Template/task_status/close.php2
-rw-r--r--app/Template/task_status/open.php6
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