From 3a56d215fc9797352fc523d51a7ba8d10ba01a80 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sat, 21 Feb 2015 17:43:15 -0500
Subject: Add task menu in collapsed mode

---
 app/Template/board/swimlane.php     |  2 +-
 app/Template/board/task.php         | 63 -------------------------------------
 app/Template/board/task_menu.php    | 13 ++++++++
 app/Template/board/task_private.php | 50 +++++++++++++++++++++++++++++
 4 files changed, 64 insertions(+), 64 deletions(-)
 delete mode 100644 app/Template/board/task.php
 create mode 100644 app/Template/board/task_menu.php
 create mode 100644 app/Template/board/task_private.php

(limited to 'app')

diff --git a/app/Template/board/swimlane.php b/app/Template/board/swimlane.php
index 08efdd11..ec298e24 100644
--- a/app/Template/board/swimlane.php
+++ b/app/Template/board/swimlane.php
@@ -65,7 +65,7 @@
         <?php endif ?>
 
         <?php foreach ($column['tasks'] as $task): ?>
-            <?= $this->render($not_editable ? 'board/task_public' : 'board/task', array(
+            <?= $this->render($not_editable ? 'board/task_public' : 'board/task_private', array(
                 'project' => $project,
                 'task' => $task,
                 'categories' => $categories,
diff --git a/app/Template/board/task.php b/app/Template/board/task.php
deleted file mode 100644
index f3014dfa..00000000
--- a/app/Template/board/task.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<div class="task-board draggable-item color-<?= $task['color_id'] ?> <?= $task['date_modification'] > time() - $board_highlight_period ? 'task-board-recent' : '' ?>"
-     data-task-id="<?= $task['id'] ?>"
-     data-owner-id="<?= $task['owner_id'] ?>"
-     data-category-id="<?= $task['category_id'] ?>"
-     data-due-date="<?= $task['date_due'] ?>"
-     data-task-url="<?= $this->u('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"
-     title="<?= t('View this task') ?>">
-
-    <div class="task-board-collapsed" style="display: none">
-        <?= $this->a('#'.$task['id'], 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-collapsed-id') ?>
-        <?= $this->a($this->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-collapsed-title') ?>
-    </div>
-
-    <div class="task-board-expanded">
-
-        <ul class="dropdown">
-            <li>
-                <a href="#" class="dropdown-menu"><?= '#'.$task['id'] ?></a>
-                <ul>
-                    <li><i class="fa fa-user"></i> <?= $this->a(t('Change assignee'), 'board', 'changeAssignee', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-popover') ?></li>
-                    <li><i class="fa fa-tag"></i> <?= $this->a(t('Change category'), 'board', 'changeCategory', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-popover') ?></li>
-                    <li><i class="fa fa-align-left"></i> <?= $this->a(t('Change description'), 'task', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-popover') ?></li>
-                    <li><i class="fa fa-comment-o"></i> <?= $this->a(t('Add a comment'), 'comment', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-popover') ?></li>
-                    <li><i class="fa fa-pencil-square-o"></i> <?= $this->a(t('Edit this task'), 'task', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-popover') ?></li>
-                    <li><i class="fa fa-close"></i> <?= $this->a(t('Close this task'), 'task', 'close', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'redirect' => 'board'), false, 'task-board-popover') ?></li>
-                </ul>
-            </li>
-        </ul>
-
-        <?php if ($task['reference']): ?>
-        <span class="task-board-reference" title="<?= t('Reference') ?>">
-            (<?= $task['reference'] ?>)
-        </span>
-        <?php endif ?>
-
-        <span class="task-board-user <?= $this->userSession->isCurrentUser($task['owner_id']) ? 'task-board-current-user' : '' ?>">
-            <?= $this->a(
-                (! 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['score']): ?>
-            <span class="task-score"><?= $this->e($task['score']) ?></span>
-        <?php endif ?>
-
-        <div class="task-board-days">
-            <span title="<?= t('Task age in days')?>" class="task-days-age"><?= $this->getTaskAge($task['date_creation']) ?></span>
-            <span title="<?= t('Days in this column')?>" class="task-days-incolumn"><?= $this->getTaskAge($task['date_moved']) ?></span>
-        </div>
-
-        <div class="task-board-title">
-            <?= $this->a($this->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
-        </div>
-
-        <?= $this->render('board/task_footer', array('task' => $task, 'categories' => $categories)) ?>
-    </div>
-</div>
diff --git a/app/Template/board/task_menu.php b/app/Template/board/task_menu.php
new file mode 100644
index 00000000..e7e0f419
--- /dev/null
+++ b/app/Template/board/task_menu.php
@@ -0,0 +1,13 @@
+<ul class="dropdown">
+    <li>
+        <a href="#" class="dropdown-menu"><?= '#'.$task['id'] ?></a>
+        <ul>
+            <li><i class="fa fa-user"></i> <?= $this->a(t('Change assignee'), 'board', 'changeAssignee', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-popover') ?></li>
+            <li><i class="fa fa-tag"></i> <?= $this->a(t('Change category'), 'board', 'changeCategory', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-popover') ?></li>
+            <li><i class="fa fa-align-left"></i> <?= $this->a(t('Change description'), 'task', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-popover') ?></li>
+            <li><i class="fa fa-comment-o"></i> <?= $this->a(t('Add a comment'), 'comment', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-popover') ?></li>
+            <li><i class="fa fa-pencil-square-o"></i> <?= $this->a(t('Edit this task'), 'task', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-popover') ?></li>
+            <li><i class="fa fa-close"></i> <?= $this->a(t('Close this task'), 'task', 'close', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'redirect' => 'board'), false, 'task-board-popover') ?></li>
+        </ul>
+    </li>
+</ul>
\ No newline at end of file
diff --git a/app/Template/board/task_private.php b/app/Template/board/task_private.php
new file mode 100644
index 00000000..efc5bacf
--- /dev/null
+++ b/app/Template/board/task_private.php
@@ -0,0 +1,50 @@
+<div class="task-board draggable-item color-<?= $task['color_id'] ?> <?= $task['date_modification'] > time() - $board_highlight_period ? 'task-board-recent' : '' ?>"
+     data-task-id="<?= $task['id'] ?>"
+     data-owner-id="<?= $task['owner_id'] ?>"
+     data-category-id="<?= $task['category_id'] ?>"
+     data-due-date="<?= $task['date_due'] ?>"
+     data-task-url="<?= $this->u('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"
+     title="<?= t('View this task') ?>">
+
+    <?= $this->render('board/task_menu', array('task' => $task)) ?>
+
+    <div class="task-board-collapsed" style="display: none">
+        <?= $this->a($this->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-collapsed-title') ?>
+    </div>
+
+    <div class="task-board-expanded">
+
+        <?php if ($task['reference']): ?>
+        <span class="task-board-reference" title="<?= t('Reference') ?>">
+            (<?= $task['reference'] ?>)
+        </span>
+        <?php endif ?>
+
+        <span class="task-board-user <?= $this->userSession->isCurrentUser($task['owner_id']) ? 'task-board-current-user' : '' ?>">
+            <?= $this->a(
+                (! 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['score']): ?>
+            <span class="task-score"><?= $this->e($task['score']) ?></span>
+        <?php endif ?>
+
+        <div class="task-board-days">
+            <span title="<?= t('Task age in days')?>" class="task-days-age"><?= $this->getTaskAge($task['date_creation']) ?></span>
+            <span title="<?= t('Days in this column')?>" class="task-days-incolumn"><?= $this->getTaskAge($task['date_moved']) ?></span>
+        </div>
+
+        <div class="task-board-title">
+            <?= $this->a($this->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
+        </div>
+
+        <?= $this->render('board/task_footer', array('task' => $task, 'categories' => $categories)) ?>
+    </div>
+</div>
-- 
cgit v1.2.3