Merge branch 'bootstrap' of github.com:MPOS/php-mpos into bootstrap

Conflicts:
	public/templates/bootstrap/admin/reports/earnings_control.tpl
This commit is contained in:
Sebastian Grewe 2014-03-01 21:03:29 +01:00
commit 6fc8c29487
30 changed files with 70 additions and 78 deletions

View File

@ -48,7 +48,7 @@
<div class="form-group">
<label>Anonymous Account</label>
<input type="hidden" name="is_anonymous" value="0" />
<input type="checkbox" data-size="mini" name="is_anonymous" id="is_anonymous" value="1" {if $GLOBAL.userdata.is_anonymous}checked{/if} {if $GLOBAL.twofactor.enabled && $GLOBAL.twofactor.options.details && !$DETAILSUNLOCKED}id="disabledInput" disabled{/if}/>{/nocache}
<input type="checkbox" data-size="mini" name="is_anonymous" id="is_anonymous" value="1" {if $GLOBAL.userdata.is_anonymous}checked{/if} {if $GLOBAL.twofactor.enabled && $GLOBAL.twofactor.options.details && !$DETAILSUNLOCKED}id="disabledInput" disabled{/if}/>
<script>
$("[id='is_anonymous']").bootstrapSwitch();
</script>

View File

@ -61,12 +61,10 @@
</script>
</td>
</tr>
<tr>
<td colspan="2">
<input type="submit" value="Update" class="btn btn-outline btn-success btn-lg btn-block">
</td>
</tr>
</table>
</div>
<div class="panel-footer">
<input type="submit" value="Update" class="btn btn-success">
</form>
</div>
</div>
@ -77,7 +75,7 @@
<div class="panel-heading">
<i class="fa fa-clock-o fa-fw"></i> Notification History
</div>
<div class="panel-body">
<div class="panel-body no-padding">
<div class="table-responsive">
<table class="table table-striped table-bordered table-hover">
<thead>
@ -111,4 +109,4 @@
</div>
</div>
</div>
</div>
</div>

View File

@ -3,7 +3,7 @@
<div class="panel-heading">
<i class="fa fa-users fa-fw"></i> <a href="{$smarty.server.SCRIPT_NAME}?page=admin&action=invitations">Invitations</a>
</div>
<div class="panel-body">
<div class="panel-body no-padding">
<table class="table table-striped table-bordered table-hover">
<thead>
<tr>

View File

@ -4,7 +4,7 @@
<div class="panel-heading">
<i class="fa fa-info fa-fw"></i> MPOS Version Information
</div>
<div class="panel-body">
<div class="panel-body no-padding">
<table class="table table-striped table-bordered table-hover">
<thead>
<tr>
@ -46,7 +46,7 @@
<div class="panel-heading">
<i class="fa fa-question fa-fw"></i> MPOS Status
</div>
<div class="panel-body">
<div class="panel-body no-padding">
<table class="table table-striped table-bordered table-hover">
<thead>
<tr>

View File

@ -3,7 +3,7 @@
<div class="panel-heading">
<i class="fa fa-pencil fa-fw"></i> <a href="{$smarty.server.SCRIPT_NAME}?page=admin&action=registrations">Registrations</a>
</div>
<div class="panel-body">
<div class="panel-body no-padding">
<table class="table table-striped table-bordered table-hover">
<thead>

View File

@ -4,7 +4,7 @@
<div class="panel-heading">
<i class="fa fa-user fa-fw"></i> Users
</div>
<div class="panel-body">
<div class="panel-body no-padding">
<table class="table table-striped table-bordered table-hover">
<thead>
<tr>
@ -34,7 +34,7 @@
<div class="panel-heading">
<i class="fa fa-sign-in fa-fw"></i> Logins
</div>
<div class="panel-body">
<div class="panel-body no-padding">
<table class="table table-striped table-bordered table-hover">
<thead>
<tr>

View File

