From 3caabaa3f16a87bff7af9c277e9219beef8e8424 Mon Sep 17 00:00:00 2001
From: iAmShorty <rafta@gmx.net>
Date: Sat, 1 Mar 2014 23:52:50 +0100
Subject: [PATCH] [UPDATE] pagination in admin

---
 .../bootstrap/admin/invitations/default.tpl   | 37 ++++++++++---------
 .../bootstrap/admin/registrations/default.tpl | 37 +++++++++----------
 .../bootstrap/admin/transactions/default.tpl  |  1 -
 public/templates/bootstrap/master.tpl         | 14 +------
 4 files changed, 38 insertions(+), 51 deletions(-)

diff --git a/public/templates/bootstrap/admin/invitations/default.tpl b/public/templates/bootstrap/admin/invitations/default.tpl
index 2f39c199..c1894791 100755
--- a/public/templates/bootstrap/admin/invitations/default.tpl
+++ b/public/templates/bootstrap/admin/invitations/default.tpl
@@ -6,23 +6,9 @@
         <i class="fa fa-envelope fa-fw"></i> Top Inviters
       </div>
       <div class="panel-body no-padding">
-        <table class="table table-striped table-bordered table-hover">
 
-    <tbody>
-      <tr>
-        <td>
-{if $smarty.request.invitersstart|default:"0" > 0}
-          <a href="{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&invitersstart={$smarty.request.invitersstart|escape|default:"0" - $LIMIT}{if $FILTERS|default:""}{$FILTERS}{/if}#invitations"><i class="icon-left-open"></i> Previous 10</a>
-{else}
-          <i class="icon-left-open"></i>
-{/if}
-        </td>
-        <td>
-          <a href="{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&invitersstart={$smarty.request.invitersstart|escape|default:"0" + $LIMIT}{if $FILTERS|default:""}{$FILTERS}{/if}#invitations">Next 10 <i class="icon-right-open"></i></a>
-        </td>
-    </tbody>
-  </table>
-    
+
+
     <table class="table table-striped table-bordered table-hover">
       <thead>
         <tr>
@@ -46,7 +32,22 @@
           </tbody>
         </table>
       </div>
+
+    
+            <table class="table borderless">
+            <tr>
+            <td>
+            <ul class="pager">
+              <li class="previous {if $smarty.get.start <= 0}disabled{/if}">
+                <a href="{if $smarty.get.start|default:"0" <= 0}#{else}{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&invitersstart={$smarty.request.invitersstart|escape|default:"0" - $LIMIT}{if $FILTERS|default:""}{$FILTERS}{/if}{/if}">&larr; Prev</a>
+              </li>
+              <li class="next">
+                <a href="{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&invitersstart={$smarty.request.invitersstart|escape|default:"0" + $LIMIT}{if $FILTERS|default:""}{$FILTERS}{/if}">Next &rarr;</a>
+              </li>
+            </ul>
+            </td>
+            </tr>
+            </table>  
     </div>
   </div>
-</div>
-{/nocache}
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/public/templates/bootstrap/admin/registrations/default.tpl b/public/templates/bootstrap/admin/registrations/default.tpl
index dda424de..944467f0 100755
--- a/public/templates/bootstrap/admin/registrations/default.tpl
+++ b/public/templates/bootstrap/admin/registrations/default.tpl
@@ -6,25 +6,6 @@
         <i class="fa fa-user fa-fw"></i> Last registered Users
       </div>
       <div class="panel-body no-padding">
-        <div class="table-responsive">
-          <table class="table table-striped table-bordered table-hover">
-            <tbody>
-              <tr>
-                <td>
-                {if $smarty.request.registeredstart|default:"0" > 0}
-                  <a href="{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&registeredstart={$smarty.request.registeredstart|escape|default:"0" - $LIMIT}{if $FILTERS|default:""}{$FILTERS}{/if}#registrations"><i class="fa fa-chevron-left fa-fw"></i> Previous 10</a>
-                {else}
-                  <i class="fa fa-chevron-left fa-fw"></i>
-                {/if}
-                </td>
-                <td>
-                  <a href="{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&registeredstart={$smarty.request.registeredstart|escape|default:"0" + $LIMIT}{if $FILTERS|default:""}{$FILTERS}{/if}#registrations">Next 10 <i class="fa fa-chevron-right fa-fw"></i></a>
-                </td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
-    
         <div class="table-responsive">
           <table class="table table-striped table-bordered table-hover">
             <thead>
