From a68a77b832cdea8cd28aa6259156c2f95aeb0020 Mon Sep 17 00:00:00 2001
From: iAmShorty <rafta@gmx.net>
Date: Sat, 1 Mar 2014 21:41:23 +0100
Subject: [PATCH 1/3] [UPDATE] pagination in round stats

---
 .../statistics/round/pplns_block_stats.tpl    | 55 ++++++++-----------
 .../round/pplns_block_stats_small.tpl         | 20 +++----
 .../statistics/round/pplns_transactions.tpl   |  4 +-
 3 files changed, 34 insertions(+), 45 deletions(-)

diff --git a/public/templates/bootstrap/statistics/round/pplns_block_stats.tpl b/public/templates/bootstrap/statistics/round/pplns_block_stats.tpl
index f518b7b5..264d13f3 100755
--- a/public/templates/bootstrap/statistics/round/pplns_block_stats.tpl
+++ b/public/templates/bootstrap/statistics/round/pplns_block_stats.tpl
@@ -4,21 +4,31 @@
       <div class="panel-heading">
         <i class="fa fa-refresh fa-fw"></i> Round Statistics
       </div>
+      <div class="panel-body">
+        <form action="{$smarty.server.SCRIPT_NAME}" method="POST" id='search' role="form">
+          <input type="hidden" name="page" value="{$smarty.request.page|escape}">
+          <input type="hidden" name="action" value="{$smarty.request.action|escape}">
+          <label>Search Block Height</label>
+          <div class="form-group input-group">
+            <input type="text" class="form-control" name="search" value="{$smarty.request.height|default:"%"|escape}">
+            <span class="input-group-btn">
+              <button class="btn btn-default" type="submit" value="Search"><i class="fa fa-search"></i>
+              </button>
+            </span>
+          </div>
+        </form>
+        <ul class="pager">
+          <li class="previous">
+            <a href="{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&height={$BLOCKDETAILS.height}&prev=1"> &larr; </a>
+          </li>
+          <li class="next">
+            <a href="{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&height={$BLOCKDETAILS.height}&next=1"> &rarr; </a>
+          </li>
+        </ul>
+      </div>
+      
       <div class="panel-body no-padding">
         <div class="table-responsive">
-          <table class="table table-striped table-bordered table-hover">
-
-            <tbody>
-              <tr>
-                <td>
-                  <a href="{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&height={$BLOCKDETAILS.height}&prev=1"><i class="fa fa-chevron-left fa-fw"></i></a>
-                </td>
-                <td colspan="4">
-                  <a href="{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&height={$BLOCKDETAILS.height}&next=1"><i class="fa fa-chevron-right fa-fw"></i></a>
-                </td>
-              </tr>
-            </tbody>
-          </table>
           <table class="table table-striped table-bordered table-hover">
             <thead>
               <tr>
@@ -89,24 +99,7 @@
               </tr>
             </tbody>
           </table>
-
-  
-          <footer>
-            <form action="{$smarty.server.SCRIPT_NAME}" method="POST" id='search' role="form">
-              <input type="hidden" name="page" value="{$smarty.request.page|escape}">
-              <input type="hidden" name="action" value="{$smarty.request.action|escape}">
-              <div class="form-group input-group">
-                <input type="text" class="form-control" name="search" value="{$smarty.request.height|default:"%"|escape}">
-                <span class="input-group-btn">
-                  <button class="btn btn-default" type="submit" value="Search"><i class="fa fa-search"></i>
-                  </button>
-                </span>
-              </div>
-            </form>
-          </footer>
-  
         </div>
       </div>
     </div>
-  </div>
-</div>
+  </d
\ No newline at end of file
diff --git a/public/templates/bootstrap/statistics/round/pplns_block_stats_small.tpl b/public/templates/bootstrap/statistics/round/pplns_block_stats_small.tpl
index 80e17be6..3636f8b2 100755
--- a/public/templates/bootstrap/statistics/round/pplns_block_stats_small.tpl
+++ b/public/templates/bootstrap/statistics/round/pplns_block_stats_small.tpl
@@ -4,18 +4,14 @@
       <div class="panel-heading">
         <i class="fa fa-bar-chart fa-fw"></i> Block Statistics
       </div>
-      <table class="table table-striped table-bordered table-hover">
-        <tbody>
-          <tr>
-            <td>
-              <a href="{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&height={$BLOCKDETAILS.height}&prev=1"><i class="icon-left-open"></i></a>
-            </td>
-            <td colspan="4">
-              <a href="{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&height={$BLOCKDETAILS.height}&next=1"><i class="icon-right-open"></i></a>
-            </td>
-          </tr>
-        </tbody>
-      </table>
+      <ul class="pager">
+        <li class="previous">
+          <a href="{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&height={$BLOCKDETAILS.height}&prev=1">&larr; Prev</a>
+        </li>
+        <li class="next">
+          <a href="{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&height={$BLOCKDETAILS.height}&next=1">Next &rarr;</a>
+        </li>
+      </ul>
       <table class="tablesorter">
         <thead>
           <tr>
