diff options
| author | xavier.vidal <xavier.vidal@pc-0608-008.oficinas.atrapalo.com> | 2015-09-29 09:46:02 +0200 |
|---|---|---|
| committer | xavier.vidal <xavier.vidal@pc-0608-008.oficinas.atrapalo.com> | 2015-09-29 09:46:02 +0200 |
| commit | 118f265c11701d6e050650bd7eb8dd84508323ab (patch) | |
| tree | 7ea6b3bf8d14f46835773a16b910e202ce2fbaaf /app/Template/task_status | |
| parent | f6c1984bdd153d55731d18d57d95825c3298415c (diff) | |
| parent | 91eeeee6c511246df56b4720f69d450b8787dd03 (diff) | |
Merge branch 'master' into project_name_in_task_links
* master:
ajout captures pour les vues
essai intégration image
Append filters instead of replacing value for users and categories dropdowns
Do not show empty swimlanes in public view
Show complexity sum across all swimlanes
Show number of tasks for each column across all swimlanes
Fix regression (css)
Change swimlane layout to save space on the screen
Add the possibility to set/unset max column height (scrolling)
settings chapter
Add getPluginHomepage()
Add page to show the list of plugins
Do not use preventDefault() with .close-popover when there is no popover opened
Show "Open this task" in dropdown menu for closed tasks
Add contributor
Update app.css
Update popover.css
Show assignee on card only when someone is assigned
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 |