@ -3,9 +3,9 @@
<div class="col-lg-12">
<div class="panel panel-info">
<div class="panel-heading">
Top Inviters
<i class="fa fa-envelope fa-fw"></i> Top Inviters
</div>
<div class="panel-body">
<div class="panel-body no-padding">
<table class="table table-striped table-bordered table-hover">
<tbody>

View File

@ -4,7 +4,7 @@
<div class="panel-heading">
<i class="fa fa-bell-o fa-fw"></i> Monitoring
</div>
<div class="panel-body">
<div class="panel-body no-padding">
<table class="table table-striped table-bordered table-hover">
<thead>

View File

@ -7,7 +7,7 @@
<div class="col-lg-12">
<div class="panel panel-info">
<div class="panel-heading">
<i class="fa fa-edit fa-fw"></i> News Posts
<i class="fa fa-edit fa-fw"></i> Write News
<br>
<font size="1px">News posts support the Markdown syntax</font>
</div>
@ -38,7 +38,7 @@
<div class="col-lg-12">
<div class="panel panel-info">
<div class="panel-heading">
<i class="fa fa-edit fa-fw"></i> News Posts
<i class="fa fa-edit fa-fw"></i> Previous News
</div>
<div class="panel-body">
<div class="row">

View File

@ -2,9 +2,9 @@
<div class="col-lg-12">
<div class="panel panel-info">
<div class="panel-heading">
{$GLOBAL.workers} Current Active Pool Workers
<i class="fa fa-desktop fa-fw"></i> {$GLOBAL.workers} Current Active Pool Workers
</div>
<div class="panel-body">
<div class="panel-body no-padding">
<div class="table-responsive">
<table class="table table-striped table-bordered table-hover">
<form action="{$smarty.server.SCRIPT_NAME}">

View File

@ -3,9 +3,9 @@
<div class="col-lg-12">
<div class="panel panel-info">
<div class="panel-heading">
Last registered Users
<i class="fa fa-user fa-fw"></i> Last registered Users
</div>
<div class="panel-body">
<div class="panel-body no-padding">
<div class="table-responsive">
<table class="table table-striped table-bordered table-hover">
<tbody>

View File

@ -10,13 +10,15 @@
<div class="panel-body">
<div class="table-responsive">
<table class="table table-striped table-bordered table-hover">
<tbody>
<thead>
<tr>
<td colspan="4">
<a href="{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&height={if is_array($REPORTDATA) && count($REPORTDATA) > ($BLOCKLIMIT - 1)}{$REPORTDATA[$BLOCKLIMIT - 1].height}{/if}&prev=1&limit={$BLOCKLIMIT}&id={$USERID}&filter={$FILTER}"<i class="fa fa-chevron-left fa-fw"></i></a>
<a href="{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&height={if is_array($REPORTDATA) && count($REPORTDATA) > 0}{$REPORTDATA[0].height}{/if}&next=1&limit={$BLOCKLIMIT}&id={$USERID}&filter={$FILTER}"><i class="fa fa-chevron-right fa-fw pull-right"></i></a>
</td>
</tr>
</thead>
<tbody>
<tr>
<td>
<div class="form-group">

View File

@ -2,9 +2,9 @@
<div class="col-lg-12">
<div class="panel panel-info">
<div class="panel-heading">
Earnings Report Last {$BLOCKLIMIT} Blocks For User: {$USERNAME}
<i class="fa fa-info fa-fw"></i> Earnings Report Last {$BLOCKLIMIT} Blocks For User: {$USERNAME}
</div>
<div class="panel-body">
<div class="panel-body no-padding">
<div class="table-responsive">
<table class="table table-striped table-bordered table-hover">
<thead>

View File

@ -1,8 +1,8 @@
<div class="row">
<div class="col-lg-12">
<div class="panel panel-default">
<div class="panel panel-info">
<div class="panel-heading">
Settings
<i class="fa fa-gear fa-fw"></i> Settings
</div>
<form method="POST" role="form">
<input type="hidden" name="page" value="{$smarty.request.page|escape}" />

View File