diff --git a/public/templates/bootstrap/statistics/round/pplns_transactions.tpl b/public/templates/bootstrap/statistics/round/pplns_transactions.tpl
index 2beab5d0..e47508a8 100755
--- a/public/templates/bootstrap/statistics/round/pplns_transactions.tpl
+++ b/public/templates/bootstrap/statistics/round/pplns_transactions.tpl
@@ -4,12 +4,12 @@
       <div class="panel-heading">
         <i class="fa fa-credit-card fa-fw"></i> Round Transactions
       </div>
-      <div class="panel-body no-padding">
+      <div class="panel-body ">
         <div class="table-responsive">
           <table class="table table-striped table-bordered table-hover">
             <thead>
               <tr>
-                <th >User Name</th>
+                <th>User Name</th>
                 <th>Round Shares</th>
                 <th>Round %</th>
                 <th>PPLNS Shares</th>

From dfc71bfeebede9f353604b0e1ff3552e5d8fc143 Mon Sep 17 00:00:00 2001
From: root <rog1121@gmail.com>
Date: Sat, 1 Mar 2014 13:42:53 -0700
Subject: [PATCH 2/3] Datatables

---
 public/site_assets/bootstrap/js/mpos.js                     | 5 +++++
 public/templates/bootstrap/master.tpl                       | 4 ++--
 public/templates/bootstrap/statistics/round/default.tpl     | 2 +-
 .../bootstrap/statistics/round/pplns_round_shares.tpl       | 4 ++--
 .../bootstrap/statistics/round/pplns_transactions.tpl       | 4 ++--
 .../bootstrap/statistics/round/pplns_transactions_small.tpl | 4 ++--
 .../templates/bootstrap/statistics/round/round_shares.tpl   | 4 ++--
 .../bootstrap/statistics/round/round_transactions.tpl       | 6 +++---
 8 files changed, 19 insertions(+), 14 deletions(-)
 mode change 100644 => 100755 public/site_assets/bootstrap/js/mpos.js
 mode change 100644 => 100755 public/templates/bootstrap/master.tpl
 mode change 100644 => 100755 public/templates/bootstrap/statistics/round/default.tpl

diff --git a/public/site_assets/bootstrap/js/mpos.js b/public/site_assets/bootstrap/js/mpos.js
old mode 100644
new mode 100755
index 9c759314..de552279
--- a/public/site_assets/bootstrap/js/mpos.js
+++ b/public/site_assets/bootstrap/js/mpos.js
@@ -16,3 +16,8 @@ $(function() {
         }
     })
 })
+
+// Make all table with "datatable" class a datatable
+$(document).ready(function() {
+  $('.datatable').dataTable();
+});
\ No newline at end of file
diff --git a/public/templates/bootstrap/master.tpl b/public/templates/bootstrap/master.tpl
old mode 100644
new mode 100755
index a9079c1a..dc2c682c
--- a/public/templates/bootstrap/master.tpl
+++ b/public/templates/bootstrap/master.tpl
@@ -29,10 +29,10 @@
   <script src="{$PATH}/js/jquery-2.0.3.min.js"></script>
   <script src="{$PATH}/js/bootstrap.min.js"></script>
   <script src="{$PATH}/js/bootstrap-switch.min.js"></script>
+  <script src="{$PATH}/js/plugins/dataTables/jquery.dataTables.js"></script>
+  <script src="{$PATH}/js/plugins/dataTables/dataTables.bootstrap.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>
     
diff --git a/public/templates/bootstrap/statistics/round/default.tpl b/public/templates/bootstrap/statistics/round/default.tpl
old mode 100644
new mode 100755
index 61507860..a231928e
--- a/public/templates/bootstrap/statistics/round/default.tpl
+++ b/public/templates/bootstrap/statistics/round/default.tpl
@@ -16,4 +16,4 @@
    {include file="statistics/round/block_stats.tpl"}
    {include file="statistics/round/round_shares.tpl"}
    </div>
-{/if}
+{/if}
\ No newline at end of file
diff --git a/public/templates/bootstrap/statistics/round/pplns_round_shares.tpl b/public/templates/bootstrap/statistics/round/pplns_round_shares.tpl
index 1e8cd9cd..881bd9d6 100755
--- a/public/templates/bootstrap/statistics/round/pplns_round_shares.tpl
+++ b/public/templates/bootstrap/statistics/round/pplns_round_shares.tpl
@@ -3,9 +3,9 @@
       <div class="panel-heading">
         <i class="fa fa-refresh fa-fw"></i> PPLNS Round Shares
       </div>
