Merged branch 'master' of https://github.com/fguillot/kanboard

only imports conflicted

1 files changed, 45 insertions, 43 deletions

diff --git a/app/Template/board/task_private.php b/app/Template/board/task_private.php
index 87121f2c..7eaff580 100644
--- a/app/Template/board/task_private.php
+++ b/app/Template/board/task_private.php
@@ -10,53 +10,55 @@
 
     <?= $this->render('board/task_menu', array('task' => $task)) ?>
 
-    <div class="task-board-collapsed" style="display: none">
-        <?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'])) ?>
-            </span> -
-        <?php endif ?>
-        <span class="tooltip" title="<?= $this->e($task['title']) ?>"
-            <?= $this->url->link($this->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-collapsed-title') ?>
-        </span>
-    </div>
+    <?php if ($this->board->isCollapsed($project['id'])): ?>
+        <div class="task-board-collapsed">
+            <?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'])) ?>
+                </span> -
+            <?php endif ?>
+            <span class="tooltip" title="<?= $this->e($task['title']) ?>"
+                <?= $this->url->link($this->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-collapsed-title') ?>
+            </span>
+        </div>
+    <?php else: ?>
+        <div class="task-board-expanded">
 
-    <div class="task-board-expanded">
+            <?php if ($task['reference']): ?>
+            <span class="task-board-reference" title="<?= t('Reference') ?>">
+                (<?= $task['reference'] ?>)
+            </span>
+            <?php endif ?>
 
-        <?php if ($task['reference']): ?>
-        <span class="task-board-reference" title="<?= t('Reference') ?>">
-            (<?= $task['reference'] ?>)
-        </span>
-        <?php endif ?>
+            <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')),
+                    'board',
+                    'changeAssignee',
+                    array('task_id' => $task['id'], 'project_id' => $task['project_id']),
+                    false,
+                    'task-board-popover',
+                    t('Change assignee')
+                ) ?>
+            </span>
 
-        <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')),
-                'board',
-                'changeAssignee',
-                array('task_id' => $task['id'], 'project_id' => $task['project_id']),
-                false,
-                'task-board-popover',
-                t('Change assignee')
-            ) ?>
-        </span>
+            <?php if ($task['is_active'] == 1): ?>
+            <div class="task-board-days">
+                <span title="<?= t('Task age in days')?>" class="task-days-age"><?= $this->dt->age($task['date_creation']) ?></span>
+                <span title="<?= t('Days in this column')?>" class="task-days-incolumn"><?= $this->dt->age($task['date_moved']) ?></span>
+            </div>
+            <?php else: ?>
+                <div class="task-board-closed"><i class="fa fa-ban fa-fw"></i><?= t('Closed') ?></div>
+            <?php endif ?>
 
-        <?php if ($task['is_active'] == 1): ?>
-        <div class="task-board-days">
-            <span title="<?= t('Task age in days')?>" class="task-days-age"><?= $this->datetime->age($task['date_creation']) ?></span>
-            <span title="<?= t('Days in this column')?>" class="task-days-incolumn"><?= $this->datetime->age($task['date_moved']) ?></span>
-        </div>
-        <?php else: ?>
-            <div class="task-board-closed"><i class="fa fa-ban fa-fw"></i><?= t('Closed') ?></div>
-        <?php endif ?>
+            <div class="task-board-title">
+                <?= $this->url->link($this->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
+            </div>
 
-        <div class="task-board-title">
-            <?= $this->url->link($this->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
+            <?= $this->render('board/task_footer', array(
+                    'task' => $task,
+                    'not_editable' => $not_editable,
+            )) ?>
         </div>
-
-        <?= $this->render('board/task_footer', array(
-                'task' => $task,
-                'not_editable' => $not_editable,
-        )) ?>
-    </div>
+    <?php endif ?>
 </div>