Merge branch 'master' of https://github.com/fguillot/kanboard into 1245_bug_with_subtask_timer

16 files changed, 195 insertions, 122 deletions

diff --git a/app/Template/board/table_column.php b/app/Template/board/table_column.php
new file mode 100644
index 00000000..da8db52d
--- /dev/null
+++ b/app/Template/board/table_column.php
@@ -0,0 +1,51 @@
+<!-- column titles -->
+<?php  ?>
+<tr>
+    <?php foreach ($swimlane['columns'] as $column): ?>
+    <th class="board-column-header board-column-header-<?= $column['id'] ?>" data-column-id="<?= $column['id'] ?>">
+
+        <!-- column in collapsed mode -->
+        <div class="board-column-collapsed">
+            <span title="<?= t('Task count') ?>" class="board-column-header-task-count" title="<?= t('Show this column') ?>">
+                <span id="task-number-column-<?= $column['id'] ?>"><?= $column['nb_column_tasks'] ?></span>
+            </span>
+        </div>
+
+        <!-- column in expanded mode -->
+        <div class="board-column-expanded">
+            <?php if (! $not_editable): ?>
+                <div class="board-add-icon">
+                    <?= $this->url->link('+', 'taskcreation', 'create', array('project_id' => $column['project_id'], 'column_id' => $column['id'], 'swimlane_id' => $swimlane['id']), false, 'popover', t('Add a new task')) ?>
+                </div>
+            <?php endif ?>
+
+            <span class="board-column-title" data-column-id="<?= $column['id'] ?>" title="<?= t('Hide this column') ?>">
+                <?= $this->e($column['title']) ?>
+            </span>
+
+            <?php if (! $not_editable && ! empty($column['description'])): ?>
+                <span class="tooltip pull-right" title='<?= $this->e($this->text->markdown($column['description'])) ?>'>
+                    <i class="fa fa-info-circle"></i>
+                </span>
+            <?php endif ?>
+
+            <?php if (! empty($column['score'])): ?>
+                <span class="pull-right" title="<?= t('Score') ?>">
+                    <?= $column['total_score'] ?>
+                </span>
+            <?php endif ?>
+
+            <span title="<?= t('Total number of tasks in this column across all swimlanes') ?>" class="board-column-header-task-count">
+                (<span id="task-number-column-<?= $column['id'] ?>"><?= $column['nb_column_tasks'] ?></span>)
+            </span>
+
+            <?php if ($column['task_limit']): ?>
+                <span title="<?= t('Task limit') ?>">
+                    (<span id="task-number-column-<?= $column['id'] ?>"><?= $this->e($column['task_limit']) ?></span>)
+                </span>
+            <?php endif ?>
+        </div>
+
+    </th>
+    <?php endforeach ?>
+</tr>
diff --git a/app/Template/board/table_container.php b/app/Template/board/table_container.php
index 98b40eb4..83587c44 100644
--- a/app/Template/board/table_container.php
+++ b/app/Template/board/table_container.php
@@ -13,18 +13,37 @@
         >
     <?php endif ?>
 
-    <?php foreach ($swimlanes as $swimlane): ?>
+    <?php foreach ($swimlanes as $index => $swimlane): ?>
         <?php if (empty($swimlane['columns'])): ?>
             <p class="alert alert-error"><?= t('There is no column in your project!') ?></p>
             <?php break ?>
         <?php else: ?>
-            <?= $this->render('board/table_swimlane', array(
-                'project' => $project,
-                'swimlane' => $swimlane,
-                'board_highlight_period' => $board_highlight_period,
-                'hide_swimlane' => count($swimlanes) === 1,
-                'not_editable' => isset($not_editable),
-            )) ?>
+            <?php if ($index === 0): ?>
+                <?= $this->render('board/table_column', array(
+                    'swimlane' => $swimlane,
+                    'not_editable' => isset($not_editable),
+                )) ?>
+            <?php endif ?>
+
+            <?php if (! ($swimlane['nb_tasks'] === 0 && isset($not_editable))): ?>
+
+                <?php if ($swimlane['nb_swimlanes'] > 1): ?>
+                    <?= $this->render('board/table_swimlane', array(
+                        'project' => $project,
+                        'swimlane' => $swimlane,
+                        'not_editable' => isset($not_editable),
+                    )) ?>
+                <?php endif ?>
+
+                <?= $this->render('board/table_tasks', array(
+                    'project' => $project,
+                    'swimlane' => $swimlane,
+                    'not_editable' => isset($not_editable),
+                    'board_highlight_period' => $board_highlight_period,
+                )) ?>
+
+            <?php endif ?>
+
         <?php endif ?>
     <?php endforeach ?>
     </table>