-      <div class="panel-body no-padding">
+      <div class="panel-body">
         <div class="table-responsive">
-          <table class="table table-striped table-bordered table-hover">
+          <table class="table table-striped table-bordered table-hover datatable">
             <thead>
               <tr>        
                 <th>Rank</th>
diff --git a/public/templates/bootstrap/statistics/round/pplns_transactions.tpl b/public/templates/bootstrap/statistics/round/pplns_transactions.tpl
index 2beab5d0..faf0ec3d 100755
--- a/public/templates/bootstrap/statistics/round/pplns_transactions.tpl
+++ b/public/templates/bootstrap/statistics/round/pplns_transactions.tpl
@@ -4,9 +4,9 @@
       <div class="panel-heading">
         <i class="fa fa-credit-card fa-fw"></i> Round Transactions
       </div>
-      <div class="panel-body no-padding">
+      <div class="panel-body">
         <div class="table-responsive">
-          <table class="table table-striped table-bordered table-hover">
+          <table class="table table-striped table-bordered table-hover datatable">
             <thead>
               <tr>
                 <th >User Name</th>
diff --git a/public/templates/bootstrap/statistics/round/pplns_transactions_small.tpl b/public/templates/bootstrap/statistics/round/pplns_transactions_small.tpl
index d15d3f20..f054dd25 100755
--- a/public/templates/bootstrap/statistics/round/pplns_transactions_small.tpl
+++ b/public/templates/bootstrap/statistics/round/pplns_transactions_small.tpl
@@ -4,9 +4,9 @@
       <div class="panel-heading">
         <i class="fa fa-refresh fa-fw"></i> Round Statistics
       </div>
-      <div class="panel-body no-padding">
+      <div class="panel-body">
         <div class="table-responsive">
-          <table class="table table-striped table-bordered table-hover">
+          <table class="table table-striped table-bordered table-hover datatable">
             <thead>
               <tr>
                 <th >User Name</th>
diff --git a/public/templates/bootstrap/statistics/round/round_shares.tpl b/public/templates/bootstrap/statistics/round/round_shares.tpl
index c2c26b4c..9dc3b842 100755
--- a/public/templates/bootstrap/statistics/round/round_shares.tpl
+++ b/public/templates/bootstrap/statistics/round/round_shares.tpl
@@ -3,9 +3,9 @@
       <div class="panel-heading">
         <i class="fa fa-refresh fa-fw"></i> Round Shares
       </div>
-      <div class="panel-body no-padding">
+      <div class="panel-body">
         <div class="table-responsive">
-          <table class="table table-striped table-bordered table-hover">
+          <table class="table table-striped table-bordered table-hover datatable">
             <thead>
               <tr>
                 <th>Rank</th>
diff --git a/public/templates/bootstrap/statistics/round/round_transactions.tpl b/public/templates/bootstrap/statistics/round/round_transactions.tpl
index 254b5da8..1f91fe6f 100755
--- a/public/templates/bootstrap/statistics/round/round_transactions.tpl
+++ b/public/templates/bootstrap/statistics/round/round_transactions.tpl
@@ -3,15 +3,15 @@
       <div class="panel-heading">
         Round Transactions
       </div>
-      <div class="panel-body no-padding">
+      <div class="panel-body">
         <div class="table-responsive">
-          <table class="table table-striped table-bordered table-hover">
+          <table class="table table-striped table-bordered table-hover datatable">
             <thead>
       <tr>
         <th>User Name</th>
         <th>Type</th>
         <th>Round Shares</th>
-        <th scope="col">Round %</th>
+        <th>Round %</th>
         <th>Amount</th>
       </tr>
     </thead>

From 78e4a4b3baf82d326b5fe1f1f41f8608909c3513 Mon Sep 17 00:00:00 2001
From: iAmShorty <rafta@gmx.net>
Date: Sat, 1 Mar 2014 21:48:37 +0100
Subject: [PATCH 3/3] [UPDATE] fixed news header

---
 public/templates/bootstrap/home/default.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/templates/bootstrap/home/default.tpl b/public/templates/bootstrap/home/default.tpl
index d0fd2a94..7098af12 100755
--- a/public/templates/bootstrap/home/default.tpl
+++ b/public/templates/bootstrap/home/default.tpl
@@ -3,7 +3,7 @@
   <div class="col-lg-12">
     <div class="panel panel-info">
       <div class="panel-heading">
-        <i class="fa fa-info fa-fw"></i> <a href="#collapse{$smarty.section.news.index}">{$NEWS[news].header}</a>
+        <i class="fa fa-info fa-fw"></i> {$NEWS[news].header}</a>
         <br />
         <font size="1px">posted {$NEWS[news].time|date_format:"%b %e, %Y at %H:%M"}{if $HIDEAUTHOR|default:"0" == 0} by <b>{$NEWS[news].author}</b>{/if}</font>
       </div>