From 493db31dcc5509023c24938f329a9eaa1f053332 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Thu, 12 Sep 2013 17:56:41 +0200
Subject: [PATCH] adding better colors for confirms/orphans/...

---
 public/site_assets/test/css/layout.css        | 32 +++++++++++++++++++
 .../test/account/transactions/default.tpl     | 13 ++++----
 .../test/admin/transactions/default.tpl       | 11 +++----
 .../test/statistics/blocks/default.tpl        |  8 ++---
 4 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/public/site_assets/test/css/layout.css b/public/site_assets/test/css/layout.css
index 41310e6b..cb61f289 100644
--- a/public/site_assets/test/css/layout.css
+++ b/public/site_assets/test/css/layout.css
@@ -836,3 +836,35 @@ color: #32510F;
 padding: 10px 0;
 text-indent: 40px;
 font-size: 14px;}
+
+/* Custom stuff */
+span.confirmed {
+  display: inline-block;
+  width: 60px;
+  font-size: 10px;
+  background: #e6efc2;
+  color:#264409;
+  padding: 2px 4px;
+  border:1px solid #c6d880;
+  border-radius: 4px;
+}
+span.orphan {
+  display: inline-block;
+  width: 60px;
+  font-size: 10px;
+  background: #ff9473;
+  color:#264409;
+  padding: 2px 4px;
+  border:1px solid #ff6342;
+  border-radius: 4px;
+}
+span.unconfirmed {
+  display: inline-block;
+  width: 60px;
+  font-size: 10px;
+  background: #ffce9c;
+  color:#264409;
+  padding: 2px 4px;
+  border:1px solid #ffb573;
+  border-radius: 4px;
+}
diff --git a/public/templates/test/account/transactions/default.tpl b/public/templates/test/account/transactions/default.tpl
index 31d0db36..ab34012b 100644
--- a/public/templates/test/account/transactions/default.tpl
+++ b/public/templates/test/account/transactions/default.tpl
@@ -70,7 +70,7 @@
           <th >Account</th>
           <th >Date</th>
           <th >TX Type</th>
-          <th >Status</th>
+          <th align="center">Status</th>
           <th >Payment Address</th>
           <th >Block #</th>
           <th >Amount</th>
@@ -83,7 +83,7 @@
           <td>{$TRANSACTIONS[transaction].username}</td>
           <td>{$TRANSACTIONS[transaction].timestamp}</td>
           <td>{$TRANSACTIONS[transaction].type}</td>
-          <td>
+          <td align="center">
             {if $TRANSACTIONS[transaction].type == 'Credit_PPS' OR
                 $TRANSACTIONS[transaction].type == 'Fee_PPS' OR
                 $TRANSACTIONS[transaction].type == 'Donation_PPS' OR
@@ -91,10 +91,9 @@
                 $TRANSACTIONS[transaction].type == 'Debit_AP' OR
                 $TRANSACTIONS[transaction].type == 'TXFee' OR
                 $TRANSACTIONS[transaction].confirmations >= $GLOBAL.confirmations
-            }<font color="green">Confirmed</font>
-            {else if $TRANSACTIONS[transaction].confirmations == -1}<font color="red">Orphaned</font>
-            {else}<font color="orange">Unconfirmed</font>{/if}
-            <font size="1px">({$TRANSACTIONS[transaction].confirmations|default:"n/a"})</font>
+            }<span class="confirmed">Confirmed</span>
+            {else if $TRANSACTIONS[transaction].confirmations == -1}<span class="orphan">Orphaned</span>
+            {else}<span class="unconfirmed">Unconfirmed</span>{/if}
           </td>
           <td>{$TRANSACTIONS[transaction].coin_address}</td>
           <td>{if $TRANSACTIONS[transaction].height == 0}n/a{else}{if $GLOBAL.website.blockexplorer.url}<a href="{$GLOBAL.website.blockexplorer.url}{$TRANSACTIONS[transaction].blockhash}">{$TRANSACTIONS[transaction].height}</a>{else}{$TRANSACTIONS[transaction].height}{/if}{/if}</td>
@@ -103,5 +102,5 @@
 {/section}
       </tbody>
     </table>
-    <footer><font size="1"><b>Credit_AP</b> = Auto Threshold Payment, <b>Credit_MP</b> = Manual Payment, <b>Donation</b> = Donation, <b>Fee</b> = Pool Fees (if applicable)</font></footer>
+    <footer><p style="margin-left: 25px; font-size: 9px;"><b>Debit_AP</b> = Auto Threshold Payment, <b>Debit_MP</b> = Manual Payment, <b>Donation</b> = Donation, <b>Fee</b> = Pool Fees (if applicable)</p></footer>
 </article>
