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

This commit is contained in:
Sebastian Grewe 2014-03-11 12:50:54 +01:00
commit 65ce8f157e
6 changed files with 37 additions and 32 deletions

View File

@ -1,13 +1,31 @@
{if $smarty.session.AUTHENTICATED|default}
<div class="row">
{* Load our payout system so we can load some payout specific templates *}
{assign var=PAYOUT_SYSTEM value=$GLOBAL.config.payout_system}
{include file="dashboard/overview/default.tpl"}
{include file="dashboard/round_statistics/$PAYOUT_SYSTEM/default.tpl"}
</div>
<div class="row">
{include file="dashboard/account_data/default.tpl"}
{include file="dashboard/worker_information/default.tpl"}
<div class="col-lg-12">
<div class="panel panel-info">
<div class="panel-heading">
<h4 class="panel-title"><i class="fa fa-align-left fa-fw"></i> Overview</span></h4>
</div>
<div class="panel-body text-center">
<div class="row">
<div class="col-lg-12">
{* Load our payout system so we can load some payout specific templates *}
{assign var=PAYOUT_SYSTEM value=$GLOBAL.config.payout_system}
{include file="dashboard/overview/default.tpl"}
{include file="dashboard/round_statistics/$PAYOUT_SYSTEM/default.tpl"}
</div>
</div>
<div class="row">
<div class="col-lg-12">
{include file="dashboard/account_data/default.tpl"}
{include file="dashboard/worker_information/default.tpl"}
</div>
</div>
</div>
<div class="panel-footer overview">
<h6>Refresh interval: {$GLOBAL.config.statistics_ajax_refresh_interval|default:"10"} seconds. Hashrate based on shares submitted in the past {$INTERVAL|default:"5"} minutes.</h6>
</div>
</div>
</div>
</div>
{* Include our JS libraries, we allow a live updating JS and a static one *}
{if !$DISABLED_DASHBOARD and !$DISABLED_DASHBOARD_API}

View File

@ -1,7 +1,9 @@
<div class="col-lg-12">
<div class="panel panel-info">
<div class="panel-heading">
<h4 class="panel-title"><i class="fa fa-align-left fa-fw"></i> Overview</span></h4>
<h4 class="panel-title">
<i class="fa fa-dot-circle-o fa-fw"></i> Pool Information
</h4>
</div>
<div class="panel-body text-center">
<div class="row show-grid">
@ -13,8 +15,5 @@
{/if}
</div>
</div>
<div class="panel-footer overview">
<h6>Refresh interval: {$GLOBAL.config.statistics_ajax_refresh_interval|default:"10"} seconds. Hashrate based on shares submitted in the past {$INTERVAL|default:"5"} minutes.</h6>
</div>
</div>
</div>

View File

@ -2,27 +2,21 @@
<div class="panel panel-info">
<div class="panel-heading">
<h4 class="panel-title">
<i class="fa fa-spinner fa-fw"></i> Round statistics
<i class="fa fa-spinner fa-fw"></i> Round Information
</h4>
</div>
{assign var=PAYOUT_SYSTEM value=$GLOBAL.config.payout_system}
{include file="dashboard/round_statistics/$PAYOUT_SYSTEM/round.tpl"}
<div class="panel-footer">
<h6>Refresh interval: {$GLOBAL.config.statistics_ajax_refresh_interval|default:"10"} seconds.</h6>
</div>
</div>
</div>
<div class="col-lg-4">
<div class="panel panel-info">
<div class="panel-heading">
<h4 class="panel-title">
<i class="fa fa-cloud fa-fw"></i> Share statistics
<i class="fa fa-cloud fa-fw"></i> Share Information
</h4>
</div>
{assign var=PAYOUT_SYSTEM value=$GLOBAL.config.payout_system}
{include file="dashboard/round_statistics/$PAYOUT_SYSTEM/shares.tpl"}
<div class="panel-footer">
<h6>Refresh interval: {$GLOBAL.config.statistics_ajax_refresh_interval|default:"10"} seconds.</h6>
</div>
</div>
</div>

View File

@ -6,13 +6,13 @@
<th><span class="pull-right"><h5><i class="fa fa-users fa-fw"></i> Pool</h6></span></th>
</tr>
<tr>
<th><h5><i class="fa fa-check fa-fw"></i> Valid</h6></th>
<th><h5><i class="fa fa-smile-o fa-fw"></i> Valid</h6></th>
<th><span class="pull-right"><h5 id="b-yvalid">{$GLOBAL.userdata.shares.valid|number_format}</h5></span></th>
<th><span class="pull-right"><h5 id="b-pvalid">{$GLOBAL.roundshares.valid|number_format}</h5></span></th>
</tr>
<tr>
<th><h5><i class="fa fa-times fa-fw"></i> Invalid</h6></th>
<th><h5><i class="fa fa-frown-o fa-fw"></i> Invalid</h6></th>
<th><span class="pull-right"><h5 id="b-yivalid">{$GLOBAL.userdata.shares.invalid|number_format}</h5></span></th>
<th><span class="pull-right"><h5 id="b-pivalid">{$GLOBAL.roundshares.invalid|number_format}</h5></span></th>
</tr>

View File

@ -2,27 +2,21 @@
<div class="panel panel-info">
<div class="panel-heading">
<h4 class="panel-title">
<i class="fa fa-spinner fa-fw"></i> Round statistics
<i class="fa fa-spinner fa-fw"></i> Round Information
</h4>
</div>
{assign var=PAYOUT_SYSTEM value=$GLOBAL.config.payout_system}
{include file="dashboard/round_statistics/$PAYOUT_SYSTEM/round.tpl"}
<div class="panel-footer">
<h6>Refresh interval: {$GLOBAL.config.statistics_ajax_refresh_interval|default:"10"} seconds.</h6>
</div>
</div>
</div>
<div class="col-lg-4">
<div class="panel panel-info">
<div class="panel-heading">
<h4 class="panel-title">
<i class="fa fa-cloud fa-fw"></i> Share statistics
<i class="fa fa-cloud fa-fw"></i> Share Information
</h4>
</div>
{assign var=PAYOUT_SYSTEM value=$GLOBAL.config.payout_system}
{include file="dashboard/round_statistics/$PAYOUT_SYSTEM/shares.tpl"}
<div class="panel-footer">
<h6>Refresh interval: {$GLOBAL.config.statistics_ajax_refresh_interval|default:"10"} seconds.</h6>
</div>
</div>
</div>

View File

@ -6,13 +6,13 @@
<th><span class="pull-right"><h5><i class="fa fa-users fa-fw"></i> Pool</h6></span></th>
</tr>
<tr>
<th><h5><i class="fa fa-check fa-fw"></i> Valid</h6></th>
<th><h5><i class="fa fa-smile-o fa-fw"></i> Valid</h6></th>
<th><span class="pull-right"><h5 id="b-yvalid">{$GLOBAL.userdata.shares.valid|number_format}</h5></span></th>
<th><span class="pull-right"><h5 id="b-pvalid">{$GLOBAL.roundshares.valid|number_format}</h5></span></th>
</tr>
<tr>
<th><h5><i class="fa fa-times fa-fw"></i> Invalid</h6></th>
<th><h5><i class="fa fa-frown-o fa-fw"></i> Invalid</h6></th>
<th><span class="pull-right"><h5 id="b-yivalid">{$GLOBAL.userdata.shares.invalid|number_format}</h5></span></th>
<th><span class="pull-right"><h5 id="b-pivalid">{$GLOBAL.roundshares.invalid|number_format}</h5></span></th>
</tr>