@@ -52,6 +33,24 @@
           </table>
         </div>
       </div>
+
+
+            <table class="table borderless">
+            <tr>
+            <td>
+            <ul class="pager">
+              <li class="previous {if $smarty.get.start <= 0}disabled{/if}">
+                <a href="{if $smarty.get.start|default:"0" <= 0}#{else}{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&registeredstart={$smarty.request.registeredstart|escape|default:"0" - $LIMIT}{if $FILTERS|default:""}{$FILTERS}{/if}{/if}">&larr; Prev</a>
+              </li>
+              <li class="next">
+                <a href="{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&registeredstart={$smarty.request.registeredstart|escape|default:"0" + $LIMIT}{if $FILTERS|default:""}{$FILTERS}{/if}#registrations">Next &rarr;</a>
+              </li>
+            </ul>
+            </td>
+            </tr>
+            </table>
+
+
     </div>
   </div>
 </div> 
diff --git a/public/templates/bootstrap/admin/transactions/default.tpl b/public/templates/bootstrap/admin/transactions/default.tpl
index 96e999d6..dc238ecd 100755
--- a/public/templates/bootstrap/admin/transactions/default.tpl
+++ b/public/templates/bootstrap/admin/transactions/default.tpl
@@ -42,7 +42,6 @@
           <input type="hidden" name="action" value="{$smarty.request.action|escape}" />
             <ul class="pager">
               <li class="previous {if $smarty.get.start <= 0}disabled{/if}">
-                <a href="{if $smarty.get.start <= 0}#{else}{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&start={$smarty.request.start|escape|default:"0" - $LIMIT}{if $FILTERS|default:""}{$FILTERS}{/if}{/if}">&larr; Prev</a>
                 <a href="{if $smarty.get.start|default:"0" <= 0}#{else}{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&start={$smarty.request.start|escape|default:"0" - $LIMIT}{if $FILTERS|default:""}{$FILTERS}{/if}{/if}">&larr; Prev</a>
               </li>
               <li class="next">
diff --git a/public/templates/bootstrap/master.tpl b/public/templates/bootstrap/master.tpl
index b285f826..e872d97c 100644
--- a/public/templates/bootstrap/master.tpl
+++ b/public/templates/bootstrap/master.tpl
@@ -5,12 +5,10 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>{$GLOBAL.website.title} I {$smarty.request.page|escape|default:"home"|capitalize}</title>
 	
-<<<<<<< Updated upstream
   <!--[if lt IE 9]>
   <link rel="stylesheet" href="{$PATH}/css/ie.css" type="text/css" media="screen" />
   <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
   <![endif]-->
-=======
 	<!--[if lt IE 9]>
 	<link rel="stylesheet" href="{$PATH}/css/ie.css" type="text/css" media="screen" />
 	<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
@@ -38,7 +36,6 @@
     <link href="{$PATH}/css/plugins/morris/morris-0.4.3.min.css" rel="stylesheet">
     <link href="{$PATH}/css/plugins/timeline/timeline.css" rel="stylesheet">
     <link href="{$PATH}/css/mpos.css" rel="stylesheet">
->>>>>>> Stashed changes
 
   <!--[if IE]><script type="text/javascript" src="{$PATH}/js/excanvas.js"></script><![endif]-->
   {if $GLOBAL.statistics.analytics.enabled}
@@ -94,25 +91,16 @@
       </div>
     </div>
 
-<<<<<<< Updated upstream
     <div id="footer">
       {include file="global/footer.tpl"}
     </div>
-=======
+
     <script src="{$PATH}/js/jquery-1.10.2.js"></script>
     <script src="{$PATH}/js/bootstrap.min.js"></script>
     <script src="{$PATH}/js/plugins/metisMenu/jquery.metisMenu.js"></script>
-    
-    <!-- Page-Level Plugin Scripts - Morris -->
     <script src="{$PATH}/js/plugins/morris/raphael-2.1.0.min.js"></script>
     <script src="{$PATH}/js/plugins/morris/morris.js"></script>
-    
     <script src="{$PATH}/js/mpos.js"></script>
     <script type="text/javascript" src="{$PATH}/js/justgage.1.0.1.min.js"></script>
-
-    <!-- Page-Level Plugin Scripts - Flot -->
-    <!--[if lte IE 8]><script src="{$PATH}/js/excanvas.min.js"></script><![endif]-->
->>>>>>> Stashed changes
-
   </body>
 </html>