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

6 files changed, 25 insertions, 21 deletions

diff --git a/app/Template/dashboard/notifications.php b/app/Template/dashboard/notifications.php
index e0e9b878..a189d74f 100644
--- a/app/Template/dashboard/notifications.php
+++ b/app/Template/dashboard/notifications.php
@@ -13,7 +13,7 @@
     </ul>
 </div>
 
-    <table class="table-fixed table-small">
+    <table class="table-striped table-scrolling table-small">
         <tr>
             <th><?= t('Notification') ?></th>
             <th class="column-20"><?= t('Date') ?></th>
@@ -36,10 +36,8 @@
                     <i class="fa fa-file-o fa-fw"></i>
                 <?php endif ?>
 
-                <?php if ($this->text->contains($notification['event_name'], 'task.overdue')): ?>
-                    <?php if (count($notification['event_data']['tasks']) > 1): ?>
-                        <?= $notification['title'] ?>
-                    <?php endif ?>
+                <?php if ($this->text->contains($notification['event_name'], 'task.overdue') && count($notification['event_data']['tasks']) > 1): ?>
+                    <?= $notification['title'] ?>
                 <?php else: ?>
                     <?= $this->url->link($notification['title'], 'WebNotificationController', 'redirect', array('notification_id' => $notification['id'], 'user_id' => $user['id'])) ?>
                 <?php endif ?>
diff --git a/app/Template/dashboard/projects.php b/app/Template/dashboard/projects.php
index 962e4d83..f8806c01 100644
--- a/app/Template/dashboard/projects.php
+++ b/app/Template/dashboard/projects.php
@@ -4,10 +4,10 @@
 <?php if ($paginator->isEmpty()): ?>
     <p class="alert"><?= t('Your are not member of any project.') ?></p>
 <?php else: ?>
-    <table class="table-fixed table-small">
+    <table class="table-striped table-small table-scrolling">
         <tr>
-            <th class="column-5"><?= $paginator->order('Id', 'id') ?></th>
-            <th class="column-3"><?= $paginator->order('<i class="fa fa-lock fa-fw" title="'.t('Private project').'"></i>', 'is_private') ?></th>
+            <th class="column-5"><?= $paginator->order('Id', \Kanboard\Model\ProjectModel::TABLE.'.id') ?></th>
+            <th class="column-3"><?= $paginator->order('<i class="fa fa-lock fa-fw" title="'.t('Private project').'"></i>', \Kanboard\Model\ProjectModel::TABLE.'.is_private') ?></th>
             <th class="column-25"><?= $paginator->order(t('Project'), \Kanboard\Model\ProjectModel::TABLE.'.name') ?></th>
             <th class="column-10"><?= t('Tasks') ?></th>
             <th><?= t('Columns') ?></th>
@@ -43,7 +43,7 @@
             <td class="dashboard-project-stats">
                 <?php foreach ($project['columns'] as $column): ?>
                     <strong title="<?= t('Task count') ?>"><?= $column['nb_tasks'] ?></strong>
-                    <span><?= $this->text->e($column['title']) ?></span>
+                    <small><?= $this->text->e($column['title']) ?></small>
                 <?php endforeach ?>
             </td>
 
diff --git a/app/Template/dashboard/show.php b/app/Template/dashboard/show.php
index 637b60f8..aec6f591 100644
--- a/app/Template/dashboard/show.php
+++ b/app/Template/dashboard/show.php
@@ -2,11 +2,18 @@
     <form method="get" action="<?= $this->url->dir() ?>" class="search">
         <?= $this->form->hidden('controller', array('controller' => 'SearchController')) ?>
         <?= $this->form->hidden('action', array('action' => 'index')) ?>
-        <?= $this->form->text('search', array(), array(), array('placeholder="'.t('Search').'"'), 'form-input-large') ?>
-        <?= $this->render('app/filters_helper') ?>
+
+        <div class="input-addon">
+            <?= $this->form->text('search', array(), array(), array('placeholder="'.t('Search').'"'), 'input-addon-field') ?>
+            <div class="input-addon-item">
+                <?= $this->render('app/filters_helper') ?>
+            </div>
+        </div>
     </form>
 </div>
 
 <?= $this->render('dashboard/projects', array('paginator' => $project_paginator, 'user' => $user)) ?>
 <?= $this->render('dashboard/tasks', array('paginator' => $task_paginator, 'user' => $user)) ?>
 <?= $this->render('dashboard/subtasks', array('paginator' => $subtask_paginator, 'user' => $user)) ?>
