From d4c5d3197c561766fd79ce401e815dafbcb168d8 Mon Sep 17 00:00:00 2001 From: SamuelNZ Date: Mon, 31 Mar 2014 12:48:46 +1300 Subject: [PATCH 1/8] Update mpos.css Removing Inline CSS --- public/site_assets/bootstrap/css/mpos.css | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/public/site_assets/bootstrap/css/mpos.css b/public/site_assets/bootstrap/css/mpos.css index 6bec5713..c0d8eaab 100644 --- a/public/site_assets/bootstrap/css/mpos.css +++ b/public/site_assets/bootstrap/css/mpos.css @@ -365,7 +365,7 @@ div.dataTables_paginate { div.dataTables_paginate ul.pagination { font-size: 11px; - + } /* Circle Buttons */ @@ -585,3 +585,15 @@ div.fade { } /* End Test */ + +/* Tables */ + +.table>tbody>tr>th +{ +padding-left:3px; +border: 1px solid #ddd; +background-color: #f9f9f9; +padding-right:1px; +} + +/* End Tables */ From 5546becf591c19fb6e44b86c084f02a93d0bbaa5 Mon Sep 17 00:00:00 2001 From: SamuelNZ Date: Mon, 31 Mar 2014 12:50:28 +1300 Subject: [PATCH 2/8] Update block_overview_time.tpl Removing Inline CSS --- .../bootstrap/statistics/blocks/block_overview_time.tpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/templates/bootstrap/statistics/blocks/block_overview_time.tpl b/public/templates/bootstrap/statistics/blocks/block_overview_time.tpl index 353f4384..27d8e59a 100644 --- a/public/templates/bootstrap/statistics/blocks/block_overview_time.tpl +++ b/public/templates/bootstrap/statistics/blocks/block_overview_time.tpl @@ -24,7 +24,7 @@ - All Time + All Time {($FIRSTBLOCKFOUND / $COINGENTIME)|number_format} {$LASTBLOCKSBYTIME.Total|number_format} {$LASTBLOCKSBYTIME.TotalValid|number_format} @@ -49,7 +49,7 @@ {($LASTBLOCKSBYTIME.Total|default:"0.00" / ($FIRSTBLOCKFOUND / $COINGENTIME) * 100)|number_format:"2"}% - Last Hour + Last Hour {(3600 / $COINGENTIME)|number_format} {$LASTBLOCKSBYTIME.1HourTotal|number_format} {$LASTBLOCKSBYTIME.1HourValid|number_format} @@ -99,7 +99,7 @@ {($LASTBLOCKSBYTIME.24HourTotal|default:"0.00" / (86400 / $COINGENTIME) * 100)|number_format:"2"}% - Last 7 Days + Last 7 Days {(604800 / $COINGENTIME)|number_format} {$LASTBLOCKSBYTIME.7DaysTotal|number_format} {$LASTBLOCKSBYTIME.7DaysValid|number_format} @@ -124,7 +124,7 @@ {($LASTBLOCKSBYTIME.7DaysTotal|default:"0.00" / (604800 / $COINGENTIME) * 100)|number_format:"2"}% - Last 4 Weeks + Last 4 Weeks {(2419200 / $COINGENTIME)|number_format} {$LASTBLOCKSBYTIME.4WeeksTotal|number_format} {$LASTBLOCKSBYTIME.4WeeksValid|number_format} From bd0ad4ecb78983e41a22fd9267beca01613e0975 Mon Sep 17 00:00:00 2001 From: SamuelNZ Date: Mon, 31 Mar 2014 12:55:50 +1300 Subject: [PATCH 3/8] Update block_overview_time.tpl Oops, Missed one. --- .../bootstrap/statistics/blocks/block_overview_time.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/templates/bootstrap/statistics/blocks/block_overview_time.tpl b/public/templates/bootstrap/statistics/blocks/block_overview_time.tpl index 27d8e59a..fb95cd01 100644 --- a/public/templates/bootstrap/statistics/blocks/block_overview_time.tpl +++ b/public/templates/bootstrap/statistics/blocks/block_overview_time.tpl @@ -149,7 +149,7 @@ {($LASTBLOCKSBYTIME.4WeeksTotal|default:"0.00" / (2419200 / $COINGENTIME) * 100)|number_format:"2"}% - The Past 12 Months + The Past 12 Months {(29030400 / $COINGENTIME)|number_format} {$LASTBLOCKSBYTIME.12MonthTotal|number_format} {$LASTBLOCKSBYTIME.12MonthValid|number_format} From aea490059399f36834f3f43b96e447b5b3cfc284 Mon Sep 17 00:00:00 2001 From: SamuelNZ Date: Mon, 31 Mar 2014 14:00:07 +1300 Subject: [PATCH 4/8] [UPDATE] --- public/site_assets/bootstrap/css/mpos.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/public/site_assets/bootstrap/css/mpos.css b/public/site_assets/bootstrap/css/mpos.css index c0d8eaab..52ca6872 100644 --- a/public/site_assets/bootstrap/css/mpos.css +++ b/public/site_assets/bootstrap/css/mpos.css @@ -591,9 +591,11 @@ div.fade { .table>tbody>tr>th { padding-left:3px; +padding-bottom:4px; border: 1px solid #ddd; background-color: #f9f9f9; padding-right:1px; + } /* End Tables */ From a4738f8d18e2dc9d4a1b25a1584003eef21e9289 Mon Sep 17 00:00:00 2001 From: SamuelNZ Date: Mon, 31 Mar 2014 14:01:17 +1300 Subject: [PATCH 5/8] [UPDATE] Small tweak --- public/site_assets/bootstrap/css/mpos.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/site_assets/bootstrap/css/mpos.css b/public/site_assets/bootstrap/css/mpos.css index 52ca6872..ac071e0b 100644 --- a/public/site_assets/bootstrap/css/mpos.css +++ b/public/site_assets/bootstrap/css/mpos.css @@ -591,7 +591,7 @@ div.fade { .table>tbody>tr>th { padding-left:3px; -padding-bottom:4px; +padding-bottom:3px; border: 1px solid #ddd; background-color: #f9f9f9; padding-right:1px; From ca8bbcc0b985ad74f3967de963cea70333954700 Mon Sep 17 00:00:00 2001 From: SamuelNZ Date: Mon, 31 Mar 2014 14:17:57 +1300 Subject: [PATCH 6/8] [UPDATE] Transactions display Fixes alignment issues with Transaction History. --- public/site_assets/bootstrap/css/mpos.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/site_assets/bootstrap/css/mpos.css b/public/site_assets/bootstrap/css/mpos.css index ac071e0b..2fc93d14 100644 --- a/public/site_assets/bootstrap/css/mpos.css +++ b/public/site_assets/bootstrap/css/mpos.css @@ -595,7 +595,11 @@ padding-bottom:3px; border: 1px solid #ddd; background-color: #f9f9f9; padding-right:1px; +} +.table>tbody>tr>td +{ + padding:4px; } /* End Tables */ From 981862a0de5e77bcd7ac225112a1c2f1f8336f90 Mon Sep 17 00:00:00 2001 From: SamuelNZ Date: Mon, 31 Mar 2014 16:18:33 +1300 Subject: [PATCH 7/8] [UPDATE] Syntax --- .../bootstrap/statistics/pool/contributors_hashrate.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/templates/bootstrap/statistics/pool/contributors_hashrate.tpl b/public/templates/bootstrap/statistics/pool/contributors_hashrate.tpl index fdbb0565..ab200abe 100644 --- a/public/templates/bootstrap/statistics/pool/contributors_hashrate.tpl +++ b/public/templates/bootstrap/statistics/pool/contributors_hashrate.tpl @@ -35,7 +35,7 @@ {/section} {if $listed != 1 && $GLOBAL.userdata.username|default:"" && $GLOBAL.userdata.rawhashrate|default:"0" > 0} {math assign="myestday" equation="round(reward / ( diff * pow(2,32) / ( hashrate * 1000 ) / 3600 / 24), 3)" diff=$DIFFICULTY reward=$REWARD hashrate=$GLOBAL.userdata.rawhashrate} - {if $GLOBAL.userdata.username|default:""|lower == $CONTRIBHASHES[contrib].account|lower}{assign var=listed value=1}{else}{/if}> + {if $GLOBAL.userdata.username|default:""|lower == $CONTRIBHASHES[contrib].account|lower}{assign var=listed value=1}{else}{/if}> n/a {if $GLOBAL.userdata.donate_percent|default:"0" >= 2}{elseif $GLOBAL.userdata.donate_percent|default:"0" < 2 AND $GLOBAL.userdata.donate_percent|default:"0" > 0}{else}{/if} {$GLOBAL.userdata.username|escape} From 828ebdf7fab8e6968e7176b84d9c32e285ab6756 Mon Sep 17 00:00:00 2001 From: SamuelNZ Date: Mon, 31 Mar 2014 16:19:17 +1300 Subject: [PATCH 8/8] [UPDATE] Syntax --- .../templates/bootstrap/statistics/pool/contributors_shares.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/templates/bootstrap/statistics/pool/contributors_shares.tpl b/public/templates/bootstrap/statistics/pool/contributors_shares.tpl index 374ea223..fec7d3ab 100644 --- a/public/templates/bootstrap/statistics/pool/contributors_shares.tpl +++ b/public/templates/bootstrap/statistics/pool/contributors_shares.tpl @@ -25,7 +25,7 @@ {/section} {if $listed != 1 && $GLOBAL.userdata.username|default:"" && $GLOBAL.userdata.shares.valid|default:"0" > 0} - {if $GLOBAL.userdata.username|default:""|lower == $CONTRIBHASHES[contrib].account|lower}{assign var=listed value=1}{else}{/if}> + {if $GLOBAL.userdata.username|default:""|lower == $CONTRIBHASHES[contrib].account|lower}{assign var=listed value=1}{else}{/if}> n/a {if $GLOBAL.userdata.donate_percent|default:"0" >= 2}{elseif $GLOBAL.userdata.donate_percent|default:"0" < 2 AND $GLOBAL.userdata.donate_percent|default:"0" > 0}{else}{/if} {$GLOBAL.userdata.username|escape}