@ -3,9 +3,9 @@
<div class="col-lg-12">
<div class="panel panel-info">
<div class="panel-heading">
Transaction Summary
<i class="fa fa-money fa-fw"></i> Transaction Summary
</div>
<div class="panel-body">
<div class="panel-body no-padding">
<div class="table-responsive">
<table class="table table-striped table-bordered table-hover">
<thead>
@ -34,7 +34,7 @@
<div class="col-lg-4">
<div class="panel panel-info">
<div class="panel-heading">
Transaction Filter
<i class="fa fa-search fa-fw"></i> Transaction Filter
</div>
<div class="panel-body">
<form action="{$smarty.server.SCRIPT_NAME}" role="form">
@ -83,12 +83,12 @@
<div class="col-lg-8">
<div class="panel panel-info">
<div class="panel-heading">
Transaction History
<i class="fa fa-clock-o fa-fw"></i> Transaction History
</div>
<div class="panel-body">
<div class="panel-body no-padding">
<div class="table-responsive">
<table class="table table-hover">
<table class="table table-striped table-bordered table-hover">
<thead>
<tr>
<th>ID</th>
@ -102,7 +102,7 @@
<th>Amount</th>
</tr>
</thead>
<tbody style="font-size:12px;">
<tbody>
{section transaction $TRANSACTIONS}
<tr>
<td>{$TRANSACTIONS[transaction].id}</td>

6
public/templates/bootstrap/admin/user/default.tpl Normal file → Executable file
View File

@ -93,7 +93,7 @@
<div class="panel-heading">
<i class="fa fa-info fa-fw"></i> User Information
</div>
<div class="panel-body">
<div class="panel-body no-padding">
<div class="table-responsive">
<table class="table table-striped table-bordered table-hover">
<thead>
@ -151,10 +151,6 @@
<label for="nofee[{$USERS[user].id}]"></label>
</td>
</tr>
{sectionelse}
<tr>
<td colspan="13"></td>
</tr>
{/section}
{/nocache}
</tbody>

View File

@ -4,7 +4,7 @@
<div class="panel-heading">
<i class="fa fa-money fa-fw"></i> Balance Summary
</div>
<div class="panel-body">
<div class="panel-body no-padding">
<table class="table table-striped table-bordered table-hover">
<tr>
<td>Wallet Balance</td>
@ -38,7 +38,7 @@
<div class="panel-heading">
<i class="fa fa-info fa-fw"></i> Wallet Status
</div>
<div class="panel-body">
<div class="panel-body no-padding">
<table class="table table-striped table-bordered table-hover">
<thead>
<th>Version</th>
@ -71,7 +71,7 @@
<i class="fa fa-users fa-fw"></i> Number of Accounts in Wallet: {$ADDRESSCOUNT|default:"0"}
</div>
<div class="panel-body">
<div class="panel-body ">
<div class="panel-group">
{foreach key=NAME item=VALUE from=$ACCOUNTS}
@ -87,7 +87,7 @@
<i class="fa fa-money fa-fw"></i> Balance Info
</div>
</div>
<div class="panel-body">
<div class="panel-body no-padding">
<table class="table table-striped table-bordered table-hover">
<tr>
<td>Balance</td>
@ -106,7 +106,7 @@
<div class="panel-heading">
<i class="fa fa-money fa-fw"></i> Addresses assigned to Account {$ACCOUNT|default:"Default"}
</div>
<div class="panel-body">
<div class="panel-body no-padding">
<table class="table table-striped table-bordered table-hover">
<tbody>
{foreach from=$ACCOUNTADDRESSES[$ACCOUNT] key=ACCOUNT1 item=ADDRESS1}

View File

@ -1,6 +1,6 @@
<div class="row">
<div class="col-lg-12">
<div class="panel panel-default">
<div class="panel panel-info">
<div class="panel-heading">
<h4><i class="fa fa-info-circle fa-fw"></i> latest News</h4>
</div>

View File