diff --git a/app/Template/board/table_swimlane.php b/app/Template/board/table_swimlane.php
index 1caa920d..dd38fc97 100644
--- a/app/Template/board/table_swimlane.php
+++ b/app/Template/board/table_swimlane.php
@@ -1,104 +1,26 @@
+<!-- swimlane -->
 <tr id="swimlane-<?= $swimlane['id'] ?>">
-    <!-- swimlane toggle -->
-    <?php if (! $hide_swimlane): ?>
-       <th class="board-swimlane-header">
-           <?php if (! $not_editable): ?>
-                <a href="#" class="board-swimlane-toggle" data-swimlane-id="<?= $swimlane['id'] ?>">
-                    <i class="fa fa-minus-circle hide-icon-swimlane-<?= $swimlane['id'] ?>"></i>
-                    <i class="fa fa-plus-circle show-icon-swimlane-<?= $swimlane['id'] ?>" style="display: none"></i>
-                </a>
-
-                <?php if (! empty($swimlane['description'])): ?>
-                    <span
-                        title="<?= t('Description') ?>"
-                        class="tooltip"
-                        data-href="<?= $this->url->href('board', 'swimlane', array('swimlane_id' => $swimlane['id'], 'project_id' => $project['id'])) ?>">
-                        <i class="fa fa-info-circle"></i>
-                    </span>
-                <?php endif ?>
-
-                <span title="<?= t('Task count') ?>" class="board-column-header-task-count swimlane-task-count-<?= $swimlane['id'] ?>">
-                    (<?= $swimlane['nb_tasks'] ?>)
-                </span>
-
-                <span class="board-swimlane-toggle-title show-icon-swimlane-<?= $swimlane['id'] ?>"><?= $this->e($swimlane['name']) ?></span>
-           <?php endif ?>
-        </th>
-    <?php endif ?>
-
-    <!-- column header title -->
-    <?php foreach ($swimlane['columns'] as $column): ?>
-    <th class="board-column-header board-column-header-<?= $column['id'] ?>" data-column-id="<?= $column['id'] ?>">
-        <div class="board-column-collapsed">
-            <span title="<?= t('Task count') ?>" class="board-column-header-task-count" title="<?= t('Show this column') ?>">
-                <span id="task-number-column-<?= $column['id'] ?>"><?= $column['nb_tasks'] ?></span>
-            </span>
-        </div>
-        <div class="board-column-expanded">
-            <?php if (! $not_editable): ?>
-                <div class="board-add-icon">
-                    <?= $this->url->link('+', 'taskcreation', 'create', array('project_id' => $column['project_id'], 'column_id' => $column['id'], 'swimlane_id' => $swimlane['id']), false, 'popover', t('Add a new task')) ?>
-                </div>
-            <?php endif ?>
-
-            <span class="board-column-title" data-column-id="<?= $column['id'] ?>" title="<?= t('Hide this column') ?>">
-                <?= $this->e($column['title']) ?>
+   <th class="board-swimlane-header" colspan="<?= $swimlane['nb_columns'] ?>">
+        <?php if (! $not_editable): ?>
+            <a href="#" class="board-swimlane-toggle" data-swimlane-id="<?= $swimlane['id'] ?>">
+                <i class="fa fa-chevron-circle-up hide-icon-swimlane-<?= $swimlane['id'] ?>" title="<?= t('Collapse swimlane') ?>"></i>
+                <i class="fa fa-chevron-circle-down show-icon-swimlane-<?= $swimlane['id'] ?>" title="<?= t('Expand swimlane') ?>" style="display: none"></i>
+            </a>
+        <?php endif ?>
+
+        <?= $this->e($swimlane['name']) ?>
+
+        <?php if (! $not_editable && ! empty($swimlane['description'])): ?>
+            <span
+                title="<?= t('Description') ?>"
+                class="tooltip"
+                data-href="<?= $this->url->href('board', 'swimlane', array('swimlane_id' => $swimlane['id'], 'project_id' => $project['id'])) ?>">
+                <i class="fa fa-info-circle"></i>
             </span>
