diff --git a/public/templates/bootstrap/statistics/blocks/block_overview_time.tpl b/public/templates/bootstrap/statistics/blocks/block_overview_time.tpl index 9d24bd51..2ac6687f 100644 --- a/public/templates/bootstrap/statistics/blocks/block_overview_time.tpl +++ b/public/templates/bootstrap/statistics/blocks/block_overview_time.tpl @@ -10,168 +10,168 @@ - Gen est. - Found - Valid - Orphan - Avg Diff - Shares est. - Shares - Percentage - Amount - Rate est. + Gen est. + Found + Valid + Orphan + Avg Diff + Shares est. + Shares + Percentage + Amount + Rate est. all time - {($FIRSTBLOCKFOUND / $COINGENTIME)|number_format:"0"} - {$LASTBLOCKSBYTIME.Total} - {$LASTBLOCKSBYTIME.TotalValid} - {$LASTBLOCKSBYTIME.TotalOrphan} - + {($FIRSTBLOCKFOUND / $COINGENTIME)|number_format} + {$LASTBLOCKSBYTIME.Total|number_format} + {$LASTBLOCKSBYTIME.TotalValid|number_format} + {$LASTBLOCKSBYTIME.TotalOrphan|number_format} + {if $LASTBLOCKSBYTIME.TotalValid > 0} {($LASTBLOCKSBYTIME.TotalDifficulty / $LASTBLOCKSBYTIME.TotalValid)|number_format:"4"} {else} 0 {/if} - {$LASTBLOCKSBYTIME.TotalEstimatedShares} - {$LASTBLOCKSBYTIME.TotalShares} - + {$LASTBLOCKSBYTIME.TotalEstimatedShares|number_format} + {$LASTBLOCKSBYTIME.TotalShares|number_format} + {if $LASTBLOCKSBYTIME.TotalEstimatedShares > 0} {($LASTBLOCKSBYTIME.TotalShares / $LASTBLOCKSBYTIME.TotalEstimatedShares * 100)|number_format:"2"}% {else} 0.00% {/if} - {$LASTBLOCKSBYTIME.TotalAmount} - {($LASTBLOCKSBYTIME.Total|default:"0.00" / ($FIRSTBLOCKFOUND / $COINGENTIME) * 100)|number_format:"2"}% + {$LASTBLOCKSBYTIME.TotalAmount|number_format} + {($LASTBLOCKSBYTIME.Total|default:"0.00" / ($FIRSTBLOCKFOUND / $COINGENTIME) * 100)|number_format:"2"}% last hour - {(3600 / $COINGENTIME)} - {$LASTBLOCKSBYTIME.1HourTotal} - {$LASTBLOCKSBYTIME.1HourValid} - {$LASTBLOCKSBYTIME.1HourOrphan} - + {(3600 / $COINGENTIME)|number_format} + {$LASTBLOCKSBYTIME.1HourTotal|number_format} + {$LASTBLOCKSBYTIME.1HourValid|number_format} + {$LASTBLOCKSBYTIME.1HourOrphan|number_format} + {if $LASTBLOCKSBYTIME.1HourValid > 0} {($LASTBLOCKSBYTIME.1HourDifficulty / $LASTBLOCKSBYTIME.1HourValid)|number_format:"4"} {else} 0 {/if} - {$LASTBLOCKSBYTIME.1HourEstimatedShares} - {$LASTBLOCKSBYTIME.1HourShares} - + {$LASTBLOCKSBYTIME.1HourEstimatedShares|number_format} + {$LASTBLOCKSBYTIME.1HourShares|number_format} + {if $LASTBLOCKSBYTIME.1HourEstimatedShares > 0} {($LASTBLOCKSBYTIME.1HourShares / $LASTBLOCKSBYTIME.1HourEstimatedShares * 100)|number_format:"2"}% {else} 0.00% {/if} - {$LASTBLOCKSBYTIME.1HourAmount} - {($LASTBLOCKSBYTIME.1HourTotal|default:"0.00" / (3600 / $COINGENTIME) * 100)|number_format:"2"}% + {$LASTBLOCKSBYTIME.1HourAmount|number_format} + {($LASTBLOCKSBYTIME.1HourTotal|default:"0.00" / (3600 / $COINGENTIME) * 100)|number_format:"2"}% last 24 hours - {(86400 / $COINGENTIME)} - {$LASTBLOCKSBYTIME.24HourTotal} - {$LASTBLOCKSBYTIME.24HourValid} - {$LASTBLOCKSBYTIME.24HourOrphan} - + {(86400 / $COINGENTIME)|number_format} + {$LASTBLOCKSBYTIME.24HourTotal|number_format} + {$LASTBLOCKSBYTIME.24HourValid|number_format} + {$LASTBLOCKSBYTIME.24HourOrphan|number_format} + {if $LASTBLOCKSBYTIME.24HourValid > 0} {($LASTBLOCKSBYTIME.24HourDifficulty / $LASTBLOCKSBYTIME.24HourValid)|number_format:"4"} {else} 0 {/if} - {$LASTBLOCKSBYTIME.24HourEstimatedShares} - {$LASTBLOCKSBYTIME.24HourShares} - + {$LASTBLOCKSBYTIME.24HourEstimatedShares|number_format} + {$LASTBLOCKSBYTIME.24HourShares|number_format} + {if $LASTBLOCKSBYTIME.24HourEstimatedShares > 0} {($LASTBLOCKSBYTIME.24HourShares / $LASTBLOCKSBYTIME.24HourEstimatedShares * 100)|number_format:"2"}% {else} 0.00% {/if} - {$LASTBLOCKSBYTIME.24HourAmount} - {($LASTBLOCKSBYTIME.24HourTotal|default:"0.00" / (86400 / $COINGENTIME) * 100)|number_format:"2"}% + {$LASTBLOCKSBYTIME.24HourAmount|number_format} + {($LASTBLOCKSBYTIME.24HourTotal|default:"0.00" / (86400 / $COINGENTIME) * 100)|number_format:"2"}% last 7 days - {(604800 / $COINGENTIME)} - {$LASTBLOCKSBYTIME.7DaysTotal} - {$LASTBLOCKSBYTIME.7DaysValid} - {$LASTBLOCKSBYTIME.7DaysOrphan} - + {(604800 / $COINGENTIME)|number_format} + {$LASTBLOCKSBYTIME.7DaysTotal|number_format} + {$LASTBLOCKSBYTIME.7DaysValid|number_format} + {$LASTBLOCKSBYTIME.7DaysOrphan|number_format} + {if $LASTBLOCKSBYTIME.7DaysValid > 0} {($LASTBLOCKSBYTIME.7DaysDifficulty / $LASTBLOCKSBYTIME.7DaysValid)|number_format:"4"} {else} 0 {/if} - {$LASTBLOCKSBYTIME.7DaysEstimatedShares} - {$LASTBLOCKSBYTIME.7DaysShares} - + {$LASTBLOCKSBYTIME.7DaysEstimatedShares|number_format} + {$LASTBLOCKSBYTIME.7DaysShares|number_format} + {if $LASTBLOCKSBYTIME.7DaysEstimatedShares > 0} {($LASTBLOCKSBYTIME.7DaysShares / $LASTBLOCKSBYTIME.7DaysEstimatedShares * 100)|number_format:"2"}% {else} 0.00% {/if} - {$LASTBLOCKSBYTIME.7DaysAmount} - {($LASTBLOCKSBYTIME.7DaysTotal|default:"0.00" / (604800 / $COINGENTIME) * 100)|number_format:"2"}% + {$LASTBLOCKSBYTIME.7DaysAmount} + {($LASTBLOCKSBYTIME.7DaysTotal|default:"0.00" / (604800 / $COINGENTIME) * 100)|number_format:"2"}% last 4 Weeks - {(2419200 / $COINGENTIME)} - {$LASTBLOCKSBYTIME.4WeeksTotal} - {$LASTBLOCKSBYTIME.4WeeksValid} - {$LASTBLOCKSBYTIME.4WeeksOrphan} - + {(2419200 / $COINGENTIME)|number_format} + {$LASTBLOCKSBYTIME.4WeeksTotal|number_format} + {$LASTBLOCKSBYTIME.4WeeksValid|number_format} + {$LASTBLOCKSBYTIME.4WeeksOrphan|number_format} + {if $LASTBLOCKSBYTIME.4WeeksValid > 0} {($LASTBLOCKSBYTIME.4WeeksDifficulty / $LASTBLOCKSBYTIME.4WeeksValid)|number_format:"4"} {else} 0 {/if} - {$LASTBLOCKSBYTIME.4WeeksEstimatedShares} - {$LASTBLOCKSBYTIME.4WeeksShares} - + {$LASTBLOCKSBYTIME.4WeeksEstimatedShares|number_format} + {$LASTBLOCKSBYTIME.4WeeksShares|number_format} + {if $LASTBLOCKSBYTIME.4WeeksEstimatedShares > 0} {($LASTBLOCKSBYTIME.4WeeksShares / $LASTBLOCKSBYTIME.4WeeksEstimatedShares * 100)|number_format:"2"}% {else} 0.00% {/if} - {$LASTBLOCKSBYTIME.4WeeksAmount} - {($LASTBLOCKSBYTIME.4WeeksTotal|default:"0.00" / (2419200 / $COINGENTIME) * 100)|number_format:"2"}% + {$LASTBLOCKSBYTIME.4WeeksAmount|number_format} + {($LASTBLOCKSBYTIME.4WeeksTotal|default:"0.00" / (2419200 / $COINGENTIME) * 100)|number_format:"2"}% last 12 Month - {(29030400 / $COINGENTIME)} - {$LASTBLOCKSBYTIME.12MonthTotal} - {$LASTBLOCKSBYTIME.12MonthValid} - {$LASTBLOCKSBYTIME.12MonthOrphan} - + {(29030400 / $COINGENTIME)|number_format} + {$LASTBLOCKSBYTIME.12MonthTotal|number_format} + {$LASTBLOCKSBYTIME.12MonthValid|number_format} + {$LASTBLOCKSBYTIME.12MonthOrphan|number_format} + {if $LASTBLOCKSBYTIME.12MonthValid > 0} {($LASTBLOCKSBYTIME.12MonthDifficulty / $LASTBLOCKSBYTIME.12MonthValid)|number_format:"4"} {else} 0 {/if} - {$LASTBLOCKSBYTIME.12MonthEstimatedShares} - {$LASTBLOCKSBYTIME.12MonthShares} - + {$LASTBLOCKSBYTIME.12MonthEstimatedShares|number_format} + {$LASTBLOCKSBYTIME.12MonthShares|number_format} + {if $LASTBLOCKSBYTIME.12MonthEstimatedShares > 0} {($LASTBLOCKSBYTIME.12MonthShares / $LASTBLOCKSBYTIME.12MonthEstimatedShares * 100)|number_format:"2"}% {else} 0.00% {/if} - {$LASTBLOCKSBYTIME.12MonthAmount} - {($LASTBLOCKSBYTIME.12MonthTotal|default:"0.00" / (29030400 / $COINGENTIME) * 100)|number_format:"2"}% + {$LASTBLOCKSBYTIME.12MonthAmount|number_format} + {($LASTBLOCKSBYTIME.12MonthTotal|default:"0.00" / (29030400 / $COINGENTIME) * 100)|number_format:"2"}% diff --git a/public/templates/bootstrap/statistics/blocks/blocks_found_details.tpl b/public/templates/bootstrap/statistics/blocks/blocks_found_details.tpl index 7a13d239..d223ee68 100644 --- a/public/templates/bootstrap/statistics/blocks/blocks_found_details.tpl +++ b/public/templates/bootstrap/statistics/blocks/blocks_found_details.tpl @@ -9,16 +9,16 @@ - - - - - - - - {if $GLOBAL.config.payout_system == 'pplns'}{/if} - - + + + + + + + + {if $GLOBAL.config.payout_system == 'pplns'}{/if} + + @@ -32,11 +32,11 @@ {assign var="count" value=$count+1} {if $GLOBAL.config.payout_system == 'pplns'}{assign var="pplnsshares" value=$pplnsshares+$BLOCKSFOUND[block].pplns_shares}{/if} {if ! $GLOBAL.website.blockexplorer.disabled} - + {else} - + {/if} - - - - - + + + {if $GLOBAL.config.payout_system == 'pplns'} - + {/if} - - + @@ -65,12 +65,12 @@ {/section} - + {if $GLOBAL.config.payout_system == 'pplns'} - + {/if} - - + +
BlockValidityFinderTimeDifficultyAmountExpected SharesPPLNS SharesActual SharesPercentageBlockValidityFinderTimeDifficultyAmountExpected SharesPPLNS SharesActual SharesPercentage
{$BLOCKSFOUND[block].height}{$BLOCKSFOUND[block].height}{$BLOCKSFOUND[block].height}{$BLOCKSFOUND[block].height} + {if $BLOCKSFOUND[block].confirmations >= $GLOBAL.confirmations} Confirmed {else if $BLOCKSFOUND[block].confirmations == -1} @@ -46,18 +46,18 @@ {/if} {if $BLOCKSFOUND[block].is_anonymous|default:"0" == 1 && $GLOBAL.userdata.is_admin|default:"0" == 0}anonymous{else}{$BLOCKSFOUND[block].finder|default:"unknown"|escape}{/if}{$BLOCKSFOUND[block].time|date_format:"%d/%m %H:%M:%S"}{$BLOCKSFOUND[block].difficulty|number_format:"2"}{$BLOCKSFOUND[block].amount|number_format:"2"} + {$BLOCKSFOUND[block].time|date_format:"%d/%m %H:%M:%S"}{$BLOCKSFOUND[block].difficulty|number_format:"4"}{$BLOCKSFOUND[block].amount|number_format:"2"} {assign var="totalexpectedshares" value=$totalexpectedshares+$BLOCKSFOUND[block].estshares} {$BLOCKSFOUND[block].estshares|number_format} {$BLOCKSFOUND[block].pplns_shares|number_format}{$BLOCKSFOUND[block].pplns_shares|number_format}{$BLOCKSFOUND[block].shares|number_format} + {$BLOCKSFOUND[block].shares|number_format} {math assign="percentage" equation="shares / estshares * 100" shares=$BLOCKSFOUND[block].shares|default:"0" estshares=$BLOCKSFOUND[block].estshares} {$percentage|number_format:"2"}
Totals{$totalexpectedshares|number_format}{$totalexpectedshares|number_format}{$pplnsshares|number_format}{$pplnsshares|number_format}{$totalshares|number_format}{if $count > 0}{($totalshares / $totalexpectedshares * 100)|number_format:"2"}{else}0{/if}{$totalshares|number_format}{if $count > 0}{($totalshares / $totalexpectedshares * 100)|number_format:"2"}{else}0{/if}