@ -1,16 +1,16 @@
<div class="col-lg-6">
<div class="panel panel-info">
<div class="panel-heading">
<i class="fa fa-search fa-fw"></i> Blocks found by own Workers
<i class="fa fa-desktop fa-fw"></i> Blocks found by own Workers
</div>
<div class="panel-body">
<div class="panel-body no-padding">
<table class="table table-striped table-bordered table-hover">
<thead>
<tr>
<th>Rank</th>
<th>Worker</th>
<th>Blocks</th>
<th style="padding-right: 25px;">Coins Generated</th>
<th>Coins Generated</th>
</tr>
</thead>
<tbody>
@ -20,7 +20,7 @@
<td>{$rank++}</td>
<td>{$BLOCKSSOLVEDBYWORKER[block].finder|default:"unknown/deleted"|escape}</td>
<td>{$BLOCKSSOLVEDBYWORKER[block].solvedblocks}</td>
<td style="padding-right: 25px;">{$BLOCKSSOLVEDBYWORKER[block].generatedcoins|number_format}</td>
<td>{$BLOCKSSOLVEDBYWORKER[block].generatedcoins|number_format}</td>
</tr>
{/section}
</tbody>

View File

@ -1,16 +1,16 @@
<div class="col-lg-6">
<div class="panel panel-info">
<div class="panel-heading">
<i class="fa fa-search fa-fw"></i> Top 25 Blockfinder
<i class="fa fa-user fa-fw"></i> Top 25 Blockfinder
</div>
<div class="panel-body">
<div class="panel-body no-padding">
<table class="table table-striped table-bordered table-hover">
<thead>
<tr>
<th>Rank</th>
<th>Username</th>
<th>Blocks</th>
<th style="padding-right: 25px;">Coins Generated</th>
<th>Coins Generated</th>
</tr>
</thead>
<tbody>
@ -20,7 +20,7 @@
<td>{$rank++}</td>
<td>{if $BLOCKSSOLVEDBYACCOUNT[block].is_anonymous|default:"0" == 1 && $GLOBAL.userdata.is_admin|default:"0" == 0}anonymous{else}{$BLOCKSSOLVEDBYACCOUNT[block].finder|default:"unknown"|escape}{/if}</td>
<td>{$BLOCKSSOLVEDBYACCOUNT[block].solvedblocks}</td>
<td style="padding-right: 25px;">{$BLOCKSSOLVEDBYACCOUNT[block].generatedcoins|number_format}</td>
<td>{$BLOCKSSOLVEDBYACCOUNT[block].generatedcoins|number_format}</td>
</tr>
{/section}
</tbody>

View File

@ -4,7 +4,7 @@
<div class="panel-heading">
<i class="fa fa-clock-o fa-fw"></i> Block Overview
</div>
<div class="panel-body">
<div class="panel-body no-padding">
<div class="table-responsive">
<table class="table table-striped table-bordered table-hover">
<thead>
@ -178,10 +178,8 @@
</div>
</div>
<div class="panel-footer">
{if $GLOBAL.config.payout_system != 'pps'}<ul><li>note: round earnings are not credited until <font color="orange">{$GLOBAL.confirmations}</font> confirms.</li></ul>{/if}
{if $GLOBAL.config.payout_system != 'pps'}Round earnings are not credited until <font color="orange">{$GLOBAL.confirmations}</font> confirms.{/if}
</div>
<!-- /.panel -->
</div>
<!-- /.col-lg-12 -->
</div>
</div>

View File

@ -4,7 +4,7 @@
<div class="panel-heading">
<i class="fa fa-tasks fa-fw"></i> Last {$BLOCKLIMIT} Blocks Found
</div>
<div class="panel-body">
<div class="panel-body no-padding">
<div class="table-responsive">
<table class="table table-striped table-bordered table-hover" id="dataTables-example">
<thead>
@ -77,10 +77,8 @@
</div>
</div>
<div class="panel-footer">
{if $GLOBAL.config.payout_system != 'pps'}<ul><li>Note: Round Earnings are not credited until <font color="orange">{$GLOBAL.confirmations}</font> confirms.</li></ul>{/if}
{if $GLOBAL.config.payout_system != 'pps'}Round Earnings are not credited until <font color="orange">{$GLOBAL.confirmations}</font> confirms.{/if}
</div>
<!-- /.panel -->
</div>
<!-- /.col-lg-12 -->
</div>
</div>