+        <?php endif ?>
 
-            <?php if (! $not_editable && ! empty($column['description'])): ?>
-                <span class="tooltip pull-right" title='<?= $this->e($this->text->markdown($column['description'])) ?>'>
-                    <i class="fa fa-info-circle"></i>
-                </span>
-            <?php endif ?>
-
-            <?php if (! empty($column['score'])): ?>
-                <span class="pull-right" title="<?= t('Score') ?>">
-                    <?= $column['score'] ?>&nbsp;
-                </span>
-            <?php endif ?>
-
-            <?php if ($column['task_limit']): ?>
-                <span title="<?= t('Task limit') ?>">
-                    (<span id="task-number-column-<?= $column['id'] ?>"><?= $column['nb_tasks'] ?></span>/<?= $this->e($column['task_limit']) ?>)
-                </span>
-            <?php else: ?>
-                <span title="<?= t('Task count') ?>" class="board-column-header-task-count">
-                    (<span id="task-number-column-<?= $column['id'] ?>"><?= $column['nb_tasks'] ?></span>)
-                </span>
-            <?php endif ?>
-        </div>
+        <span title="<?= t('Task count') ?>" class="board-column-header-task-count swimlane-task-count-<?= $swimlane['id'] ?>">
+            (<?= $swimlane['nb_tasks'] ?>)
+        </span>
     </th>
-    <?php endforeach ?>
 </tr>
-<tr class="board-swimlane swimlane-row-<?= $swimlane['id'] ?>">
-
-    <!-- swimlane title -->
-    <?php if (! $hide_swimlane): ?>
-        <th class="board-swimlane-title">
-            <?= $this->e($swimlane['name']) ?>
-        </th>
-    <?php endif ?>
-
-    <!-- task list -->
-    <?php foreach ($swimlane['columns'] as $column): ?>
-        <td class="board-column-<?= $column['id'] ?> <?= $column['task_limit'] && $column['nb_tasks'] > $column['task_limit'] ? 'board-task-list-limit' : '' ?>">
-            <div class="board-task-list board-column-expanded" data-column-id="<?= $column['id'] ?>" data-swimlane-id="<?= $swimlane['id'] ?>" data-task-limit="<?= $column['task_limit'] ?>">
-                <?php foreach ($column['tasks'] as $task): ?>
-                    <?= $this->render($not_editable ? 'board/task_public' : 'board/task_private', array(
-                        'project' => $project,
-                        'task' => $task,
-                        'board_highlight_period' => $board_highlight_period,
-                        'not_editable' => $not_editable,
-                    )) ?>
-                <?php endforeach ?>
-            </div>
-            <div class="board-column-collapsed">
-                <div class="board-rotation-wrapper">
-                    <div class="board-column-title board-rotation" data-column-id="<?= $column['id'] ?>" title="<?= t('Show this column') ?>">
-                        <?= $this->e($column['title']) ?>
-                    </div>
-                </div>
-            </div>
-        </td>
-    <?php endforeach ?>
-</tr>
\ No newline at end of file
diff --git a/app/Template/board/table_tasks.php b/app/Template/board/table_tasks.php
new file mode 100644
index 00000000..edb4d323
--- /dev/null
+++ b/app/Template/board/table_tasks.php
@@ -0,0 +1,31 @@
+<!-- task row -->
+<tr class="board-swimlane swimlane-row-<?= $swimlane['id'] ?>">
+    <?php foreach ($swimlane['columns'] as $column): ?>
+        <td class="
+            board-column-<?= $column['id'] ?>
+            <?= $column['task_limit'] > 0 && $column['nb_tasks'] > $column['task_limit'] ? 'board-task-list-limit' : '' ?>
+            ">
+
+            <!-- tasks list -->
+            <div class="board-task-list board-column-expanded" data-column-id="<?= $column['id'] ?>" data-swimlane-id="<?= $swimlane['id'] ?>" data-task-limit="<?= $column['task_limit'] ?>">
+                <?php foreach ($column['tasks'] as $task): ?>
+                    <?= $this->render($not_editable ? 'board/task_public' : 'board/task_private', array(
+                        'project' => $project,
+                        'task' => $task,
+                        'board_highlight_period' => $board_highlight_period,
+                        'not_editable' => $not_editable,
+                    )) ?>
+                <?php endforeach ?>
+            </div>
+
+            <!-- column in collapsed mode (rotated text) -->
+            <div class="board-column-collapsed">
+                <div class="board-rotation-wrapper">
+                    <div class="board-column-title board-rotation" data-column-id="<?= $column['id'] ?>" title="<?= t('Show this column') ?>">
+                        <i class="fa fa-chevron-circle-up tooltip" title="<?= $this->e($column['title']) ?>"></i> <?= $this->e($column['title']) ?>
+                    </div>
+                </div>
+            </div>
+        </td>
+    <?php endforeach ?>
+</tr>
diff --git a/app/Template/board/task_menu.php b/app/Template/board/task_menu.php
index 1434a1a0..3eb35705 100644
--- a/app/Template/board/task_menu.php
+++ b/app/Template/board/task_menu.php
@@ -8,6 +8,10 @@
         <li><i class="fa fa-comment-o fa-fw"></i>&nbsp;<?= $this->url->link(t('Add a comment'), 'comment', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?></li>
         <li><i class="fa fa-code-fork fa-fw"></i>&nbsp;<?= $this->url->link(t('Add a link'), 'tasklink', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?></li>
         <li><i class="fa fa-camera fa-fw"></i>&nbsp;<?= $this->url->link(t('Add a screenshot'), 'board', 'screenshot', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?></li>
-        <li><i class="fa fa-close fa-fw"></i>&nbsp;<?= $this->url->link(t('Close this task'), 'taskstatus', 'close', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'redirect' => 'board'), false, 'popover') ?></li>
+        <?php if ($task['is_active'] == 1): ?>
+            <li><i class="fa fa-close fa-fw"></i>&nbsp;<?= $this->url->link(t('Close this task'), 'taskstatus', 'close', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'redirect' => 'board'), false, 'popover') ?></li>
+        <?php else: ?>
+            <li><i class="fa fa-check-square-o fa-fw"></i>&nbsp;<?= $this->url->link(t('Open this task'), 'taskstatus', 'open', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'redirect' => 'board'), false, 'popover') ?></li>
+        <?php endif ?>
     </ul>
 </span>
