From 00cd5d45d9815faaf90caec3319d3c10934bebd1 Mon Sep 17 00:00:00 2001
From: Matt Cockayne <matt@zucchi.co.uk>
Date: Thu, 18 Jul 2013 14:03:21 +0100
Subject: [PATCH] updated css and added pagination

---
 public/css/style.css                     |  9 ++++++++
 src/ZucchiAdmin/Crud/ControllerTrait.php | 17 ++++++++++++--
 view/zucchi-admin/crud/list.phtml        | 29 +++++++++++++++++++++---
 view/zucchi-admin/layout.phtml           |  2 +-
 4 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/public/css/style.css b/public/css/style.css
index 59bce91..1a291ff 100755
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -37,11 +37,20 @@ body {
     margin: 10px;
 }
 
+#admin th:hover {
+    background-color: #ff781e;
+}
+
 footer {
     margin-top: 3px;
 }
 
 
+.well.pagination-container {
+    padding: 0px;
+    text-align: center;
+}
+
 /* css for timepicker */
 .ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
 .ui-timepicker-div dl { text-align: left; }
diff --git a/src/ZucchiAdmin/Crud/ControllerTrait.php b/src/ZucchiAdmin/Crud/ControllerTrait.php
index 0a1b803..c6017fa 100755
--- a/src/ZucchiAdmin/Crud/ControllerTrait.php
+++ b/src/ZucchiAdmin/Crud/ControllerTrait.php
@@ -48,15 +48,28 @@ public function listAction()
 
         $where = $this->parseWhere($this->getRequest());
         $order = $this->params()->fromQuery('order', array());
+
+        $perPage = $service::INDEX_LIMIT;
+
+        $page = ($this->params()->fromQuery('page', 1) -1) * $perPage;
         
-        $list = $service->getList($where, $order);
+        $list = $service->getList($where, $order, $page, $perPage);
+
+        $count = $service->getCount($where);
 
         $this->trigger(CrudEvent::EVENT_LIST_POST, $list);
-        
+
+        $currentQuery = $this->params()->fromQuery();
+        unset($currentQuery['page']);
+
         return $this->loadView(
             'zucchi-admin/crud/list', 
             array(
                 'list' => $list,
+                'count' => $count,
+                'page' => $page+1,
+                'currentQuery' => http_build_query($currentQuery),
+                'pages' => ceil($count/$perPage),
                 'listFields' => $this->listFields,
                 'metadata' => $service->getMetaData(),
                 'where' => $where,
diff --git a/view/zucchi-admin/crud/list.phtml b/view/zucchi-admin/crud/list.phtml
index 7e64bbd..47b3f32 100755
--- a/view/zucchi-admin/crud/list.phtml
+++ b/view/zucchi-admin/crud/list.phtml
@@ -99,6 +99,7 @@
             </select>
             <button type="button" class="btn btn-info input-mini" id="filter-add">Add</button>
         </div>
+
     </div>
     <div class="row-fluid">
         <div class="span9">
@@ -136,8 +137,30 @@
                 <?php endif; ?>
             </table>
         </div>
-        <div class="span3 well">
-            <?=$this->crudBulkActions('module:ZucchiUser')?>
+        <div class="span3">
+            <div class="well">
+                <?=$this->crudBulkActions('module:ZucchiUser')?>
+            </div>
+            <?php if ($pages > 1): ?>
+            <div class="well pagination-container">
+                <div class="pagination">
+                    <ul>
+                        <li class="<?=($page == 1) ? 'disabled':null;?>"><a href="?page=1&<?=$currentQuery?>">&laquo;</a></li>
+                        <li class="<?=($page == 1) ? 'disabled':null;?>"><a href="?page=<?=($page>1)? $page-1:1?>&<?=$currentQuery?>">&lt;</a></li>
+                        <li class="disabled"><span><?=$page?> of <?=$pages?></span></li>
+                        <li class="<?=($page == $pages) ? 'disabled':null;?>"><a href="?page=<?=($page<$pages)? $page+1:$pages?>&<?=$currentQuery?>">&gt;</a></li>
+                        <li class="<?=($page == $pages) ? 'disabled':null;?>"><a href="?page=<?=$pages?>&<?=$currentQuery?>">&raquo;</a></li>
+                    </ul>
+                </div>
+                <form class="form-inline" method="get">
+                    <label>Jump to page:</label><input type="text" class="input-small" name="page" placeholder="page #" value="<?=$page?>"/>
+                    <?php foreach (explode('&', $currentQuery) as $part): ?>
+                        <?php list($key, $value) = explode('=',$part);?>
+                        <input type='hidden' name='<?=urldecode($key)?>' value='<?=$value?>'/>
+                    <?php endforeach;?>
+                </form>
+            </div>
+            <?php endif;?>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/zucchi-admin/layout.phtml b/view/zucchi-admin/layout.phtml
index a289e8e..7c7dc04 100755
--- a/view/zucchi-admin/layout.phtml
+++ b/view/zucchi-admin/layout.phtml
@@ -85,7 +85,7 @@
     
         <footer>
             <div class="container">
-                <p>&copy; 2011- <?=date('Y')?> by Zucchi Ltd. <?php echo $this->translate('All rights reserved.') ?></p>
+                <p>2011- <?=date('Y')?> by Zucchi Ltd.</p>
             </div>
         </footer>