View File

@ -90,7 +90,7 @@ $(function () {
<div class="row">
<div class="col-lg-12">
<div class="panel panel-default">
<div class="panel panel-info">
<div class="panel-heading">
<i class="fa fa-signal fa-fw"></i> Stats
</div>

View File

@ -1,10 +1,10 @@
<div class="row">
<div class="col-lg-6">
<div class="col-lg-12">
<div class="panel panel-info">
<div class="panel-heading">
<i class="fa fa-refresh fa-fw"></i> Round Statistics
</div>
<div class="panel-body">
<div class="panel-body no-padding">
<div class="table-responsive">
<table class="table table-striped table-bordered table-hover">

View File

@ -3,7 +3,7 @@
<div class="panel-heading">
<i class="fa fa-refresh fa-fw"></i> PPLNS Round Shares
</div>
<div class="panel-body">
<div class="panel-body no-padding">
<div class="table-responsive">
<table class="table table-striped table-bordered table-hover">
<thead>
@ -12,7 +12,7 @@
<th >User Name</th>
<th >Valid</th>
<th >Invalid</th>
<th style="padding-right: 25px;">Invalid %</th>
<th>Invalid %</th>
</tr>
</thead>
<tbody>
@ -23,7 +23,7 @@
<td>{if $PPLNSROUNDSHARES[contrib].is_anonymous|default:"0" == 1 && $GLOBAL.userdata.is_admin|default:"0" == 0}anonymous{else}{$PPLNSROUNDSHARES[contrib].username|default:"unknown"|escape}{/if}</td>
<td>{$PPLNSROUNDSHARES[contrib].pplns_valid|number_format}</td>
<td>{$PPLNSROUNDSHARES[contrib].pplns_invalid|number_format}</td>
<td style="padding-right: 25px;">{if $PPLNSROUNDSHARES[contrib].pplns_invalid > 0 && $PPLNSROUNDSHARES[contrib].pplns_valid > 0}{($PPLNSROUNDSHARES[contrib].pplns_invalid / $PPLNSROUNDSHARES[contrib].pplns_valid * 100)|number_format:"2"|default:"0"}{else}0.00{/if}</td>
<td>{if $PPLNSROUNDSHARES[contrib].pplns_invalid > 0 && $PPLNSROUNDSHARES[contrib].pplns_valid > 0}{($PPLNSROUNDSHARES[contrib].pplns_invalid / $PPLNSROUNDSHARES[contrib].pplns_valid * 100)|number_format:"2"|default:"0"}{else}0.00{/if}</td>
</tr>
{/section}
</tbody>

View File

@ -4,7 +4,7 @@
<div class="panel-heading">
<i class="fa fa-credit-card fa-fw"></i> Round Transactions
</div>
<div class="panel-body">
<div class="panel-body no-padding">
<div class="table-responsive">
<table class="table table-striped table-bordered table-hover">
<thead>
@ -15,7 +15,7 @@
<th>PPLNS Shares</th>
<th>PPLNS Round %</th>
<th>Variance</th>
<th style="padding-right: 25px;">Amount</th>
<th>Amount</th>
</tr>
</thead>
<tbody>
@ -29,7 +29,7 @@
<td>{if $PPLNSROUNDSHARES[txs].pplns_valid > 0 }{(( 100 / $PPLNSSHARES) * $PPLNSROUNDSHARES[txs].pplns_valid)|number_format:"2"|default:"0"}{else}0{/if}</td>
<td>{if $ROUNDSHARES[$ROUNDTRANSACTIONS[txs].uid].valid > 0 && $PPLNSROUNDSHARES[txs].pplns_valid > 0}{math assign="percentage1" equation=(100 / ((( 100 / $BLOCKDETAILS.shares) * $ROUNDSHARES[$ROUNDTRANSACTIONS[txs].uid].valid) / (( 100 / $PPLNSSHARES) * $PPLNSROUNDSHARES[txs].pplns_valid)))}{else if $PPLNSROUNDSHARES[txs].pplns_valid == 0}{assign var=percentage1 value=0}{else}{assign var=percentage1 value=100}{/if}
<font color="{if ($percentage1 >= 100)}green{else}red{/if}">{$percentage1|number_format:"2"}</font></b></td>
<td style="padding-right: 25px;">{$ROUNDTRANSACTIONS[txs].amount|default:"0"|number_format:"8"}</td>
<td>{$ROUNDTRANSACTIONS[txs].amount|default:"0"|number_format:"8"}</td>
{assign var=percentage1 value=0}
</tr>
{/section}

View File

@ -4,7 +4,7 @@
<div class="panel-heading">
<i class="fa fa-refresh fa-fw"></i> Round Statistics
</div>
<div class="panel-body">
<div class="panel-body no-padding">
<div class="table-responsive">
<table class="table table-striped table-bordered table-hover">
<thead>
@ -19,7 +19,7 @@
<th>Invalid %</th>
<th>PPLNS Round %</th>
<th>Variance</th>
<th style="padding-right: 25px;">Amount</th>
<th>Amount</th>
</tr>
</thead>
<tbody>
@ -36,7 +36,7 @@
<td>{(( 100 / $PPLNSSHARES) * $PPLNSROUNDSHARES[txs].pplns_valid)|number_format:"2"}</td>
<td>{if $SHARESDATA[$ROUNDTRANSACTIONS[txs].username].valid > 0 }{math assign="percentage1" equation=(100 / ((( 100 / $BLOCKDETAILS.shares) * $SHARESDATA[$ROUNDTRANSACTIONS[txs].username].valid) / (( 100 / $PPLNSSHARES) * $PPLNSROUNDSHARES[txs].pplns_valid)))}{else if $PPLNSROUNDSHARES[txs].pplns_valid == 0}{assign var=percentage1 value=0}{else}{assign var=percentage1 value=100}{/if}
<font color="{if ($percentage1 >= 100)}green{else}red{/if}">{$percentage1|number_format:"2"}</font></b></td>
<td style="padding-right: 25px;">{$ROUNDTRANSACTIONS[txs].amount|default:"0"|number_format:"8"}</td>
<td>{$ROUNDTRANSACTIONS[txs].amount|default:"0"|number_format:"8"}</td>
{assign var=percentage1 value=0}
</tr>
{/section}

View File

@ -3,7 +3,7 @@
<div class="panel-heading">
<i class="fa fa-refresh fa-fw"></i> Round Shares
</div>
<div class="panel-body">
<div class="panel-body no-padding">
<div class="table-responsive">
<table class="table table-striped table-bordered table-hover">
<thead>

View File

@ -3,7 +3,7 @@
<div class="panel-heading">
Round Transactions
</div>
<div class="panel-body">
<div class="panel-body no-padding">
<div class="table-responsive">
<table class="table table-striped table-bordered table-hover">
<thead>
@ -22,7 +22,7 @@
<td>{$ROUNDTRANSACTIONS[txs].type|default:""}</td>
<td>{$ROUNDSHARES[$ROUNDTRANSACTIONS[txs].uid].valid|number_format}</td>
<td>{(( 100 / $BLOCKDETAILS.shares) * $ROUNDSHARES[$ROUNDTRANSACTIONS[txs].uid].valid)|default:"0"|number_format:"2"}</td>
<td style="padding-right: 25px;">{$ROUNDTRANSACTIONS[txs].amount|default:"0"|number_format:"8"}</td>
<td>{$ROUNDTRANSACTIONS[txs].amount|default:"0"|number_format:"8"}</td>
</tr>
{/section}
</tbody>

View File

@ -2,7 +2,7 @@
<div class="col-lg-6">
<div class="panel panel-info">
<div class="panel-heading"><i class="fa fa-clock-o fa-fw"></i> UptimeRobot Status</div>
<div class="panel-body">
<div class="panel-body no-padding">
<table class="table table-striped table-bordered table-hover">
<thead>
<tr>