From 3c7bb41f815c497e4aded0bbcae8e9549d5af413 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Mon, 9 Sep 2013 07:45:35 +0200
Subject: [PATCH] stats template changes

---
 .../test/statistics/pool/authenticated.tpl    | 65 -------------------
 .../test/statistics/pool/default.tpl          |  7 ++
 .../test/statistics/pool/general_stats.tpl    | 59 +++++++++++++++++
 3 files changed, 66 insertions(+), 65 deletions(-)
 delete mode 100644 public/templates/test/statistics/pool/authenticated.tpl
 create mode 100644 public/templates/test/statistics/pool/default.tpl
 create mode 100644 public/templates/test/statistics/pool/general_stats.tpl

diff --git a/public/templates/test/statistics/pool/authenticated.tpl b/public/templates/test/statistics/pool/authenticated.tpl
deleted file mode 100644
index 67136bb9..00000000
--- a/public/templates/test/statistics/pool/authenticated.tpl
+++ /dev/null
@@ -1,65 +0,0 @@
-{include file="statistics/pool/contributors_shares.tpl"}
-
-{include file="statistics/pool/contributors_hashrate.tpl"}
-
-<article class="module width_half">
-  <header><h3>General Statistics</h3></header>
-  <div class="module_content">
-<table class="" width="100%" style="font-size:13px;">
-  <tbody>
-    <tr>
-      <td class="leftheader">Pool Hash Rate</td>
-      <td>{($GLOBAL.hashrate / 1000)|number_format:"3"} Mhash/s</td>
-    </tr>
-    <tr>
-      <td class="leftheader">Pool Efficiency</td>
-      <td>{if $GLOBAL.roundshares.valid > 0}{($GLOBAL.roundshares.valid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100)|number_format:"2"}%{else}0%{/if}</td>
-    </tr>
-    <tr>
-      <td class="leftheader">Current Active Workers</td>
-      <td>{$GLOBAL.workers}</td>
-    </tr>
-    {if $GLOBAL.website.blockexplorer.url}
-    <tr>
-      <td class="leftheader">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>
-    </tr>
-    {else}
-    <tr>
-      <td class="leftheader">Next Network Block</td>
-      <td>{$CURRENTBLOCK + 1} &nbsp;&nbsp; (Current: {$CURRENTBLOCK})</td>
-    </tr>
-    {/if}
-    <tr>
-      <td class="leftheader">Last Block Found</td>
-      <td>{if $GLOBAL.website.blockexplorer.url}<a href="{$GLOBAL.website.blockexplorer.url}{$LASTBLOCKHASH}" target="_new">{$LASTBLOCK|default:"0"}</a>{else}{$LASTBLOCK|default:"0"}{/if}</td>
-    </tr>
-    <tr>
-      <td class="leftheader">Current Difficulty</td>
-      {if ! $GLOBAL.website.chaininfo.disabled}
-      <td><a href="{$GLOBAL.website.chaininfo.url}" target="_new"><font size="2">{$DIFFICULTY}</font></a></td>
-      {else}
-      <td><font size="2">{$DIFFICULTY}</font></td>
-      {/if}
-    </tr>
-    <tr>
-      <td class="leftheader">Est. Avg. Time per Round</td>
-      <td>{$ESTTIME|seconds_to_words}</td>
-    </tr>
-    <tr>
-      <td class="leftheader">Est. Shares this Round</td>
-      <td>{(pow(2, 32 - $GLOBAL.config.targetdiff) * $DIFFICULTY)|number_format:"0"} <font size="1">(done: {(100 / (pow(2, 32 - $GLOBAL.config.targetdiff) * $DIFFICULTY) * $GLOBAL.roundshares.valid)|number_format:"2"} %)</td>
-    </tr>
-    <tr>
-      <td class="leftheader">Time Since Last Block</td>
-      <td>{$TIMESINCELAST|seconds_to_words}</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}">HERE</a></li></ul>{/if}
-</footer>
-</article>
-
-{include file="statistics/blocks/small_table.tpl" ALIGN="right" SHORT=true}
diff --git a/public/templates/test/statistics/pool/default.tpl b/public/templates/test/statistics/pool/default.tpl
new file mode 100644
index 00000000..689fb741
--- /dev/null
+++ b/public/templates/test/statistics/pool/default.tpl
@@ -0,0 +1,7 @@
+{include file="statistics/pool/contributors_shares.tpl"}
+
+{include file="statistics/pool/contributors_hashrate.tpl"}
+
+{include file="statistics/pool/general_stats.tpl"}
+
+{include file="statistics/blocks/small_table.tpl" ALIGN="right" SHORT=true}
diff --git a/public/templates/test/statistics/pool/general_stats.tpl b/public/templates/test/statistics/pool/general_stats.tpl
new file mode 100644
index 00000000..975eec6b
--- /dev/null
+++ b/public/templates/test/statistics/pool/general_stats.tpl
@@ -0,0 +1,59 @@
+<article class="module width_half">
+  <header><h3>General Statistics</h3></header>
+  <div class="module_content">
+    <table width="100%">
+      <tbody>
+        <tr>
+          <th align="left" width="30%">Pool Hash Rate</th>
+          <td width="70%">{($GLOBAL.hashrate / 1000)|number_format:"3"} Mhash/s</td>
+        </tr>
+        <tr>
+          <th align="left">Pool Efficiency</td>
+          <td>{if $GLOBAL.roundshares.valid > 0}{($GLOBAL.roundshares.valid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100)|number_format:"2"}%{else}0%{/if}</td>
+        </tr>
+        <tr>
+          <th align="left">Current Active Workers</td>
+          <td>{$GLOBAL.workers}</td>
+        </tr>
+    {if $GLOBAL.website.blockexplorer.url}
+        <tr>
+          <th align="left">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>
+        </tr>
+    {else}
+        <tr>
+          <th align="left">Next Network Block</td>
+          <td>{$CURRENTBLOCK + 1} &nbsp;&nbsp; (Current: {$CURRENTBLOCK})</td>
+        </tr>
+    {/if}
+        <tr>
+          <th align="left">Last Block Found</td>
+          <td>{if $GLOBAL.website.blockexplorer.url}<a href="{$GLOBAL.website.blockexplorer.url}{$LASTBLOCKHASH}" target="_new">{$LASTBLOCK|default:"0"}</a>{else}{$LASTBLOCK|default:"0"}{/if}</td>
+        </tr>
+        <tr>
+          <th align="left">Current Difficulty</td>
+      {if ! $GLOBAL.website.chaininfo.disabled}
+          <td><a href="{$GLOBAL.website.chaininfo.url}" target="_new"><font size="2">{$DIFFICULTY}</font></a></td>
+      {else}
+          <td><font size="2">{$DIFFICULTY}</font></td>
+      {/if}
+        </tr>
+        <tr>
+          <th align="left">Est. Avg. Time per Round</td>
+          <td>{$ESTTIME|seconds_to_words}</td>
+        </tr>
+        <tr>
+          <th align="left">Est. Shares this Round</td>
+          <td>{(pow(2, 32 - $GLOBAL.config.targetdiff) * $DIFFICULTY)|number_format:"0"} <font size="1">(done: {(100 / (pow(2, 32 - $GLOBAL.config.targetdiff) * $DIFFICULTY) * $GLOBAL.roundshares.valid)|number_format:"2"} %)</td>
+        </tr>
+        <tr>
+          <th align="left">Time Since Last Block</td>
+          <td>{$TIMESINCELAST|seconds_to_words}</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}
+  </footer>
+</article>