\ No newline at end of file
diff --git a/app/Template/board/task_private.php b/app/Template/board/task_private.php
index a6c8a9e1..da993fdd 100644
--- a/app/Template/board/task_private.php
+++ b/app/Template/board/task_private.php
@@ -9,10 +9,11 @@
      data-task-url="<?= $this->url->href('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>">
 
     <div class="task-board-sort-handle" style="display: none;"><i class="fa fa-arrows-alt"></i></div>
-    <?= $this->render('board/task_menu', array('task' => $task)) ?>
 
-    <?php if ($this->board->isCollapsed($project['id'])): ?>
+    <?php if ($this->board->isCollapsed($task['project_id'])): ?>
         <div class="task-board-collapsed">
+            <?= $this->render('board/task_menu', array('task' => $task)) ?>
+
             <?php if (! empty($task['assignee_username'])): ?>
                 <span title="<?= $this->e($task['assignee_name'] ?: $task['assignee_username']) ?>">
                     <?= $this->e($this->user->getInitials($task['assignee_name'] ?: $task['assignee_username'])) ?>
@@ -22,6 +23,7 @@
         </div>
     <?php else: ?>
         <div class="task-board-expanded">
+            <?= $this->render('board/task_menu', array('task' => $task)) ?>
 
             <?php if ($task['reference']): ?>
             <span class="task-board-reference" title="<?= t('Reference') ?>">
@@ -29,9 +31,10 @@
             </span>
             <?php endif ?>
 
+            <?php if (! empty($task['owner_id'])): ?>
             <span class="task-board-user <?= $this->user->isCurrentUser($task['owner_id']) ? 'task-board-current-user' : '' ?>">
                 <?= $this->url->link(
-                    (! empty($task['owner_id']) ? ($task['assignee_name'] ?: $task['assignee_username']) : t('Nobody assigned')),
+                    $task['assignee_name'] ?: $task['assignee_username'],
                     'board',
                     'changeAssignee',
                     array('task_id' => $task['id'], 'project_id' => $task['project_id']),
@@ -40,6 +43,7 @@
                     t('Change assignee')
                 ) ?>
             </span>
