From aa6fffb05a7d84a36991341610675499b6ea8a79 Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fred@kanboard.net>
Date: Sat, 15 Nov 2014 21:49:06 -0500
Subject: Add pagination and sorting to the dashboard

---
 app/Template/app/dashboard.php |  26 ++++++++++
 app/Template/app/index.php     | 114 -----------------------------------------
 app/Template/app/projects.php  |  33 ++++++++++++
 app/Template/app/subtasks.php  |  31 +++++++++++
 app/Template/app/tasks.php     |  31 +++++++++++
 5 files changed, 121 insertions(+), 114 deletions(-)
 create mode 100644 app/Template/app/dashboard.php
 delete mode 100644 app/Template/app/index.php
 create mode 100644 app/Template/app/projects.php
 create mode 100644 app/Template/app/subtasks.php
 create mode 100644 app/Template/app/tasks.php

(limited to 'app/Template')

diff --git a/app/Template/app/dashboard.php b/app/Template/app/dashboard.php
new file mode 100644
index 00000000..9bcd69f6
--- /dev/null
+++ b/app/Template/app/dashboard.php
@@ -0,0 +1,26 @@
+<section id="main">
+    <div class="page-header">
+        <ul>
+            <?php if (Helper\is_admin()): ?>
+                <li><i class="fa fa-plus fa-fw"></i><?= Helper\a(t('New project'), 'project', 'create') ?></li>
+            <?php endif ?>
+            <li><i class="fa fa-lock fa-fw"></i><?= Helper\a(t('New private project'), 'project', 'create', array('private' => 1)) ?></li>
+            <li><i class="fa fa-folder fa-fw"></i><?= Helper\a(t('Project management'), 'project', 'index') ?></li>
+            <?php if (Helper\is_admin()): ?>
+                <li><i class="fa fa-user fa-fw"></i><?= Helper\a(t('User management'), 'user', 'index') ?></li>
+                <li><i class="fa fa-cog fa-fw"></i><?= Helper\a(t('Settings'), 'config', 'index') ?></li>
+            <?php endif ?>
+        </ul>
+    </div>
+    <section id="dashboard">
+        <div class="dashboard-left-column">
+            <?= Helper\Template('app/projects', array('projects' => $projects, 'pagination' => $project_pagination)) ?>
+            <?= Helper\Template('app/tasks', array('tasks' => $tasks, 'pagination' => $task_pagination)) ?>
+            <?= Helper\Template('app/subtasks', array('subtasks' => $subtasks, 'pagination' => $subtask_pagination)) ?>
+        </div>
+        <div class="dashboard-right-column">
+            <h2><?= t('Activity stream') ?></h2>
+            <?= Helper\template('project_events', array('events' => $events)) ?>
+        </div>
+    </section>
+</section>
\ No newline at end of file
diff --git a/app/Template/app/index.php b/app/Template/app/index.php
deleted file mode 100644
index 637bc402..00000000
--- a/app/Template/app/index.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<section id="main">
-    <div class="page-header">
-        <ul>
-            <?php if (Helper\is_admin()): ?>
-                <li><i class="fa fa-plus fa-fw"></i><?= Helper\a(t('New project'), 'project', 'create') ?></li>
-            <?php endif ?>
-            <li><i class="fa fa-lock fa-fw"></i><?= Helper\a(t('New private project'), 'project', 'create', array('private' => 1)) ?></li>
-            <li><i class="fa fa-folder fa-fw"></i><?= Helper\a(t('Project management'), 'project', 'index') ?></li>
-            <?php if (Helper\is_admin()): ?>
-                <li><i class="fa fa-user fa-fw"></i><?= Helper\a(t('User management'), 'user', 'index') ?></li>
-                <li><i class="fa fa-cog fa-fw"></i><?= Helper\a(t('Settings'), 'config', 'index') ?></li>
-            <?php endif ?>
-        </ul>
-    </div>
-    <section id="dashboard">
-        <div class="dashboard-left-column">
-            <h2><?= t('My projects') ?></h2>
-            <?php if (empty($projects)): ?>
-                <p class="alert"><?= t('Your are not member of any project.') ?></p>
-            <?php else: ?>
-                <table class="table-fixed">
-                    <tr>
-                        <th class="column-8">&nbsp;</th>
-                        <th class="column-20"><?= t('Project') ?></th>
-                        <th><?= t('Columns') ?></th>
-                    </tr>
-                    <?php foreach ($projects as $project): ?>
-                    <tr>
-                        <td>
-                            <?= Helper\a('#'.$project['id'], 'board', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link') ?>
-                        </td>
-                        <td>
-                            <?php if (Helper\is_project_admin($project)): ?>
-                                <?= Helper\a('<i class="fa fa-cog"></i>', 'project', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Settings')) ?>&nbsp;
-                            <?php endif ?>
-                            <?= Helper\a(Helper\escape($project['name']), 'board', 'show', array('project_id' => $project['id'])) ?>
-                        </td>
-                        <td class="dashboard-project-stats">
-                            <?php foreach ($project['columns'] as $column): ?>
-                                <strong title="<?= t('Task count') ?>"><?= $column['nb_tasks'] ?></strong>
-                                <span><?= Helper\escape($column['title']) ?></span>
-                            <?php endforeach ?>
-                        </td>
-                    </tr>
-                    <?php endforeach ?>
-                </table>
-            <?php endif ?>
-
-            <h2><?= t('My tasks') ?></h2>
-            <?php if (empty($tasks)): ?>
-                <p class="alert"><?= t('There is nothing assigned to you.') ?></p>
-            <?php else: ?>
-                <table class="table-fixed">
-                    <tr>
-                        <th class="column-8">&nbsp;</th>
-                        <th class="column-20"><?= t('Project') ?></th>
-                        <th><?= t('Task') ?></th>
-                        <th class="column-20"><?= t('Due date') ?></th>
-                    </tr>
-                    <?php foreach ($tasks as $task): ?>
-                    <tr>
-                        <td class="task-table task-<?= $task['color_id'] ?>">
-                            <?= Helper\a('#'.$task['id'], 'task', 'show', array('task_id' => $task['id'])) ?>
-                        </td>
-                        <td>
-                            <?= Helper\a(Helper\escape($task['project_name']), 'board', 'show', array('project_id' => $task['project_id'])) ?>
-                        </td>
-                        <td>
-                            <?= Helper\a(Helper\escape($task['title']), 'task', 'show', array('task_id' => $task['id'])) ?>
-                        </td>
-                        <td>
-                            <?= dt('%B %e, %Y', $task['date_due']) ?>
-                        </td>
-                    </tr>
-                    <?php endforeach ?>
-                </table>
-            <?php endif ?>
-
-            <h2><?= t('My subtasks') ?></h2>
-            <?php if (empty($subtasks)): ?>
-                <p class="alert"><?= t('There is nothing assigned to you.') ?></p>
-            <?php else: ?>
-                <table class="table-fixed">
-                    <tr>
-                        <th class="column-8">&nbsp;</th>
-                        <th class="column-20"><?= t('Project') ?></th>
-                        <th class="column-15"><?= t('Status') ?></th>
-                        <th><?= t('Subtask') ?></th>
-                    </tr>
-                    <?php foreach ($subtasks as $subtask): ?>
-                    <tr>
-                        <td class="task-table task-<?= $subtask['color_id'] ?>">
-                            <?= Helper\a('#'.$subtask['task_id'], 'task', 'show', array('task_id' => $subtask['task_id'])) ?>
-                        </td>
-                        <td>
-                            <?= Helper\a(Helper\escape($subtask['project_name']), 'board', 'show', array('project_id' => $subtask['project_id'])) ?>
-                        </td>
-                        <td>
-                            <?= Helper\escape($subtask['status_name']) ?>
-                        </td>
-                        <td>
-                            <?= Helper\a(Helper\escape($subtask['title']), 'task', 'show', array('task_id' => $subtask['task_id'])) ?>
-                        </td>
-                    </tr>
-                    <?php endforeach ?>
-                </table>
-            <?php endif ?>
-
-        </div>
-        <div class="dashboard-right-column">
-            <h2><?= t('Activity stream') ?></h2>
-            <?= Helper\template('project_events', array('events' => $events)) ?>
-    </section>
-</section>
\ No newline at end of file
diff --git a/app/Template/app/projects.php b/app/Template/app/projects.php
new file mode 100644
index 00000000..2c13a052
--- /dev/null
+++ b/app/Template/app/projects.php
@@ -0,0 +1,33 @@
+<h2><?= t('My projects') ?></h2>
+<?php if (empty($projects)): ?>
+    <p class="alert"><?= t('Your are not member of any project.') ?></p>
+<?php else: ?>
+    <table class="table-fixed">
+        <tr>
+            <th class="column-8"><?= Helper\order('Id', 'id', $pagination) ?></th>
+            <th class="column-20"><?= Helper\order(t('Project'), 'name', $pagination) ?></th>
+            <th><?= t('Columns') ?></th>
+        </tr>
+        <?php foreach ($projects as $project): ?>
+        <tr>
+            <td>
+                <?= Helper\a('#'.$project['id'], 'board', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link') ?>
+            </td>
+            <td>
+                <?php if (Helper\is_project_admin($project)): ?>
+                    <?= Helper\a('<i class="fa fa-cog"></i>', 'project', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Settings')) ?>&nbsp;
+                <?php endif ?>
+                <?= Helper\a(Helper\escape($project['name']), 'board', 'show', array('project_id' => $project['id'])) ?>
+            </td>
+            <td class="dashboard-project-stats">
+                <?php foreach ($project['columns'] as $column): ?>
+                    <strong title="<?= t('Task count') ?>"><?= $column['nb_tasks'] ?></strong>
+                    <span><?= Helper\escape($column['title']) ?></span>
+                <?php endforeach ?>
+            </td>
+        </tr>
+        <?php endforeach ?>
+    </table>
+
+    <?= Helper\paginate($pagination) ?>
+<?php endif ?>
\ No newline at end of file
diff --git a/app/Template/app/subtasks.php b/app/Template/app/subtasks.php
new file mode 100644
index 00000000..f51ef1db
--- /dev/null
+++ b/app/Template/app/subtasks.php
@@ -0,0 +1,31 @@
+<h2><?= t('My subtasks') ?></h2>
+<?php if (empty($subtasks)): ?>
+    <p class="alert"><?= t('There is nothing assigned to you.') ?></p>
+<?php else: ?>
+    <table class="table-fixed">
+        <tr>
+            <th class="column-10"><?= Helper\order(t('Task Id'), 'tasks.id', $pagination) ?></th>
+            <th class="column-20"><?= Helper\order(t('Project'), 'project_name', $pagination) ?></th>
+            <th class="column-15"><?= Helper\order(t('Status'), 'status', $pagination) ?></th>
+            <th><?= Helper\order(t('Subtask'), 'title', $pagination) ?></th>
+        </tr>
+        <?php foreach ($subtasks as $subtask): ?>
+        <tr>
+            <td class="task-table task-<?= $subtask['color_id'] ?>">
+                <?= Helper\a('#'.$subtask['task_id'], 'task', 'show', array('task_id' => $subtask['task_id'])) ?>
+            </td>
+            <td>
+                <?= Helper\a(Helper\escape($subtask['project_name']), 'board', 'show', array('project_id' => $subtask['project_id'])) ?>
+            </td>
+            <td>
+                <?= Helper\escape($subtask['status_name']) ?>
+            </td>
+            <td>
+                <?= Helper\a(Helper\escape($subtask['title']), 'task', 'show', array('task_id' => $subtask['task_id'])) ?>
+            </td>
+        </tr>
+        <?php endforeach ?>
+    </table>
+
+    <?= Helper\paginate($pagination) ?>
+<?php endif ?>
\ No newline at end of file
diff --git a/app/Template/app/tasks.php b/app/Template/app/tasks.php
new file mode 100644
index 00000000..d1e1ed4e
--- /dev/null
+++ b/app/Template/app/tasks.php
@@ -0,0 +1,31 @@
+<h2><?= t('My tasks') ?></h2>
+<?php if (empty($tasks)): ?>
+    <p class="alert"><?= t('There is nothing assigned to you.') ?></p>
+<?php else: ?>
+    <table class="table-fixed">
+        <tr>
+            <th class="column-8"><?= Helper\order('Id', 'tasks.id', $pagination) ?></th>
+            <th class="column-20"><?= Helper\order(t('Project'), 'project_name', $pagination) ?></th>
+            <th><?= Helper\order(t('Task'), 'title', $pagination) ?></th>
+            <th class="column-20"><?= Helper\order(t('Due date'), 'date_due', $pagination) ?></th>
+        </tr>
+        <?php foreach ($tasks as $task): ?>
+        <tr>
+            <td class="task-table task-<?= $task['color_id'] ?>">
+                <?= Helper\a('#'.$task['id'], 'task', 'show', array('task_id' => $task['id'])) ?>
+            </td>
+            <td>
+                <?= Helper\a(Helper\escape($task['project_name']), 'board', 'show', array('project_id' => $task['project_id'])) ?>
+            </td>
+            <td>
+                <?= Helper\a(Helper\escape($task['title']), 'task', 'show', array('task_id' => $task['id'])) ?>
+            </td>
+            <td>
+                <?= dt('%B %e, %Y', $task['date_due']) ?>
+            </td>
+        </tr>
+        <?php endforeach ?>
+    </table>
+
+    <?= Helper\paginate($pagination) ?>
+<?php endif ?>
\ No newline at end of file
-- 
cgit v1.2.3