From 6551609d1b248011d301080c1be7c48085dc5d55 Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fguillot@users.noreply.github.com>
Date: Sat, 26 Apr 2014 20:04:39 -0400
Subject: Add a filter by user and due date + minor changes

---
 templates/board_index.php | 13 +++++++++++--
 templates/layout.php      | 12 ++++++------
 2 files changed, 17 insertions(+), 8 deletions(-)

(limited to 'templates')

diff --git a/templates/board_index.php b/templates/board_index.php
index db0c4fec..fc7a4932 100644
--- a/templates/board_index.php
+++ b/templates/board_index.php
@@ -17,7 +17,12 @@
 
     <div class="project-menu">
         <ul>
-            <li><a href="?controller=project&amp;action=tasks&amp;project_id=<?= $current_project_id ?>"><?= t('completed tasks') ?></a></li>
+            <li>
+                <?= t('Filter by user') ?>
+                <?= Helper\form_select('user_id', $users, $filters) ?>
+            </li>
+            <li><a href="#" id="filter-due-date"><?= t('Filter by due date') ?></a></li>
+            <li><a href="?controller=project&amp;action=tasks&amp;project_id=<?= $current_project_id ?>"><?= t('Completed tasks') ?></a></li>
         </ul>
     </div>
 
@@ -54,7 +59,11 @@
                     dropzone="copy">
                     <?php foreach ($column['tasks'] as $task): ?>
                     <div class="draggable-item" draggable="true">
-                        <div class="task task-<?= $task['color_id'] ?>" data-task-id="<?= $task['id'] ?>" title="<?= t('View this task') ?>">
+                        <div class="task task-<?= $task['color_id'] ?>"
+                             data-task-id="<?= $task['id'] ?>"
+                             data-owner-id="<?= $task['owner_id'] ?>"
+                             data-due-date="<?= $task['date_due'] ?>"
+                             title="<?= t('View this task') ?>">
 
                             <a href="?controller=task&amp;action=edit&amp;task_id=<?= $task['id'] ?>" title="<?= t('Edit this task') ?>">#<?= $task['id'] ?></a> -
 
diff --git a/templates/layout.php b/templates/layout.php
index 0791b910..40c0b321 100644
--- a/templates/layout.php
+++ b/templates/layout.php
@@ -9,7 +9,7 @@
         <link rel="apple-touch-icon" sizes="72x72" href="assets/img/touch-icon-ipad.png">
         <link rel="apple-touch-icon" sizes="114x114" href="assets/img/touch-icon-iphone-retina.png">
         <link rel="apple-touch-icon" sizes="144x144" href="assets/img/touch-icon-ipad-retina.png">
-        <title><?= isset($title) ? Helper\escape($title) : 'Kanboard' ?></title>
+        <title><?= isset($title) ? Helper\escape($title).' - Kanboard' : 'Kanboard' ?></title>
         <?php if (isset($auto_refresh)): ?>
             <meta http-equiv="refresh" content="<?= AUTO_REFRESH_DURATION ?>" >
         <?php endif ?>
@@ -23,19 +23,19 @@
                 <a class="logo" href="?">kan<span>board</span></a>
                 <ul>
                     <li <?= isset($menu) && $menu === 'boards' ? 'class="active"' : '' ?>>
-                        <a href="?controller=board"><?= t('boards') ?></a>
+                        <a href="?controller=board"><?= t('Boards') ?></a>
                     </li>
                     <li <?= isset($menu) && $menu === 'projects' ? 'class="active"' : '' ?>>
-                        <a href="?controller=project"><?= t('projects') ?></a>
+                        <a href="?controller=project"><?= t('Projects') ?></a>
                     </li>
                     <li <?= isset($menu) && $menu === 'users' ? 'class="active"' : '' ?>>
-                        <a href="?controller=user"><?= t('users') ?></a>
+                        <a href="?controller=user"><?= t('Users') ?></a>
                     </li>
                     <li <?= isset($menu) && $menu === 'config' ? 'class="active"' : '' ?>>
-                        <a href="?controller=config"><?= t('settings') ?></a>
+                        <a href="?controller=config"><?= t('Settings') ?></a>
                     </li>
                     <li>
-                        <a href="?controller=user&amp;action=logout"><?= t('logout') ?></a>
+                        <a href="?controller=user&amp;action=logout"><?= t('Logout') ?></a>
                         (<?= Helper\escape($_SESSION['user']['username']) ?>)
                     </li>
                 </ul>
-- 
cgit v1.2.3