Merge https://github.com/kanboard/kanboard

8 files changed, 25 insertions, 13 deletions

diff --git a/app/Template/board/table_column.php b/app/Template/board/table_column.php
index f7a9f6ad..c0b71eab 100644
--- a/app/Template/board/table_column.php
+++ b/app/Template/board/table_column.php
@@ -5,9 +5,9 @@
 
         <!-- column in collapsed mode -->
         <div class="board-column-collapsed">
-            <span class="board-column-header-task-count" title="<?= t('Show this column') ?>">
+            <small class="board-column-header-task-count" title="<?= t('Show this column') ?>">
                 <span id="task-number-column-<?= $column['id'] ?>"><?= $column['nb_tasks'] ?></span>
-            </span>
+            </small>
         </div>
 
         <!-- column in expanded mode -->
@@ -18,9 +18,9 @@
                 </div>
             <?php endif ?>
 
-            <?php if ($swimlane['nb_swimlanes'] > 1 && ! empty($column['nb_column_tasks'])): ?>
+            <?php if ($swimlane['nb_swimlanes'] > 1 && ! empty($column['column_nb_tasks'])): ?>
                 <span title="<?= t('Total number of tasks in this column across all swimlanes') ?>" class="board-column-header-task-count">
-                    (<span><?= $column['nb_column_tasks'] ?></span>)
+                    (<span><?= $column['column_nb_tasks'] ?></span>)
                 </span>
             <?php endif ?>
 
@@ -47,6 +47,7 @@
                                     </li>
                                 <?php endif ?>
                             <?php endif ?>
+                            <?= $this->hook->render('template:board:column:dropdown', array('swimlane' => $swimlane, 'column' => $column)) ?>
                         </ul>
                     </span>
                 <?php endif ?>
diff --git a/app/Template/board/table_tasks.php b/app/Template/board/table_tasks.php
index fd9ce5e7..1651f5d6 100644
--- a/app/Template/board/table_tasks.php
+++ b/app/Template/board/table_tasks.php
@@ -4,7 +4,8 @@
         <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'] ?>">
diff --git a/app/Template/board/task_avatar.php b/app/Template/board/task_avatar.php
index 14b55476..28e0813e 100644
--- a/app/Template/board/task_avatar.php
+++ b/app/Template/board/task_avatar.php
@@ -3,7 +3,7 @@
     <span
         <?php if ($this->user->hasProjectAccess('TaskModificationController', 'edit', $task['project_id'])): ?>
         class="task-board-assignee task-board-change-assignee"
-        data-url="<?= $this->url->href('TaskPopoverController', 'changeAssignee', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>">
+        data-url="<?= $this->url->href('TaskModificationController', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>">
     <?php else: ?>
         class="task-board-assignee">
     <?php endif ?>
diff --git a/app/Template/board/task_footer.php b/app/Template/board/task_footer.php
index f6cbff70..bc34363c 100644
--- a/app/Template/board/task_footer.php
+++ b/app/Template/board/task_footer.php
@@ -6,8 +6,8 @@
         <?php else: ?>
             <?= $this->url->link(
                 $this->text->e($task['category_name']),
-                'TaskPopoverController',
-                'changeCategory',
+                'TaskModificationController',
+                'edit',
                 array('task_id' => $task['id'], 'project_id' => $task['project_id']),
                 false,
                 'popover' . (! empty($task['category_description']) ? ' tooltip' : ''),
@@ -18,6 +18,16 @@
 </div>
 <?php endif ?>
 
+<?php if (! empty($task['tags'])): ?>
+    <div class="task-tags">
+        <ul>
+        <?php foreach ($task['tags'] as $tag): ?>
+            <li><?= $this->text->e($tag['name']) ?></li>
+        <?php endforeach ?>
+        </ul>
+    </div>
+<?php endif ?>
+
 <div class="task-board-icons">
     <?php if ($task['score']): ?>
         <span class="task-score" title="<?= t('Complexity') ?>">
@@ -27,7 +37,7 @@
     <?php endif ?>
 
     <?php if (! empty($task['date_due'])): ?>
-        <?php if (date('d') == date('d', $task['date_due'])): ?>
+        <?php if (date('Y-m-d') == date('Y-m-d', $task['date_due'])): ?>
         <span class="task-board-date task-board-date-today">
         <?php elseif (time() > $task['date_due']): ?>
         <span class="task-board-date task-board-date-overdue">
diff --git a/app/Template/board/tooltip_external_links.php b/app/Template/board/tooltip_external_links.php
index 65331864..a9f1fc7f 100644
--- a/app/Template/board/tooltip_external_links.php
+++ b/app/Template/board/tooltip_external_links.php
@@ -1,5 +1,5 @@
 <div class="tooltip-large">
-    <table>
+    <table class="table-small">
         <tr>
             <th class="column-20"><?= t('Type') ?></th>
             <th class="column-70"><?= t('Title') ?></th>
diff --git a/app/Template/board/tooltip_files.php b/app/Template/board/tooltip_files.php
index 6f9e2640..4e704dac 100644
--- a/app/Template/board/tooltip_files.php
+++ b/app/Template/board/tooltip_files.php
@@ -1,5 +1,5 @@
 <div class="tooltip-large">
-    <table>
+    <table class="table-small">
         <?php foreach ($files as $file): ?>
         <tr>
             <th>
diff --git a/app/Template/board/tooltip_subtasks.php b/app/Template/board/tooltip_subtasks.php
index 0322d373..8d5bc059 100644
--- a/app/Template/board/tooltip_subtasks.php
+++ b/app/Template/board/tooltip_subtasks.php
@@ -1,5 +1,5 @@
 <div class="tooltip-large">
-    <table>
+    <table class="table-small">
         <tr>
             <th class="column-80"><?= t('Subtask') ?></th>
             <th><?= t('Assignee') ?></th>
diff --git a/app/Template/board/tooltip_tasklinks.php b/app/Template/board/tooltip_tasklinks.php
index d1156cbe..08432e71 100644
--- a/app/Template/board/tooltip_tasklinks.php
+++ b/app/Template/board/tooltip_tasklinks.php
@@ -1,5 +1,5 @@
 <div class="tooltip-large">
-    <table>
+    <table class="table-small">
     <?php foreach ($links as $label => $grouped_links): ?>
         <tr>
             <th colspan="4"><?= t($label) ?></th>