+
+<?= $this->hook->render('template:dashboard:show', array('user' => $user)) ?>
diff --git a/app/Template/dashboard/sidebar.php b/app/Template/dashboard/sidebar.php
index 86cc20f8..108c028a 100644
--- a/app/Template/dashboard/sidebar.php
+++ b/app/Template/dashboard/sidebar.php
@@ -1,5 +1,4 @@
 <div class="sidebar">
-    <h2><?= $this->text->e($user['name'] ?: $user['username']) ?></h2>
     <ul>
         <li <?= $this->app->checkMenuSelection('DashboardController', 'show') ?>>
             <?= $this->url->link(t('Overview'), 'DashboardController', 'show', array('user_id' => $user['id'])) ?>
@@ -22,6 +21,6 @@
         <li <?= $this->app->checkMenuSelection('DashboardController', 'notifications') ?>>
             <?= $this->url->link(t('My notifications'), 'DashboardController', 'notifications', array('user_id' => $user['id'])) ?>
         </li>
-        <?= $this->hook->render('template:dashboard:sidebar') ?>
+        <?= $this->hook->render('template:dashboard:sidebar', array('user' => $user)) ?>
     </ul>
 </div>
diff --git a/app/Template/dashboard/subtasks.php b/app/Template/dashboard/subtasks.php
index 8e0aa3ce..b71deeb9 100644
--- a/app/Template/dashboard/subtasks.php
+++ b/app/Template/dashboard/subtasks.php
@@ -4,12 +4,12 @@
 <?php if ($paginator->isEmpty()): ?>
     <p class="alert"><?= t('There is nothing assigned to you.') ?></p>
 <?php else: ?>
-    <table class="table-fixed table-small">
+    <table class="table-striped table-small table-scrolling">
         <tr>
-            <th class="column-5"><?= $paginator->order('Id', 'tasks.id') ?></th>
+            <th class="column-5"><?= $paginator->order('Id', \Kanboard\Model\TaskModel::TABLE.'.id') ?></th>
             <th class="column-20"><?= $paginator->order(t('Project'), 'project_name') ?></th>
             <th><?= $paginator->order(t('Task'), 'task_name') ?></th>
-            <th><?= $paginator->order(t('Subtask'), 'title') ?></th>
+            <th><?= $paginator->order(t('Subtask'), \Kanboard\Model\SubtaskModel::TABLE.'.title') ?></th>
             <th class="column-20"><?= t('Time tracking') ?></th>
         </tr>
         <?php foreach ($paginator->getCollection() as $subtask): ?>
diff --git a/app/Template/dashboard/tasks.php b/app/Template/dashboard/tasks.php
index 4b83a96a..427b903d 100644
--- a/app/Template/dashboard/tasks.php
+++ b/app/Template/dashboard/tasks.php
@@ -4,14 +4,14 @@
 <?php if ($paginator->isEmpty()): ?>
     <p class="alert"><?= t('There is nothing assigned to you.') ?></p>
 <?php else: ?>
-    <table class="table-fixed table-small">
+    <table class="table-striped table-small table-scrolling">
         <tr>
-            <th class="column-5"><?= $paginator->order('Id', 'tasks.id') ?></th>
+            <th class="column-5"><?= $paginator->order('Id', \Kanboard\Model\TaskModel::TABLE.'.id') ?></th>
             <th class="column-20"><?= $paginator->order(t('Project'), 'project_name') ?></th>
-            <th><?= $paginator->order(t('Task'), 'title') ?></th>
-            <th class="column-5"><?= $paginator->order('Priority', 'tasks.priority') ?></th>
+            <th><?= $paginator->order(t('Task'), \Kanboard\Model\TaskModel::TABLE.'.title') ?></th>
+            <th class="column-8"><?= $paginator->order(t('Priority'), \Kanboard\Model\TaskModel::TABLE.'.priority') ?></th>
             <th class="column-20"><?= t('Time tracking') ?></th>
-            <th class="column-10"><?= $paginator->order(t('Due date'), 'date_due') ?></th>
+            <th class="column-10"><?= $paginator->order(t('Due date'), \Kanboard\Model\TaskModel::TABLE.'.date_due') ?></th>
             <th class="column-10"><?= $paginator->order(t('Column'), 'column_title') ?></th>
         </tr>
         <?php foreach ($paginator->getCollection() as $task): ?>