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

- changed dashboard layout

Browse Source 
- added shares to overview
This commit is contained in:
iAmShorty 2016-07-06 15:49:30 +02:00
parent e3dcc72bf1
commit 8cff8fe2f2
6 changed files with 200 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
public/site_assets/bluemoon/css/new.css
View File

@ -1354,6 +1354,26 @@ ul.appointments {
top: 2px; top: 2px;
display: none; } display: none; }
.mini-widget-orange .mini-widget-heading {
background: #FAB20A;
color: black; }
.mini-widget-orange .mini-widget-heading .pull-right {
color: white; }
.mini-widget-orange .mini-widget-body {
background: #EBAD1C; }
.mini-widget-orange .mini-widget-body i {
color: #FCCD60; }
.mini-widget-orange .mini-widget-body .number {
color: white; }
.mini-widget-orange .mini-widget-footer {
color: white;
background: #CC930E; }
.mini-widget-yellow .mini-widget-heading { .mini-widget-yellow .mini-widget-heading {
background: #ffff00; background: #ffff00;
color: black; } color: black; }

15
templates/bluemoon/dashboard/account_data/_workers.tpl
View File

@ -1,15 +0,0 @@
{if !$DISABLED_DASHBOARD and !$DISABLED_DASHBOARD_API}
<table class="table table-bordered table-hover table-striped">
<thead>
<tr>
<th>Worker</th>
<th>Hashrate</th>
<th>Difficulty</th>
</tr>
</thead>
<tbody id="b-workers">
<td colspan="3" class="text-center">No worker information available</td>
</tbody>
</tr>
</table>
{/if}

19
templates/bluemoon/dashboard/default.tpl
View File

@ -18,11 +18,22 @@
<div class="col-lg-12"> <div class="col-lg-12">
{* Load our payout system so we can load some payout specific templates *} {* Load our payout system so we can load some payout specific templates *}
{assign var=PAYOUT_SYSTEM value=$GLOBAL.config.payout_system} {assign var=PAYOUT_SYSTEM value=$GLOBAL.config.payout_system}
{include file="dashboard/round_statistics/$PAYOUT_SYSTEM/round.tpl"} {include file="dashboard/round_statistics/$PAYOUT_SYSTEM/default.tpl"}
{include file="dashboard/blocks/default.tpl"}
{include file="dashboard/round_statistics/$PAYOUT_SYSTEM/shares.tpl"}
{if !$DISABLED_API} {if !$DISABLED_API}
{include file="dashboard/worker_information/default.tpl"} <div class="row">
<div class="col-lg-8">
{include file="dashboard/blocks/default.tpl"}
</div>
<div class="col-lg-4">
{include file="dashboard/worker_information/default.tpl"}
</div>
</div>
{else}
<div class="row">
<div class="col-lg-12">
{include file="dashboard/blocks/default.tpl"}
</div>
</div>
{/if} {/if}
</div> </div>
</div> </div>

254
templates/bluemoon/dashboard/round_statistics/prop/round.tpl → templates/bluemoon/dashboard/round_statistics/prop/default.tpl
View File

@ -1,112 +1,144 @@
<div class="row"> <div class="row">
<div class="col-lg-2 col-md-2 col-sm-4"> <div class="col-lg-3 col-md-3 col-sm-6">
<div class="mini-widget"> <div class="mini-widget">
<div class="mini-widget-heading clearfix"> <div class="mini-widget-heading clearfix">
<div class="pull-left">Current Block</div> <div class="pull-left">Current Block</div>
<!--<div class="pull-right"><i class="fa fa-angle-up"></i> 12.2<sup>%</sup></div>--> <!--<div class="pull-right"><i class="fa fa-angle-up"></i> 12.2<sup>%</sup></div>-->
</div> </div>
<div class="mini-widget-body clearfix"> <div class="mini-widget-body clearfix">
<div class="pull-left"><i class="fa fa-th-large"></i></div> <div class="pull-left"><i class="fa fa-th-large"></i></div>
<div class="pull-right number"><p class="h5" id="b-nblock">{$NETWORK.block}</p></div> <div class="pull-right number"><p class="h3" id="b-nblock">{$NETWORK.block}</p></div>
</div> </div>
<div class="mini-widget-footer center-align-text"> <div class="mini-widget-footer center-align-text">
<span class="small">Better than last week</span> <span class="small">&nbsp;</span>
</div> </div>
</div> </div>
</div> </div>
<div class="col-lg-3 col-md-3 col-sm-6">
<div class="col-lg-2 col-md-2 col-sm-4"> <div class="mini-widget">
<div class="mini-widget"> <div class="mini-widget-heading clearfix">
<div class="mini-widget-heading clearfix"> <div class="pull-left">Difficulty</div>
<div class="pull-left">Difficulty</div> <!--<div class="pull-right"><i class="fa fa-angle-up"></i> 12.2<sup>%</sup></div>-->
<!--<div class="pull-right"><i class="fa fa-angle-up"></i> 12.2<sup>%</sup></div>--> </div>
</div> <div class="mini-widget-body clearfix">
<div class="mini-widget-body clearfix"> <div class="pull-left"><i class="fa fa-map-marker"></i></div>
<div class="pull-left"><i class="fa fa-map-marker"></i></div> <div class="pull-right number"><p class="h3" id="b-diff">{$NETWORK.difficulty|number_format:"8"}</p></div>
<div class="pull-right number"><p class="h5" id="b-diff">{$NETWORK.difficulty|number_format:"8"}</p></div> </div>
</div> <div class="mini-widget-footer center-align-text">
<div class="mini-widget-footer center-align-text"> <span class="small">&nbsp;</span>
<span class="small">Better than last week</span> </div>
</div> </div>
</div> </div>
</div> <div class="col-lg-3 col-md-3 col-sm-6">
<div class="mini-widget">
<div class="col-lg-2 col-md-2 col-sm-4"> <div class="mini-widget-heading clearfix">
<div class="mini-widget"> <div class="pull-left">Est. Next Difficulty</div>
<div class="mini-widget-heading clearfix"> <!--<div class="pull-right"><i class="fa fa-angle-up"></i> 12.2<sup>%</sup></div>-->
<div class="pull-left">Est. Next Difficulty</div> </div>
<!--<div class="pull-right"><i class="fa fa-angle-up"></i> 12.2<sup>%</sup></div>--> <div class="mini-widget-body clearfix">
</div> <div class="pull-left"><i class="fa fa-sitemap"></i></div>
<div class="mini-widget-body clearfix"> <div class="pull-right number"><p class="h3" id="b-nextdiff">{if $GLOBAL.nethashrate > 0}{$NETWORK.EstNextDifficulty|number_format:"8"}{else}n/a{/if}</p></div>
<div class="pull-left"><i class="fa fa-sitemap"></i></div> </div>
<div class="pull-right number"><p class="h5" id="b-nextdiff">{if $GLOBAL.nethashrate > 0}{$NETWORK.EstNextDifficulty|number_format:"8"}{else}n/a{/if}</p></div> <div class="mini-widget-footer center-align-text">
</div> <span class="small">{if $GLOBAL.nethashrate > 0} change in {$NETWORK.BlocksUntilDiffChange} Blocks{else}No Estimates{/if}</span>
<div class="mini-widget-footer center-align-text"> </div>
<span class="small">{if $GLOBAL.nethashrate > 0} change in {$NETWORK.BlocksUntilDiffChange} Blocks{else}No Estimates{/if}</span> </div>
</div> </div>
</div> <div class="col-lg-3 col-md-3 col-sm-6">
</div> <div class="mini-widget mini-widget-grey">
<div class="mini-widget-heading clearfix">
<div class="col-lg-2 col-md-2 col-sm-4"> <div class="pull-left">{$GLOBAL.config.currency} Est. Earnings</div>
<div id="widgetblockpercent" class="mini-widget {if $ESTIMATES.percent|number_format:"2" <= 100}mini-widget-green{else}mini-widget-red{/if}"> {if $GLOBAL.fees > 0}
<div class="mini-widget-heading clearfix"> <div class="pull-right">{if $GLOBAL.fees < 0.0001}{$GLOBAL.fees|escape|number_format:"8"}{else}{$GLOBAL.fees|escape}{/if}<sup>%</sup></div>
<div class="pull-left">Of Expected Shares</div> {/if}
<!--<div class="pull-right"><i class="fa fa-angle-up"></i> 12.2<sup>%</sup></div>--> </div>
</div> <div class="mini-widget-body clearfix">
<div class="mini-widget-body clearfix"> <div class="pull-left"><i class="fa fa-money"></i></div>
<div class="pull-left"><i class="fa fa-bar-chart"></i></div> <div class="pull-right number"><p class="h3" id="b-payout">{$GLOBAL.userdata.estimates.payout|number_format:$PRECISION}</p></div>
<div class="pull-right number"><p class="h5" id="b-roundprogress">{$ESTIMATES.percent|number_format:"2"} %</p></div> </div>
</div> <div class="mini-widget-footer center-align-text">
<div class="mini-widget-footer center-align-text"> <span class="small">
<span class="small">Difficulty{if $GLOBAL.nethashrate > 0} change in {$NETWORK.BlocksUntilDiffChange} Blocks{else}No Estimates{/if}</span> {if $GLOBAL.userdata.no_fees}
</div> No pool fee and
</div> {else if $GLOBAL.fees > 0}
</div> <font color="orange">{if $GLOBAL.fees < 0.0001}{$GLOBAL.fees|escape|number_format:"8"}{else}{$GLOBAL.fees|escape}{/if}%</font> pool fee and
{else}
<div class="col-lg-2 col-md-2 col-sm-4"> No pool fee and
<div id="widgetblocktime" class="mini-widget {if $NETWORK.EstTimePerBlock > $LASTBLOCKTIME}mini-widget-green{else}mini-widget-red{/if}"> {/if}
<div class="mini-widget-heading clearfix"> {if $GLOBAL.userdata.donate_percent > 0}
<div class="pull-left">Est. Avg. Time per Block</div> <font color="green">{$GLOBAL.userdata.donate_percent|escape}%</font> donation
<!--<div class="pull-right"><i class="fa fa-angle-up"></i> 12.2<sup>%</sup></div>--> {else}
</div> no <a href="{$smarty.server.SCRIPT_NAME}?page=account&action=edit">donation</a>
<div class="mini-widget-body clearfix"> {/if}
<div class="pull-left"><i class="fa fa-clock-o"></i></div> </span>
<div class="pull-right number"><p class="h5" id="b-esttimeperblock">{$NETWORK.EstTimePerBlock|seconds_to_hhmmss}</p></div> </div>
</div> </div>
<div class="mini-widget-footer center-align-text"> </div>
<span class="small">Last Block found <span id="b-timesincelastblock">{$LASTBLOCKTIME|seconds_to_hhmmss}</span> ago</span> <div class="col-lg-3 col-md-3 col-sm-6">
</div> <div id="widgetblockpercent" class="mini-widget {if $ESTIMATES.percent|number_format:"2" <= 100}mini-widget-green{else}mini-widget-red{/if}">
</div> <div class="mini-widget-heading clearfix">
</div> <div class="pull-left">Of Expected Shares</div>
<!--<div class="pull-right"><i class="fa fa-angle-up"></i> 12.2<sup>%</sup></div>-->
<div class="col-lg-2 col-md-2 col-sm-4"> </div>
<div class="mini-widget mini-widget-grey"> <div class="mini-widget-body clearfix">
<div class="mini-widget-heading clearfix"> <div class="pull-left"><i class="fa fa-bar-chart"></i></div>
<div class="pull-left">{$GLOBAL.config.currency} Est. Earnings</div> <div class="pull-right number"><p class="h3" id="b-roundprogress">{$ESTIMATES.percent|number_format:"2"} %</p></div>
{if $GLOBAL.fees > 0} </div>
<div class="pull-right">{if $GLOBAL.fees < 0.0001}{$GLOBAL.fees|escape|number_format:"8"}{else}{$GLOBAL.fees|escape}{/if}<sup>%</sup></div> <div class="mini-widget-footer center-align-text">
{/if} <span class="small">Difficulty{if $GLOBAL.nethashrate > 0} change in {$NETWORK.BlocksUntilDiffChange} Blocks{else}No Estimates{/if}</span>
</div> </div>
<div class="mini-widget-body clearfix"> </div>
<div class="pull-left"><i class="fa fa-money"></i></div> </div>
<div class="pull-right number"><p class="h5" id="b-payout">{$GLOBAL.userdata.estimates.payout|number_format:$PRECISION}</p></div> <div class="col-lg-3 col-md-3 col-sm-6">
</div> <div id="widgetblocktime" class="mini-widget {if $NETWORK.EstTimePerBlock > $LASTBLOCKTIME}mini-widget-green{else}mini-widget-red{/if}">
<div class="mini-widget-footer center-align-text"> <div class="mini-widget-heading clearfix">
<span class="small"> <div class="pull-left">Est. Avg. Time per Block</div>
{if $GLOBAL.userdata.no_fees} <!--<div class="pull-right"><i class="fa fa-angle-up"></i> 12.2<sup>%</sup></div>-->
No pool fee and </div>
{else if $GLOBAL.fees > 0} <div class="mini-widget-body clearfix">
<font color="orange">{if $GLOBAL.fees < 0.0001}{$GLOBAL.fees|escape|number_format:"8"}{else}{$GLOBAL.fees|escape}{/if}%</font> pool fee and <div class="pull-left"><i class="fa fa-clock-o"></i></div>
{else} <div class="pull-right number"><p class="h3" id="b-esttimeperblock">{$NETWORK.EstTimePerBlock|seconds_to_hhmmss}</p></div>
No pool fee and </div>
{/if} <div class="mini-widget-footer center-align-text">
{if $GLOBAL.userdata.donate_percent > 0} <span class="small">Last Block found <span id="b-timesincelastblock">{$LASTBLOCKTIME|seconds_to_hhmmss}</span> ago</span>
<font color="green">{$GLOBAL.userdata.donate_percent|escape}%</font> donation. </div>
{else} </div>
no <a href="{$smarty.server.SCRIPT_NAME}?page=account&action=edit">donation</a>. </div>
{/if}
</span>
</div>
</div>
</div> <div class="col-lg-3 col-md-3 col-sm-6">
<div id="ownshares" class="mini-widget mini-widget-orange">
<div class="mini-widget-heading clearfix">
<div class="pull-left">valid Shares (Own)</div>
<div class="pull-right">{if $GLOBAL.userdata.shares.valid > 0}{(100 - ($GLOBAL.userdata.shares.invalid / ($GLOBAL.userdata.shares.valid + $GLOBAL.userdata.shares.invalid) * 100))|number_format:"2"}{else}0.00{/if}<sup>%</sup></div>
</div>
<div class="mini-widget-body clearfix">
<div class="pull-left"><i class="fa fa-cloud"></i></div>
<div class="pull-right number"><p class="h3" id="b-yvalid">valid: {$GLOBAL.userdata.shares.valid|number_format:$GLOBAL.config.sharediffprecision}</p></div>
</div>
<div class="mini-widget-footer center-align-text">
<span class="small">Invalid Shares: {$GLOBAL.userdata.shares.invalid|number_format:$GLOBAL.config.sharediffprecision}</span>
</div>
</div>
</div>
<div class="col-lg-3 col-md-3 col-sm-6">
<div id="poolshares" class="mini-widget mini-widget-orange">
<div class="mini-widget-heading clearfix">
<div class="pull-left">valid Shares (Pool)</div>
<div class="pull-right">{if $GLOBAL.roundshares.valid > 0}{(100 - ($GLOBAL.roundshares.invalid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100))|number_format:"2"}{else}0.00{/if}<sup>%</sup></div>
</div>
<div class="mini-widget-body clearfix">
<div class="pull-left"><i class="fa fa-cloud"></i></div>
<div class="pull-right number"><p class="h3" id="b-pvalid">{$GLOBAL.roundshares.valid|number_format:$GLOBAL.config.sharediffprecision}</p></div>
</div>
<div class="mini-widget-footer center-align-text">
<span class="small">Invalid shares: {$GLOBAL.roundshares.invalid|number_format:$GLOBAL.config.sharediffprecision}</span>
</div>
</div>
</div>
</div> </div>

61
templates/bluemoon/dashboard/round_statistics/prop/shares.tpl
View File

@ -1,61 +0,0 @@
<div class="col-lg-4">
<div class="widget">
<div class="widget-header">
<div class="title">
Share Information
</div>
<span class="tools">
<i class="fa fa-cloud"></i>
</span>
</div>
<div class="widget-body">
<table class="table text-small">
<thead>
<tr>
<th></th>
<th><span><h5><i class="fa fa-user fa-fw"></i> Own</h5></span></th>
<th><span><h5><i class="fa fa-users fa-fw"></i> Pool</h5></span></th>
</tr>
<tr>
<th><h5><i class="fa fa-smile-o fa-fw"></i> Valid</h5></th>
<th>
<div class="progress progress-striped progress-fix">
<div id="b-yvalid" class="progress-bar progress-bar-success black" style="width: 100%" aria-valuemax="100" aria-valuemin="0" aria-valuenow="{$GLOBAL.userdata.shares.valid|number_format}" role="progressbar">{$GLOBAL.userdata.shares.valid|number_format:$GLOBAL.config.sharediffprecision}</div>
</div>
</th>
<th>
<div class="progress progress-striped progress-fix">
<div id="b-pvalid" class="progress-bar progress-bar-success black" style="width: 100%" aria-valuemax="100" aria-valuemin="0" aria-valuenow="{$GLOBAL.roundshares.valid|number_format}" role="progressbar">{$GLOBAL.roundshares.valid|number_format:$GLOBAL.config.sharediffprecision}</div>
</div>
</th>
</tr>
<tr>
<th><h5><i class="fa fa-frown-o fa-fw"></i> Invalid</h5></th>
<th>
<div class="progress progress-striped progress-fix">
<div id="b-yivalid" class="progress-bar progress-bar-danger black" style="width: 100%" aria-valuemax="100" aria-valuemin="0" aria-valuenow="{$GLOBAL.userdata.shares.invalid|number_format}" role="progressbar">{$GLOBAL.userdata.shares.invalid|number_format:$GLOBAL.config.sharediffprecision}</div>
</div>
</th>
<th>
<div class="progress progress-striped progress-fix">
<div id="b-pivalid" class="progress-bar progress-bar-danger black" style="width: 100%" aria-valuemax="100" aria-valuemin="0" aria-valuenow="{$GLOBAL.roundshares.invalid|number_format}" role="progressbar">{$GLOBAL.roundshares.invalid|number_format:$GLOBAL.config.sharediffprecision}</div>
</div>
</th>
</tr>
<tr>
<th><h5><i class="fa fa-bolt fa-fw"></i> Efficiency</h5></th>
<th>
<div class="progress progress-striped active progress-fix">
<div id="b-yefficiency" class="progress-bar {if $GLOBAL.userdata.shares.valid > 0}progress-bar-info{else}progress-bar-warning{/if} black" style="width:{if $GLOBAL.userdata.shares.valid > 0}{(100 - ($GLOBAL.userdata.shares.invalid / ($GLOBAL.userdata.shares.valid + $GLOBAL.userdata.shares.invalid) * 100))|number_format:"2"}%{else}100.00%{/if}" aria-valuemax="100" aria-valuemin="0" aria-valuenow="20" role="progressbar">{if $GLOBAL.userdata.shares.valid > 0}{(100 - ($GLOBAL.userdata.shares.invalid / ($GLOBAL.userdata.shares.valid + $GLOBAL.userdata.shares.invalid) * 100))|number_format:"2"}%{else}0.00%{/if}</div>
</div>
</th>
<th>
<div class="progress progress-striped active progress-fix">
<div id="b-pefficiency" class="progress-bar {if $GLOBAL.roundshares.valid > 0}progress-bar-info{else}progress-bar-warning{/if} black" style="width:{if $GLOBAL.roundshares.valid > 0}{(100 - ($GLOBAL.roundshares.invalid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100))|number_format:"2"}%{else}100.00%{/if}" aria-valuemax="100" aria-valuemin="0" aria-valuenow="20" role="progressbar">{if $GLOBAL.roundshares.valid > 0}{(100 - ($GLOBAL.roundshares.invalid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100))|number_format:"2"}%{else}0.00%{/if}</div>
</div>
</tr>
</thead>
</table>
</div>
</div>
</div>

46
templates/bluemoon/dashboard/worker_information/default.tpl
View File

@ -1,29 +1,27 @@
{if !$DISABLED_DASHBOARD and !$DISABLED_DASHBOARD_API} {if !$DISABLED_DASHBOARD and !$DISABLED_DASHBOARD_API}
<div class="col-lg-4"> <div class="widget">
<div class="widget"> <div class="widget-header">
<div class="widget-header"> <div class="title">
<div class="title"> Worker Information
Worker Information
</div>
<span class="tools">
<i class="fa fa-desktop"></i>
</span>
</div> </div>
<div class="widget-body"> <span class="tools">
<div class="table-responsive"> <i class="fa fa-desktop"></i>
<table class="table table-bordered table-hover table-striped"> </span>
<thead> </div>
<tr> <div class="widget-body">
<th>Worker</th> <div class="table-responsive">
<th>Hashrate</th> <table class="table table-bordered table-hover table-striped">
<th>Difficulty</th> <thead>
</tr> <tr>
</thead> <th>Worker</th>
<tbody id="b-workers"> <th>Hashrate</th>
<td colspan="3" class="text-center">No worker information available</td> <th>Difficulty</th>
</tbody> </tr>
</table> </thead>
</div> <tbody id="b-workers">
<td colspan="3" class="text-center">No worker information available</td>
</tbody>
</table>
</div> </div>
</div> </div>
</div> </div>