Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/Locale/ja_JP/translations.php

5 files changed, 6 insertions, 6 deletions

diff --git a/app/Template/board/table_column.php b/app/Template/board/table_column.php
index 9d2815ff..a9652a2b 100644
--- a/app/Template/board/table_column.php
+++ b/app/Template/board/table_column.php
@@ -16,9 +16,7 @@
         <!-- column in expanded mode -->
         <div class="board-column-expanded">
             <?php if (! $not_editable && $this->projectRole->canCreateTaskInColumn($column['project_id'], $column['id'])): ?>
-                <div class="board-add-icon">
-                    <?= $this->modal->largeIcon('plus', t('Add a new task'), 'TaskCreationController', 'show', array('project_id' => $column['project_id'], 'column_id' => $column['id'], 'swimlane_id' => $swimlane['id'])) ?>
-                </div>
+                <?= $this->task->getNewBoardTaskButton($swimlane, $column) ?>
             <?php endif ?>
 
             <?php if ($swimlane['nb_swimlanes'] > 1 && ! empty($column['column_nb_tasks'])): ?>
diff --git a/app/Template/board/task_footer.php b/app/Template/board/task_footer.php
index c78616e9..4ea5bb31 100644
--- a/app/Template/board/task_footer.php
+++ b/app/Template/board/task_footer.php
@@ -32,7 +32,7 @@
     <div class="task-board-icons-row">
         <?php if ($task['reference']): ?>
             <span class="task-board-reference" title="<?= t('Reference') ?>">
-                <?= $this->text->e($task['reference']) ?>
+                <?= $this->task->renderReference($task) ?>
             </span>
         <?php endif ?>
     </div>
diff --git a/app/Template/board/task_private.php b/app/Template/board/task_private.php
index 28e53473..ccf09932 100644
--- a/app/Template/board/task_private.php
+++ b/app/Template/board/task_private.php
@@ -19,6 +19,7 @@
             <div class="task-board-saving-icon" style="display: none;"><i class="fa fa-spinner fa-pulse"></i></div>
             <?php if ($this->user->hasProjectAccess('TaskModificationController', 'edit', $task['project_id'])): ?>
                 <?= $this->render('task/dropdown', array('task' => $task)) ?>
+                <?= $this->modal->large('edit', '', 'TaskModificationController', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
             <?php else: ?>
                 <strong><?= '#'.$task['id'] ?></strong>
             <?php endif ?>
@@ -36,6 +37,7 @@
             <div class="task-board-header">
                 <?php if ($this->user->hasProjectAccess('TaskModificationController', 'edit', $task['project_id'])): ?>
                     <?= $this->render('task/dropdown', array('task' => $task)) ?>
+                    <?= $this->modal->large('edit', '', 'TaskModificationController', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
                 <?php else: ?>
                     <strong><?= '#'.$task['id'] ?></strong>
                 <?php endif ?>
diff --git a/app/Template/task/details.php b/app/Template/task/details.php
index a42e09d1..3b4d4b38 100644
--- a/app/Template/task/details.php
+++ b/app/Template/task/details.php
@@ -22,7 +22,7 @@
                     </li>
                     <?php if (! empty($task['reference'])): ?>
                         <li>
-                            <strong><?= t('Reference:') ?></strong> <span><?= $this->text->e($task['reference']) ?></span>
+                            <strong><?= t('Reference:') ?></strong> <span><?= $this->task->renderReference($task) ?></span>
                         </li>
                     <?php endif ?>
                     <?php if (! empty($task['score'])): ?>
diff --git a/app/Template/task_list/task_icons.php b/app/Template/task_list/task_icons.php
index 03a891a2..d02c9021 100644
--- a/app/Template/task_list/task_icons.php
+++ b/app/Template/task_list/task_icons.php
@@ -1,7 +1,7 @@
 <div class="task-list-icons">
     <?php if ($task['reference']): ?>
         <span class="task-board-reference" title="<?= t('Reference') ?>">
-            <?= $this->text->e($task['reference']) ?>
+            <?= $this->task->renderReference($task) ?>
         </span>
     <?php endif ?>
     <?php if ($task['is_milestone'] == 1): ?>