diff --git a/public/templates/bootstrap/home/news_all.tpl b/public/templates/bootstrap/home/news_all.tpl index 780a6996..af229f98 100644 --- a/public/templates/bootstrap/home/news_all.tpl +++ b/public/templates/bootstrap/home/news_all.tpl @@ -3,7 +3,7 @@
- {$NEWS[news].header} + {$NEWS[news].header}
posted {$NEWS[news].time|date_format:"%b %e, %Y at %H:%M"}{if $HIDEAUTHOR|default:"0" == 0} by {$NEWS[news].author}{/if}
@@ -13,4 +13,4 @@
-{/section} \ No newline at end of file +{/section} diff --git a/public/templates/bootstrap/statistics/pool/contributors_hashrate.tpl b/public/templates/bootstrap/statistics/pool/contributors_hashrate.tpl index bb49912e..1606da37 100644 --- a/public/templates/bootstrap/statistics/pool/contributors_hashrate.tpl +++ b/public/templates/bootstrap/statistics/pool/contributors_hashrate.tpl @@ -22,9 +22,9 @@ {assign var=listed value=0} {section contrib $CONTRIBHASHES} {math assign="estday" equation="round(reward / ( diff * pow(2,32) / ( hashrate * 1000 ) / 3600 / 24), 3)" diff=$DIFFICULTY reward=$REWARD hashrate=$CONTRIBHASHES[contrib].hashrate} - {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} {$rank++} - {if $CONTRIBHASHES[contrib].donate_percent|default:"0" >= 2}{elseif $CONTRIBHASHES[contrib].donate_percent|default:"0" < 2 AND $CONTRIBHASHES[contrib].donate_percent|default:"0" > 0}{else}{/if} + {if $CONTRIBHASHES[contrib].donate_percent|default:"0" >= 2}{elseif $CONTRIBHASHES[contrib].donate_percent|default:"0" < 2 AND $CONTRIBHASHES[contrib].donate_percent|default:"0" > 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"} @@ -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} - + {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} diff --git a/public/templates/bootstrap/statistics/pool/contributors_shares.tpl b/public/templates/bootstrap/statistics/pool/contributors_shares.tpl index 06661e03..525a1cc9 100644 --- a/public/templates/bootstrap/statistics/pool/contributors_shares.tpl +++ b/public/templates/bootstrap/statistics/pool/contributors_shares.tpl @@ -17,9 +17,9 @@ {assign var=rank value=1} {assign var=listed value=0} {section shares $CONTRIBSHARES} - {if $GLOBAL.userdata.username|default:""|lower == $CONTRIBSHARES[shares].account|lower}{assign var=listed value=1}{else}{/if} + {if $GLOBAL.userdata.username|default:""|lower == $CONTRIBSHARES[shares].account|lower}{assign var=listed value=1}{else}{/if} {$rank++} - {if $CONTRIBSHARES[shares].donate_percent|default:"0" >= 2}{else if $CONTRIBSHARES[shares].donate_percent|default:"0" < 2 AND $CONTRIBSHARES[shares].donate_percent|default:"0" > 0}{else}{/if} + {if $CONTRIBSHARES[shares].donate_percent|default:"0" >= 2}{else if $CONTRIBSHARES[shares].donate_percent|default:"0" < 2 AND $CONTRIBSHARES[shares].donate_percent|default:"0" > 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} diff --git a/public/templates/bootstrap/statistics/pool/general_stats.tpl b/public/templates/bootstrap/statistics/pool/general_stats.tpl index d1ef22b3..ee589a5f 100644 --- a/public/templates/bootstrap/statistics/pool/general_stats.tpl +++ b/public/templates/bootstrap/statistics/pool/general_stats.tpl @@ -11,15 +11,15 @@ {$GLOBAL.hashrate|number_format:"3"} {$GLOBAL.hashunits.pool} - Pool Efficiency + Pool Efficiency {if $GLOBAL.roundshares.valid > 0}{($GLOBAL.roundshares.valid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100)|number_format:"2"}%{else}0%{/if} - Current Active Workers + Current Active Workers {$GLOBAL.workers} - Current Difficulty + Current Difficulty {if ! $GLOBAL.website.chaininfo.disabled} {$NETWORK.difficulty} {else} @@ -27,7 +27,7 @@ {/if} - Est. Next Difficulty + Est. Next Difficulty {if ! $GLOBAL.website.chaininfo.disabled} {$NETWORK.EstNextDifficulty|number_format:"8"} (Change in {$NETWORK.BlocksUntilDiffChange} Blocks) {else} @@ -35,34 +35,34 @@ {/if} - Est. Avg. Time per Round (Network) + Est. Avg. Time per Round (Network) {$NETWORK.EstTimePerBlock|seconds_to_words} - Est. Avg. Time per Round (Pool) + Est. Avg. Time per Round (Pool) {$ESTTIME|seconds_to_words} - Est. Shares this Round + Est. Shares this Round {$ESTIMATES.shares} (done: {$ESTIMATES.percent}%) {if ! $GLOBAL.website.blockexplorer.disabled} - Next Network Block + Next Network Block {$CURRENTBLOCK + 1}    (Current: {$CURRENTBLOCK}) {else} - Next Network Block + Next Network Block {$CURRENTBLOCK + 1}    (Current: {$CURRENTBLOCK}) {/if} - Last Block Found + Last Block Found {$LASTBLOCK|default:"0"} - Time Since Last Block + Time Since Last Block {$TIMESINCELAST|seconds_to_words}