diff --git a/public/templates/test/admin/transactions/default.tpl b/public/templates/test/admin/transactions/default.tpl
index 40f67d00..162863d0 100644
--- a/public/templates/test/admin/transactions/default.tpl
+++ b/public/templates/test/admin/transactions/default.tpl
@@ -78,7 +78,7 @@
           <th >Account</th>
           <th >Date</th>
           <th >TX Type</th>
-          <th >Status</th>
+          <th align="center">Status</th>
           <th >Payment Address</th>
           <th >Block #</th>
           <th >Amount</th>
@@ -91,7 +91,7 @@
           <td>{$TRANSACTIONS[transaction].username}</td>
           <td>{$TRANSACTIONS[transaction].timestamp}</td>
           <td>{$TRANSACTIONS[transaction].type}</td>
-          <td>
+          <td align="center">
             {if $TRANSACTIONS[transaction].type == 'Credit_PPS' OR
                 $TRANSACTIONS[transaction].type == 'Fee_PPS' OR
                 $TRANSACTIONS[transaction].type == 'Donation_PPS' OR
@@ -99,10 +99,9 @@
                 $TRANSACTIONS[transaction].type == 'Debit_AP' OR
                 $TRANSACTIONS[transaction].type == 'TXFee' OR
                 $TRANSACTIONS[transaction].confirmations >= $GLOBAL.confirmations
-            }<font color="green">Confirmed</font>
-            {else if $TRANSACTIONS[transaction].confirmations == -1}<font color="red">Orphaned</font>
-            {else}<font color="orange">Unconfirmed</font>{/if}
-            <font size="1px">({$TRANSACTIONS[transaction].confirmations|default:"n/a"})</font>
+            }<span class="confirmed">Confirmed</span>
+            {else if $TRANSACTIONS[transaction].confirmations == -1}<span class="orphan">Orphaned</span>
+            {else}<span class="unconfirmed">Unconfirmed</span>{/if}
           </td>
           <td>{$TRANSACTIONS[transaction].coin_address}</td>
           <td>{if $TRANSACTIONS[transaction].height == 0}n/a{else}{if $GLOBAL.website.blockexplorer.url}<a href="{$GLOBAL.website.blockexplorer.url}{$TRANSACTIONS[transaction].blockhash}">{$TRANSACTIONS[transaction].height}</a>{else}{$TRANSACTIONS[transaction].height}{/if}{/if}</td>
diff --git a/public/templates/test/statistics/blocks/default.tpl b/public/templates/test/statistics/blocks/default.tpl
index d214890f..d0bbb186 100644
--- a/public/templates/test/statistics/blocks/default.tpl
+++ b/public/templates/test/statistics/blocks/default.tpl
@@ -58,17 +58,17 @@
       {assign var="count" value=$count+1}
       <tr class="{cycle values="odd,even"}">
 {if ! $GLOBAL.website.blockexplorer.disabled}
-        <td align="center"><a href="{$GLOBAL.website.blockexplorer.url}{$BLOCKSFOUND[block].blockhash}" target="_blank">{$BLOCKSFOUND[block].height}</a></td>
+        <td align="center"><a href="{$smarty.server.PHP_SELF}?page=statistics&action=round&height={$BLOCKSFOUND[block].height}">{$BLOCKSFOUND[block].height}</a></td>
 {else}
         <td align="center">{$BLOCKSFOUND[block].height}</td>
 {/if}
         <td align="center">
 {if $BLOCKSFOUND[block].confirmations >= $GLOBAL.confirmations}
-          <font color="green">Confirmed</font>
+          <span class="confirmed">Confirmed</span>
 {else if $BLOCKSFOUND[block].confirmations == -1}
-          <font color="red">Orphan</font>
+          <span class="orphan">Orphan</span>
 {else}
-          {$GLOBAL.confirmations - $BLOCKSFOUND[block].confirmations} left
+          <span class="unconfirmed">{$GLOBAL.confirmations - $BLOCKSFOUND[block].confirmations} left</span>
 {/if}
         </td>
         <td>{if $BLOCKSFOUND[block].is_anonymous|default:"0" == 1}anonymous{else}{$BLOCKSFOUND[block].finder|default:"unknown"|escape}{/if}</td>