+            <?php endif ?>
 
             <?php if ($task['is_active'] == 1): ?>
             <div class="task-board-days">
diff --git a/app/Template/board/tooltip_tasklinks.php b/app/Template/board/tooltip_tasklinks.php
index 25aa91aa..5991fecc 100644
--- a/app/Template/board/tooltip_tasklinks.php
+++ b/app/Template/board/tooltip_tasklinks.php
@@ -3,6 +3,7 @@
     <?php foreach($links as $link): ?>
         <li>
             <strong><?= t($link['label']) ?></strong>
+            [<i><?= $link['project_name'] ?></i>]
             <?= $this->url->link(
                 $this->e('#'.$link['task_id'].' - '.$link['title']),
                 'task', 'show', array('task_id' => $link['task_id'], 'project_id' => $link['project_id']),
diff --git a/app/Template/board/private_view.php b/app/Template/board/view_private.php
index d4c2c651..d4c2c651 100644
--- a/app/Template/board/private_view.php
+++ b/app/Template/board/view_private.php
diff --git a/app/Template/board/public_view.php b/app/Template/board/view_public.php
index aea72031..aea72031 100644
--- a/app/Template/board/public_view.php
+++ b/app/Template/board/view_public.php
diff --git a/app/Template/config/plugins.php b/app/Template/config/plugins.php
new file mode 100644
index 00000000..fea48d58
--- /dev/null
+++ b/app/Template/config/plugins.php
@@ -0,0 +1,30 @@
+<div class="page-header">
+    <h2><?= t('Plugins') ?></h2>
+</div>
+
+<?php if (empty($plugins)): ?>
+    <p class="alert"><?= t('There is no plugin loaded.') ?></p>
+<?php else: ?>
+    <table class="table-stripped">
+        <tr>
+            <th class="column-20"><?= t('Name') ?></th>
+            <th class="column-20"><?= t('Author') ?></th>
+            <th class="column-10"><?= t('Version') ?></th>
+            <th><?= t('Description') ?></th>
+        </tr>
+
+    <?php foreach($plugins as $plugin): ?>
+    <tr>
+        <td>
+            <?php if ($plugin->getPluginHomepage()): ?>
+                <a href="<?= $plugin->getPluginHomepage() ?>" target="_blank" rel="noreferrer"><?= $this->e($plugin->getPluginName()) ?></a>
+            <?php else: ?>
+                <?= $this->e($plugin->getPluginName()) ?>
+            <?php endif ?>
+        </td>
+        <td><?= $this->e($plugin->getPluginAuthor()) ?></td>
+        <td><?= $this->e($plugin->getPluginVersion()) ?></td>
+        <td><?= $this->e($plugin->getPluginDescription()) ?></td>
+    </tr>
+    <?php endforeach ?>
+<?php endif ?>
\ No newline at end of file
diff --git a/app/Template/config/sidebar.php b/app/Template/config/sidebar.php
index ed4f01e7..4195cde1 100644
--- a/app/Template/config/sidebar.php
+++ b/app/Template/config/sidebar.php
@@ -4,6 +4,9 @@
         <li <?= $this->app->getRouterAction() === 'index' ? 'class="active"' : '' ?>>
             <?= $this->url->link(t('About'), 'config', 'index') ?>
         </li>
+        <li <?= $this->app->getRouterAction() === 'plugins' ? 'class="active"' : '' ?>>
+            <?= $this->url->link(t('Plugins'), 'config', 'plugins') ?>
+        </li>
         <li <?= $this->app->getRouterAction() === 'application' ? 'class="active"' : '' ?>>
             <?= $this->url->link(t('Application settings'), 'config', 'application') ?>
         </li>
diff --git a/app/Template/project/filters.php b/app/Template/project/filters.php
index fa50b36a..5b9ac472 100644
--- a/app/Template/project/filters.php
+++ b/app/Template/project/filters.php
@@ -21,6 +21,14 @@
                     <i class="fa fa-arrows-h fa-fw"></i> <a href="#" class="filter-toggle-scrolling" title="<?= t('Keyboard shortcut: "%s"', 'c') ?>"><?= t('Horizontal scrolling') ?></a>
                 </span>
             </li>
+            <li>
+                <span class="filter-max-height" style="display: none">
+                    <i class="fa fa-arrows-v fa-fw"></i> <a href="#" class="filter-toggle-height"><?= t('Set maximum column height') ?></a>
+                </span>
+                <span class="filter-min-height">
+                    <i class="fa fa-arrows-v fa-fw"></i> <a href="#" class="filter-toggle-height"><?= t('Remove maximum column height') ?></a>
+                </span>
+            </li>
             <?php endif ?>
             <?= $this->render('project/dropdown', array('project' => $project)) ?>
         </ul>
@@ -59,10 +67,9 @@
             <div class="dropdown filters">
             <i class="fa fa-caret-down"></i> <a href="#" class="dropdown-menu"><?= t('Users') ?></a>
             <ul>
-                <li><a href="#" class="filter-helper" data-filter="status:open"><?= t('All users') ?></a></li>
-                <li><a href="#" class="filter-helper" data-filter="status:open assignee:nobody"><?= t('Not assigned') ?></a></li>
+                <li><a href="#" class="filter-helper" data-append-filter="assignee:nobody"><?= t('Not assigned') ?></a></li>
                 <?php foreach ($users_list as $user): ?>
-                    <li><a href="#" class="filter-helper" data-filter='status:open assignee:"<?= $this->e($user) ?>"'><?= $this->e($user) ?></a></li>
+                    <li><a href="#" class="filter-helper" data-append-filter='assignee:"<?= $this->e($user) ?>"'><?= $this->e($user) ?></a></li>
                 <?php endforeach ?>
             </ul>
             </div>
@@ -72,10 +79,9 @@
             <div class="dropdown filters">
             <i class="fa fa-caret-down"></i> <a href="#" class="dropdown-menu"><?= t('Categories') ?></a>
             <ul>
-                <li><a href="#" class="filter-helper" data-filter="status:open"><?= t('All categories') ?></a></li>
-                <li><a href="#" class="filter-helper" data-filter="status:open category:none"><?= t('No category') ?></a></li>
+                <li><a href="#" class="filter-helper" data-append-filter="category:none"><?= t('No category') ?></a></li>
                 <?php foreach ($categories_list as $category): ?>
-                    <li><a href="#" class="filter-helper" data-filter='status:open category:"<?= $this->e($category) ?>"'><?= $this->e($category) ?></a></li>
+                    <li><a href="#" class="filter-helper" data-append-filter='category:"<?= $this->e($category) ?>"'><?= $this->e($category) ?></a></li>
                 <?php endforeach ?>
             </ul>
             </div>
diff --git a/app/Template/swimlane/index.php b/app/Template/swimlane/index.php
index 797d2ca2..41ba788b 100644
--- a/app/Template/swimlane/index.php
+++ b/app/Template/swimlane/index.php
@@ -50,7 +50,7 @@
     <?= $this->form->hidden('id', $default_swimlane) ?>
 
     <?= $this->form->label(t('Rename'), 'default_swimlane') ?>
-    <?= $this->form->text('default_swimlane', $default_swimlane, array(), array('autofocus', 'required', 'maxlength="50"')) ?><br/>
+    <?= $this->form->text('default_swimlane', $default_swimlane, array(), array('required', 'maxlength="50"')) ?><br/>
 
     <?= $this->form->checkbox('show_default_swimlane', t('Show default swimlane'), 1, isset($default_swimlane['show_default_swimlane']) && $default_swimlane['show_default_swimlane'] == 1) ?>
 
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
diff --git a/app/Template/tasklink/show.php b/app/Template/tasklink/show.php
index 7125b11d..97a3a767 100644
--- a/app/Template/tasklink/show.php
+++ b/app/Template/tasklink/show.php
@@ -6,6 +6,7 @@
     <tr>
         <th class="column-20"><?= t('Label') ?></th>
         <th class="column-30"><?= t('Task') ?></th>
+        <th class="column-20"><?= t('Project') ?></th>
         <th><?= t('Column') ?></th>
         <th><?= t('Assignee') ?></th>
         <?php if (! isset($not_editable)): ?>
@@ -52,6 +53,7 @@
                     <strong><?= $this->e($link['task_time_estimated']).'h' ?></strong> <?= t('estimated') ?>
                 <?php endif ?>
             </td>
+            <td><?= $this->e($link['project_name']) ?></td>
             <td><?= $this->e($link['column_title']) ?></td>
             <td>
                 <?php if (! empty($link['task_assignee_username'])): ?>