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

[FIX] Tickerupdate Checks

Browse Source
This commit is contained in:
Sebastian Grewe 2014-03-07 08:36:55 +01:00
parent 581f365628
commit e62db71c04
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/include/smarty_globals.inc.php
View File

@ -82,8 +82,7 @@ $aGlobal = array(
'monitoring_uptimerobot_api_keys' => $setting->getValue('monitoring_uptimerobot_api_keys'),
'statistics_ajax_refresh_interval' => $statistics_ajax_refresh_interval,
'statistics_ajax_long_refresh_interval' => $statistics_ajax_long_refresh_interval,
'price' => array( 'currency' => $config['price']['currency'] ),
'tickerupdate' => array( 'enabled' => $config['price']['enabled'] ),
'price' => $config['price'],
'targetdiff' => $config['difficulty'],
'currency' => $config['currency'],
'txfee_manual' => $config['txfee_manual'],

10
public/templates/bootstrap/dashboard/js_api.tpl
View File

@ -13,7 +13,7 @@ $(document).ready(function(){
var storedPersonalSharerate = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {/literal}{$GLOBAL.userdata.sharerate|number_format:"2"}{literal} ];
var storedPoolHashrate = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {/literal}{$GLOBAL.hashrate|number_format:"2"}{literal} ];
var storedPoolWorkers = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {/literal}{$GLOBAL.workers}{literal} ];
var storedCoinPrice = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {/literal}{$GLOBAL.price}{literal} ];
var storedCoinPrice = [ {/literal}{$GLOBAL.price}, {$GLOBAL.price},{$GLOBAL.price},{$GLOBAL.price},{$GLOBAL.price},{$GLOBAL.price},{$GLOBAL.price},{$GLOBAL.price},{$GLOBAL.price},{$GLOBAL.price},{$GLOBAL.price},{literal} ];
// Sparkline options applied to all graphs
var sparklineBarOptions = {
@ -27,7 +27,7 @@ $(document).ready(function(){
// Sparkline options applied to line graphs
var sparklineLineOptions = {
height: '35',
chartRangeMin: 0,
chartRangeMin: {/literal}{$GLOBAL.price}{literal}/2,
composite: false,
lineColor: 'black'
};
@ -37,7 +37,7 @@ $(document).ready(function(){
$('.personal-sharerate-bar').sparkline(storedPersonalSharerate, sparklineBarOptions);
$('.pool-hashrate-bar').sparkline(storedPoolHashrate, sparklineBarOptions);
$('.pool-workers-bar').sparkline(storedPoolWorkers, sparklineBarOptions);
{/literal}{if $config.tickerupdate.enabled}{literal}
{/literal}{if $GLOBAL.config.price.enabled}{literal}
$('.coin-price-line').sparkline(storedCoinPrice, sparklineLineOptions);
{/literal}{/if}{literal}
@ -58,14 +58,14 @@ $(document).ready(function(){
$('.personal-sharerate-bar').sparkline(storedPersonalSharerate, sparklineBarOptions);
$('.pool-hashrate-bar').sparkline(storedPoolHashrate, sparklineBarOptions);
$('.pool-workers-bar').sparkline(storedPoolWorkers, sparklineBarOptions);
{/literal}{if $config.tickerupdate.enabled}{literal}
{/literal}{if $GLOBAL.config.price.enabled}{literal}
$('.coin-price-line').sparkline(storedCoinPrice, sparklineLineOptions);
{/literal}{/if}{literal}
}
// Refresh other static numbers on the template
function refreshStaticData(data) {
{/literal}{if $config.tickerupdate.enabled}{literal}
{/literal}{if $GLOBAL.config.price.enabled}{literal}
$('#b-price').html((parseFloat(data.getdashboarddata.data.pool.price).toFixed(8)));
{/literal}{/if}{literal}
$('#b-poolworkers').html(data.getdashboarddata.data.pool.workers);

6
public/templates/bootstrap/dashboard/overview.tpl
View File

@ -3,7 +3,7 @@
<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 {if !$GLOBAL.config.tickerupdate.enalbed}col-md-offset-2{/if}">
<div class="panel-body text-center {if !$GLOBAL.config.price.enabled}col-md-offset-2{/if}">
<div class="row show-grid ">
<div class="col-md-spark">
<b>My Hashrate {$GLOBAL.hashunits.personal}</b>
@ -29,7 +29,7 @@
<br>
<span class="pool-workers-bar"></span>
</div>
{if $GLOBAL.config.tickerupdate.enabled}
{if $GLOBAL.config.price.enabled}
<div class="col-md-spark">
<b>{$GLOBAL.config.currency}/{$GLOBAL.config.price.currency}</b>
<span id="b-price">{$GLOBAL.price|default:"0"|number_format:"8"}</span>
@ -43,4 +43,4 @@
Refresh interval: {$GLOBAL.config.statistics_ajax_refresh_interval|default:"10"} seconds. Hashrate based on shares submitted in the past {$INTERVAL|default:"5"} minutes.
</div>
</div>
</div>
</div>