From 6df2010b53abc7efc1ea70524bdf66f3a95493f7 Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Wed, 26 Feb 2014 10:42:45 +0100 Subject: [PATCH 1/2] [FIX] Donor icons out of order --- .../statistics/pool/contributors_shares.tpl | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/public/templates/mpos/statistics/pool/contributors_shares.tpl b/public/templates/mpos/statistics/pool/contributors_shares.tpl index 5b6cfe22..b1daf454 100644 --- a/public/templates/mpos/statistics/pool/contributors_shares.tpl +++ b/public/templates/mpos/statistics/pool/contributors_shares.tpl @@ -15,7 +15,15 @@ {section shares $CONTRIBSHARES} {$rank++} - {if $CONTRIBSHARES[shares].donate_percent|default:"0" > 0 AND $CONTRIBSHARES[shares].donate_percent|default:"0" < 2}{elseif $CONTRIBHASHES[shares].donate_percent|default:"0" >= 2}{else}{/if} + + {if $CONTRIBSHARES[shares].donate_percent > 2} + + {else if $CONTRIBSHARES[shares].donate_percent < 2 AND $CONTRIBSHARES[shares].donate_percent > 0} + + {else} + + {/if} + {if $CONTRIBSHARES[shares].is_anonymous|default:"0" == 1 && $GLOBAL.userdata.is_admin|default:"0" == 0}anonymous{else}{$CONTRIBSHARES[shares].account|escape}{/if} {$CONTRIBSHARES[shares].shares|number_format} @@ -23,7 +31,15 @@ {if $listed != 1 && $GLOBAL.userdata.username|default:"" && $GLOBAL.userdata.shares.valid|default:"0" > 0} n/a - {if $GLOBAL.userdata.donate_percent|default:"0" > 0 AND $GLOBAL.userdata.donate_percent|default:"0" < 2}{elseif $GLOBAL.userdata.donate_percent|default:"0" >= 2}{else}{/if} + + {if $GLOBAL.userdata.donate_percent|default:"0" > 0 AND $GLOBAL.userdata.donate_percent|default:"0" < 2} + + {else if $GLOBAL.userdata.donate_percent|default:"0" >= 2} + + {else} + + {/if} + {$GLOBAL.userdata.username|escape} {$GLOBAL.userdata.shares.valid|number_format} From bcc45e22cfe10d73f8ed7fca1cdc178c37523494 Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Wed, 26 Feb 2014 10:47:10 +0100 Subject: [PATCH 2/2] [FIX] Same fix for hashrate list Formatting updated --- .../statistics/pool/contributors_hashrate.tpl | 10 +++++++++- .../mpos/statistics/pool/contributors_shares.tpl | 16 ++++++++-------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/public/templates/mpos/statistics/pool/contributors_hashrate.tpl b/public/templates/mpos/statistics/pool/contributors_hashrate.tpl index 76e25e12..493262d5 100644 --- a/public/templates/mpos/statistics/pool/contributors_hashrate.tpl +++ b/public/templates/mpos/statistics/pool/contributors_hashrate.tpl @@ -19,7 +19,15 @@ {math assign="estday" equation="round(reward / ( diff * pow(2,32) / ( hashrate * 1000 ) / 3600 / 24), 3)" diff=$DIFFICULTY reward=$REWARD hashrate=$CONTRIBHASHES[contrib].hashrate} {$rank++} - {if $CONTRIBHASHES[contrib].donate_percent|default:"0" > 0 AND $CONTRIBHASHES[contrib].donate_percent|default:"0" < 2}{elseif $CONTRIBHASHES[contrib].donate_percent|default:"0" >= 2}{else}{/if} + + {if $CONTRIBHASHES[contrib].donate_percent > 2} + + {else if $CONTRIBHASHES[contrib].donate_percent < 2 AND $CONTRIBHASHES[contrib].donate_percent > 0} + + {else} + + {/if} + {if $CONTRIBHASHES[contrib].is_anonymous|default:"0" == 1 && $GLOBAL.userdata.is_admin|default:"0" == 0}anonymous{else}{$CONTRIBHASHES[contrib].account|escape}{/if} {$CONTRIBHASHES[contrib].hashrate|number_format} {$estday|number_format:"3"} diff --git a/public/templates/mpos/statistics/pool/contributors_shares.tpl b/public/templates/mpos/statistics/pool/contributors_shares.tpl index b1daf454..d875bfd0 100644 --- a/public/templates/mpos/statistics/pool/contributors_shares.tpl +++ b/public/templates/mpos/statistics/pool/contributors_shares.tpl @@ -16,14 +16,14 @@ {$rank++} - {if $CONTRIBSHARES[shares].donate_percent > 2} - - {else if $CONTRIBSHARES[shares].donate_percent < 2 AND $CONTRIBSHARES[shares].donate_percent > 0} - - {else} - - {/if} - + {if $CONTRIBSHARES[shares].donate_percent > 2} + + {else if $CONTRIBSHARES[shares].donate_percent < 2 AND $CONTRIBSHARES[shares].donate_percent > 0} + + {else} + + {/if} + {if $CONTRIBSHARES[shares].is_anonymous|default:"0" == 1 && $GLOBAL.userdata.is_admin|default:"0" == 0}anonymous{else}{$CONTRIBSHARES[shares].account|escape}{/if} {$CONTRIBSHARES[shares].shares|number_format}