From 9308da54ed0cdbc0e751ce580992588920f77f7a Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Wed, 30 Oct 2013 08:38:54 +0100
Subject: [PATCH] [IMPROVED] Block stats in pool overview

---
 .../mpos/statistics/pool/general_stats.tpl    | 68 +++++++++++--------
 1 file changed, 41 insertions(+), 27 deletions(-)

diff --git a/public/templates/mpos/statistics/pool/general_stats.tpl b/public/templates/mpos/statistics/pool/general_stats.tpl
index 56aa9e13..e87bf49c 100644
--- a/public/templates/mpos/statistics/pool/general_stats.tpl
+++ b/public/templates/mpos/statistics/pool/general_stats.tpl
@@ -35,7 +35,7 @@
       </tbody>
     </table>
   </div>
-  
+
   <header><h3>Block Statistics</h3></header>
   <div class="module_content">
     <table width="100%">
@@ -43,46 +43,60 @@
     {if ! $GLOBAL.website.blockexplorer.disabled}
         <tr>
           <th align="left" width="50%">Next Network Block</td>
-          <td>{$CURRENTBLOCK + 1} &nbsp;&nbsp;<font size="1"> (Current: <a href="{$GLOBAL.website.blockexplorer.url}{$CURRENTBLOCKHASH}" target="_new">{$CURRENTBLOCK})</a></font></td>
+          <td colspan="3">{$CURRENTBLOCK + 1} &nbsp;&nbsp;<font size="1"> (Current: <a href="{$GLOBAL.website.blockexplorer.url}{$CURRENTBLOCKHASH}" target="_new">{$CURRENTBLOCK})</a></font></td>
         </tr>
     {else}
         <tr>
           <th align="left">Next Network Block</td>
-          <td>{$CURRENTBLOCK + 1} &nbsp;&nbsp; (Current: {$CURRENTBLOCK})</td>
+          <td colspan="3">{$CURRENTBLOCK + 1} &nbsp;&nbsp; (Current: {$CURRENTBLOCK})</td>
         </tr>
     {/if}
         <tr>
           <th align="left">Last Block Found</td>
-          <td><a href="{$smarty.server.PHP_SELF}?page=statistics&action=round&height={$LASTBLOCK}" target="_new">{$LASTBLOCK|default:"0"}</a></td>
-        </tr>
-        <tr>
-          <th align="left">All Blocks - Found / Valid / Orphan</td>
-          <td>{$FOUNDALLVALID + $FOUNDALLORPHAN} / {$FOUNDALLVALID} / {$FOUNDALLORPHAN}</td>
-        </tr>
-        <tr>
-          <th align="left">Blocks last hour - Found / Valid / Orphan</td>
-          <td>{$FOUNDLASTHOURVALID + $FOUNDLASTHOURORPHAN} / {$FOUNDLASTHOURVALID} / {$FOUNDLASTHOURORPHAN}</td>
-        </tr>
-        <tr>
-          <th align="left">Blocks last 24 hours - Found / Valid / Orphan</td>
-          <td>{$FOUNDLAST24HOURSVALID + $FOUNDLAST24HOURSORPHAN} / {$FOUNDLAST24HOURSVALID} / {$FOUNDLAST24HOURSORPHAN}</td>
-        </tr>
-        <tr>
-          <th align="left">Blocks last 7 days - Found / Valid / Orphan</td>
-          <td>{$FOUNDLAST7DAYSVALID + $FOUNDLAST7DAYSORPHAN} / {$FOUNDLAST7DAYSVALID} / {$FOUNDLAST7DAYSORPHAN}</td>
-        </tr>
-        <tr>
-          <th align="left">Blocks last 4 weeks - Found / Valid / Orphan</td>
-          <td>{$FOUNDLAST4WEEKSVALID + $FOUNDLAST4WEEKSORPHAN} / {$FOUNDLAST4WEEKSVALID} / {$FOUNDLAST4WEEKSORPHAN}</td>
+          <td colspan="3"><a href="{$smarty.server.PHP_SELF}?page=statistics&action=round&height={$LASTBLOCK}" target="_new">{$LASTBLOCK|default:"0"}</a></td>
         </tr>
         <tr>
           <th align="left">Time Since Last Block</td>
-          <td>{$TIMESINCELAST|seconds_to_words}</td>
+          <td colspan="3">{$TIMESINCELAST|seconds_to_words}</td>
+        </tr>
+        <tr>
+          <th align="left"></th>
+          <th align="center">Found</th>
+          <th align="center">Valid</th>
+          <th align="center">Orphan</th>
+        </tr>
+        <tr>
+          <th align="left">All Time</td>
+          <td align="center">{$FOUNDALLVALID + $FOUNDALLORPHAN}</td>
+          <td align="center">{$FOUNDALLVALID}</td>
+          <td align="center">{$FOUNDALLORPHAN}</td>
+        </tr>
+        <tr>
+          <th align="left">Last Hour</td>
+          <td align="center">{$FOUNDLASTHOURVALID + $FOUNDLASTHOURORPHAN}</td>
+          <td align="center">{$FOUNDLASTHOURVALID}</td>
+          <td align="center">{$FOUNDLASTHOURORPHAN}</td>
+        </tr>
+        <tr>
+          <th align="left">Last 24 Hours</td>
+          <td align="center">{$FOUNDLAST24HOURSVALID + $FOUNDLAST24HOURSORPHAN}
+          <td align="center">{$FOUNDLAST24HOURSVALID}</td>
+          <td align="center">{$FOUNDLAST24HOURSORPHAN}</td>
+        </tr>
+        <tr>
+          <th align="left">Last 7 Days</td>
+          <td align="center">{$FOUNDLAST7DAYSVALID + $FOUNDLAST7DAYSORPHAN}</td>
+          <td align="center">{$FOUNDLAST7DAYSVALID}</td>
+          <td align="center">{$FOUNDLAST7DAYSORPHAN}</td>
+        </tr>
+        <tr>
+          <th align="left">Last 4 Weeks</td>
+          <td align="center">{$FOUNDLAST4WEEKSVALID + $FOUNDLAST4WEEKSORPHAN}</td>
+          <td align="center">{$FOUNDLAST4WEEKSVALID}</td>
+          <td align="center">{$FOUNDLAST4WEEKSORPHAN}</td>
         </tr>
       </tbody>
     </table>
-    
-        
   </div>
   <footer>
 {if !$GLOBAL.website.api.disabled}<ul><li>These stats are also available in JSON format <a href="{$smarty.server.PHP_SELF}?page=api&action=getpoolstatus&api_key={$GLOBAL.userdata.api_key|default:""}">HERE</a></li></ul>{/if}