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

Merge branch 'next' of github.com:TheSerapher/php-mmcfe-ng into next

Browse Source
This commit is contained in:
Sebastian Grewe 2013-05-26 20:29:58 +02:00
commit 3849454a2e
5 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/site_assets/mmcFE/css/style.css
View File

@ -459,6 +459,14 @@ a:hover {
font-size: 11px;
}
.block table tr td.right{
text-align: right;
}
.block table tr th.right{
text-align: right;
}
.block table tr td.delete a { color: #666; }
.block table tr td.delete a:hover { color: #dd0000; }

24
public/templates/mmcFE/global/sidebar.tpl
View File

@ -7,55 +7,55 @@
<div class="block_content" style="padding-top:10px;">
<table class="sidebar">
<tr><td colspan="2"><b>Your Current Hashrate</b></td></tr>
<tr><td colspan="2">{$GLOBAL.userdata.hashrate} KH/s</td></tr>
<tr><td colspan="2" class="right">{$GLOBAL.userdata.hashrate} KH/s</td></tr>
<tr>
<td colspan="2"><b><u>Unpaid Shares</u></b> <span id='tt'><img src='{$PATH}/images/questionmark.png' height='15px' width='15px' title='Submitted shares between the last 120 confirms block until now.'></span><td>
</tr>
<tr>
<td><b>Your Valid<b></td>
<td><i>{$GLOBAL.userdata.shares.valid}</i><font size='1px'></font></b></td>
<td class="right"><i>{$GLOBAL.userdata.shares.valid}</i><font size='1px'></font></b></td>
</tr>
<tr>
<td><b>Pool Valid</td>
<td><i>{$GLOBAL.roundshares.valid}</i> <font size='1px'></font></b></td>
<td class="right"><i>{$GLOBAL.roundshares.valid}</i> <font size='1px'></font></b></td>
</tr>
<tr>
<td colspan="2"><b><u>Round Shares</u></b> <span id='tt'><img src='{$PATH}/images/questionmark.png' height='15px' width='15px' title='Submitted shares since last found block (ie. round shares)'></span></td>
</tr>
<tr>
<td><b>Pool Valid</b></td>
<td><i>{$GLOBAL.roundshares.valid}</i></td>
<td class="right"><i>{$GLOBAL.roundshares.valid}</i></td>
</tr>
<tr>
<td><b>Pool Invalid</b></td>
<td><i>{$GLOBAL.roundshares.invalid}</i></td>
<td class="right"><i>{$GLOBAL.roundshares.invalid}</i></td>
</tr>
<tr>
<td><b>Your Invalid</b></td>
<td><i>{$GLOBAL.userdata.shares.invalid}</i><font size='1px'></font></td>
<td class="right"><i>{$GLOBAL.userdata.shares.invalid}</i><font size='1px'></font></td>
</tr>
<tr>
<td colspan="2"><b><u>Round Estimate</u></b></td>
<td colspan="2"><b><u>LTC Round Estimate</u></b></td>
</tr>
<tr>
<td><b>Block</b></td>
<td>{$GLOBAL.userdata.est_block} LTC</td>
<td class="right">{$GLOBAL.userdata.est_block}</td>
</tr>
<tr>
<td><b>Fees</b></td>
<td>{$GLOBAL.userdata.est_fee} LTC</td>
<td class="right">{$GLOBAL.userdata.est_fee}</td>
</tr>
<tr>
<td><b>Donation</b></td>
<td>{$GLOBAL.userdata.est_donation} LTC</td>
<td class="right">{$GLOBAL.userdata.est_donation}</td>
</tr>
<tr>
<td><b>Payout</b></td>
<td>{$GLOBAL.userdata.est_payout} LTC</td>
<td class="right">{$GLOBAL.userdata.est_payout}</td>
</tr>
<tr><td colspan="2">&nbsp;</td></tr>
<tr><td colspan="2"><b><u>Account Balance</u></b></td></tr>
<tr><td colspan="2"><b>{$GLOBAL.userdata.balance|default:"0"} LTC</td></tr>
<tr><td colspan="2" class="right"><b>{$GLOBAL.userdata.balance|default:"0"} LTC</td></tr>
</table>
</div>
<div class="bendl"></div>

8
public/templates/mmcFE/statistics/blocks/blocks_found.tpl
View File

@ -7,8 +7,8 @@
<th scope="col" align="left">Validity</th>
<th scope="col" align="left">Finder</th>
<th scope="col" align="left">Date / Time</th>
<th scope="col" align="left">Difficulty</th>
<th scope="col" align="left">Shares</th>
<th class="right" scope="col">Difficulty</th>
<th class="right" scope="col">Shares</th>
</tr>
</thead>
<tbody>
@ -19,8 +19,8 @@
<td>{if $BLOCKSFOUND[block].confirmations >= $GLOBAL.confirmations}<font color="green">Confirmed</font>{else}{$GLOBAL.confirmations - $BLOCKSFOUND[block].confirmations} left{/if}</td>
<td>{$BLOCKSFOUND[block].finder|default:"unknown"}</td>
<td>{$BLOCKSFOUND[block].time|date_format:"%d/%m/%Y %H:%M:%S"}</td>
<td>{$BLOCKSFOUND[block].difficulty|number_format:"8"}</td>
<td>{$BLOCKSFOUND[block].shares|number_format}</td>
<td class="right">{$BLOCKSFOUND[block].difficulty|number_format:"8"}</td>
<td class="right">{$BLOCKSFOUND[block].shares|number_format}</td>
</tr>
{/section}
</tbody>

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

@ -5,8 +5,8 @@
<tr style="background-color:#B6DAFF;">
<th align="left">Rank</th>
<th align="left" scope="col">User Name</th>
<th align="left" scope="col">KH/s</th>
<th align="left">Ł/Day<font size="1"> (est)</font></th>
<th class="right" scope="col">KH/s</th>
<th class="right">Ł/Day<font size="1"> (est)</font></th>
</tr>
</thead>
<tbody>
@ -16,16 +16,16 @@
<tr{if $GLOBAL.userdata.username == $CONTRIBHASHES[contrib].account}{assign var=listed value=1} style="background-color:#99EB99;"{else} class="{cycle values="odd,even"}"{/if}>
<td>{$rank++}</td>
<td>{$CONTRIBHASHES[contrib].account}</td>
<td>{$CONTRIBHASHES[contrib].hashrate|number_format}</td>
<td>{math equation="round(reward / ( diff * pow(2,32) / ( hashrate * 1000 ) / 3600 / 24), 3)" diff=$DIFFICULTY reward=$REWARD hashrate=$CONTRIBHASHES[contrib].hashrate}</td>
<td class="right">{$CONTRIBHASHES[contrib].hashrate|number_format}</td>
<td class="right">{math equation="round(reward / ( diff * pow(2,32) / ( hashrate * 1000 ) / 3600 / 24), 3)" diff=$DIFFICULTY reward=$REWARD hashrate=$CONTRIBHASHES[contrib].hashrate}</td>
</tr>
{/section}
{if $listed != 1}
<tr style="background-color:#99EB99;">
<td>n/a</td>
<td>{$GLOBAL.userdata.username}</td>
<td>{$GLOBAL.userdata.hashrate}</td>
<td>{math equation="round(reward / ( diff * pow(2,32) / ( hashrate * 1000 ) / 3600 / 24), 3)" diff=$DIFFICULTY reward=$REWARD hashrate=$GLOBAL.userdata.hashrate}</td>
<td class="right">{$GLOBAL.userdata.hashrate}</td>
<td class="right">{math equation="round(reward / ( diff * pow(2,32) / ( hashrate * 1000 ) / 3600 / 24), 3)" diff=$DIFFICULTY reward=$REWARD hashrate=$GLOBAL.userdata.hashrate}</td>
</tr>
{/if}
</tbody>

8
public/templates/mmcFE/statistics/pool/contributors_shares.tpl
View File

@ -4,8 +4,8 @@
<thead>
<tr style="background-color:#B6DAFF;">
<th align="left">Rank</th>
<th align="left" scope="col">User Name</th>
<th align="left" scope="col">Shares</th>
<th scope="col">User Name</th>
<th class="right" scope="col">Shares</th>
</tr>
</thead>
<tbody>
@ -15,14 +15,14 @@
<tr{if $GLOBAL.userdata.username == $CONTRIBSHARES[hashrate].account}{assign var=listed value=1} style="background-color:#99EB99;"{else} class="{cycle values="odd,even"}"{/if}>
<td>{$rank++}</td>
<td>{$CONTRIBSHARES[hashrate].account}</td>
<td>{$CONTRIBSHARES[hashrate].shares|number_format}</td>
<td class="right">{$CONTRIBSHARES[hashrate].shares|number_format}</td>
</tr>
{/section}
{if $listed != 1}
<tr style="background-color:#99EB99;">
<td>n/a</td>
<td>{$GLOBAL.userdata.username}</td>
<td>{$GLOBAL.userdata.shares.valid}</td>
<td class="right">{$GLOBAL.userdata.shares.valid}</td>
</tr>
{/if}
</tbody>