RanchiMall/php-mpos
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1839 from iAmShorty/another-contrib-donors-fix

Browse Source 
[FIX] added >= to values
This commit is contained in:
Sebastian Grewe 2014-02-26 11:20:41 +01:00
commit 9e0d1493a6
2 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
public/templates/mpos/statistics/pool/contributors_hashrate.tpl
View File

@ -19,15 +19,7 @@
{math assign="estday" equation="round(reward / ( diff * pow(2,32) / ( hashrate * 1000 ) / 3600 / 24), 3)" diff=$DIFFICULTY reward=$REWARD hashrate=$CONTRIBHASHES[contrib].hashrate}
<tr{if $GLOBAL.userdata.username|default:""|lower == $CONTRIBHASHES[contrib].account|lower}{assign var=listed value=1} style="background-color:#99EB99;"{else} class="{cycle values="odd,even"}"{/if}>
<td align="center">{$rank++}</td>
<td align="center">
{if $CONTRIBHASHES[contrib].donate_percent > 2}
<i class="icon-award">
{else if $CONTRIBHASHES[contrib].donate_percent < 2 AND $CONTRIBHASHES[contrib].donate_percent > 0}
<i class="icon-star-empty">
{else}
<i class="icon-block"></i>
{/if}
</td>
<td align="center">{if $CONTRIBHASHES[contrib].donate_percent|default:"0" >= 2}<i class="icon-award">{elseif $CONTRIBHASHES[contrib].donate_percent|default:"0" < 2 AND $CONTRIBHASHES[contrib].donate_percent|default:"0" > 0}<i class="icon-star-empty">{else}<i class="icon-block"></i>{/if}</td>
<td align="center" style="padding-right: 0px;">{if $CONTRIBHASHES[contrib].is_anonymous|default:"0" == 1 && $GLOBAL.userdata.is_admin|default:"0" == 0}anonymous{else}{$CONTRIBHASHES[contrib].account|escape}{/if}</td>
<td align="right" style="padding-right: 0px;">{$CONTRIBHASHES[contrib].hashrate|number_format}</td>
<td align="right" style="padding-right: 0px;">{$estday|number_format:"3"}</td>
@ -38,7 +30,7 @@
{math assign="myestday" equation="round(reward / ( diff * pow(2,32) / ( hashrate * 1000 ) / 3600 / 24), 3)" diff=$DIFFICULTY reward=$REWARD hashrate=$GLOBAL.userdata.rawhashrate}
<tr>
<td align="center">n/a</td>
<td align="center">{if $GLOBAL.userdata.donate_percent|default:"0" > 0 AND $GLOBAL.userdata.donate_percent|default:"0" < 2}<i class="icon-star-empty"></i>{elseif $GLOBAL.userdata.donate_percent|default:"0" >= 2}<i class="icon-award"></i>{else}<i class="icon-block"></i>{/if}</td>
<td align="center">{if $GLOBAL.userdata.donate_percent|default:"0" >= 2}<i class="icon-star-empty"></i>{elseif $GLOBAL.userdata.donate_percent|default:"0" < 2 AND $GLOBAL.userdata.donate_percent|default:"0" > 0}<i class="icon-award"></i>{else}<i class="icon-block"></i>{/if}</td>
<td align="center" style="padding-right: 0px;">{$GLOBAL.userdata.username|escape}</td>
<td align="right" style="padding-right: 0px;">{$GLOBAL.userdata.rawhashrate|number_format}</td>
<td align="right" style="padding-right: 0px;">{$myestday|number_format:"3"|default:"n/a"}</td>

20
public/templates/mpos/statistics/pool/contributors_shares.tpl
View File

@ -15,15 +15,7 @@
{section shares $CONTRIBSHARES}
<tr{if $GLOBAL.userdata.username|default:""|lower == $CONTRIBSHARES[shares].account|lower}{assign var=listed value=1} style="background-color:#99EB99;"{else} class="{cycle values="odd,even"}"{/if}>
<td align="center">{$rank++}</td>
<td align="center">
{if $CONTRIBSHARES[shares].donate_percent > 2}
<i class="icon-award">
{else if $CONTRIBSHARES[shares].donate_percent < 2 AND $CONTRIBSHARES[shares].donate_percent > 0}
<i class="icon-star-empty">
{else}
<i class="icon-block"></i>
{/if}
</td>
<td align="center">{if $CONTRIBSHARES[shares].donate_percent|default:"0" >= 2}<i class="icon-award">{else if $CONTRIBSHARES[shares].donate_percent|default:"0" < 2 AND $CONTRIBSHARES[shares].donate_percent|default:"0" > 0}<i class="icon-star-empty">{else}<i class="icon-block"></i>{/if}</td>
<td align="center">{if $CONTRIBSHARES[shares].is_anonymous|default:"0" == 1 && $GLOBAL.userdata.is_admin|default:"0" == 0}anonymous{else}{$CONTRIBSHARES[shares].account|escape}{/if}</td>
<td align="right" style="padding-right: 30px;">{$CONTRIBSHARES[shares].shares|number_format}</td>
</tr>
@ -31,15 +23,7 @@
{if $listed != 1 && $GLOBAL.userdata.username|default:"" && $GLOBAL.userdata.shares.valid|default:"0" > 0}
<tr>
<td align="center">n/a</td>
<td align="center">
{if $GLOBAL.userdata.donate_percent|default:"0" > 0 AND $GLOBAL.userdata.donate_percent|default:"0" < 2}
<i class="icon-star-empty"></i>
{else if $GLOBAL.userdata.donate_percent|default:"0" >= 2}
<i class="icon-award"></i>
{else}
<i class="icon-block"></i>
{/if}
</td>
<td align="center">{if $GLOBAL.userdata.donate_percent|default:"0" >= 2}<i class="icon-star-empty"></i>{elseif $GLOBAL.userdata.donate_percent|default:"0" < 2 AND $GLOBAL.userdata.donate_percent|default:"0" > 0}<i class="icon-award"></i>{else}<i class="icon-block"></i>{/if}</td>
<td align="center">{$GLOBAL.userdata.username|escape}</td>
<td align="right" style="padding-right: 30px;">{$GLOBAL.userdata.shares.valid|number_format}</td>
</tr>