[UPDATE] static round information

This commit is contained in:
iAmShorty 2014-03-01 13:54:01 +01:00
parent 73e1c14664
commit fc6f5c2d38
5 changed files with 30 additions and 37 deletions

View File

@ -1,4 +1,4 @@
<div class="col-lg-4">
<div class="col-lg-6">
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title">Account Information</h4>

View File

@ -1,14 +1,13 @@
{if $smarty.session.AUTHENTICATED|default}
{include file="dashboard/overview.tpl"}
{literal}<div class="row">{/literal}
{include file="dashboard/overview.tpl"}
{include file="dashboard/system_stats.tpl"}
{include file="dashboard/round_data.tpl"}
{include file="dashboard/account_data.tpl"}
{literal}</div>{/literal}
{if !$DISABLED_DASHBOARD and !$DISABLED_DASHBOARD_API}
{include file="dashboard/js_api.tpl"}
{else}
{literal}<div class="row">{/literal}
{literal}</div>{/literal}
{include file="dashboard/js_static.tpl"}
{/if}
{/if}

View File

@ -16,31 +16,24 @@
$(document).ready(function(){
var g1, g2, g3, g4, g5;
var jqPlotShareinfoOptions = {
title: 'Shares',
highlighter: { show: false },
grid: { drawBorder: false, background: '#fbfbfb', shadow: false },
seriesColors: [ '#26a4ed', '#ee8310', '#e9e744' ],
seriesDefaults: {
renderer: $.jqplot.DonutRenderer,
rendererOptions:{
ringMargin: 10,
sliceMargin: 10,
startAngle: -90,
showDataLabels: true,
dataLabels: 'value',
dataLabelThreshold: 0
}
},
legend: { show: false }
};
// Init shares graph
var plot2 = $.jqplot('shareinfograph', [
[['your valid', {/literal}{$GLOBAL.userdata.shares.valid}{literal}], ['pool valid', {/literal}{$GLOBAL.roundshares.valid}{literal}]],
[['your invalid', {/literal}{$GLOBAL.userdata.shares.invalid}{literal}], ['pool invalid', {/literal}{$GLOBAL.roundshares.invalid}{literal}]]
], jqPlotShareinfoOptions);
Morris.Donut({
element: 'round-donut-chart',
data: [{
label: "your valid",
value: {/literal}{$GLOBAL.userdata.shares.valid}{literal}
}, {
label: "your invalid",
value: {/literal}{$GLOBAL.userdata.shares.invalid}{literal}
}, {
label: "pool valid",
value: {/literal}{$GLOBAL.roundshares.valid}{literal}
}, {
label: "pool invalid",
value: {/literal}{$GLOBAL.roundshares.invalid}{literal}
}],
resize: true
});
g1 = new JustGage({id: "nethashrate", value: parseFloat({/literal}{$GLOBAL.nethashrate}{literal}).toFixed(2), min: 0, max: Math.round({/literal}{$GLOBAL.nethashrate}{literal} * 2), title: "Net Hashrate", gaugeColor: '#6f7a8a', valueFontColor: '#555', shadowOpacity : 0.8, shadowSize : 0, shadowVerticalOffset : 10, label: "{/literal}{$GLOBAL.hashunits.network}{literal}"});
g2 = new JustGage({id: "poolhashrate", value: parseFloat({/literal}{$GLOBAL.hashrate}{literal}).toFixed(2), min: 0, max: Math.round({/literal}{$GLOBAL.hashrate}{literal}* 2), title: "Pool Hashrate", gaugeColor: '#6f7a8a', valueFontColor: '#555', shadowOpacity : 0.8, shadowSize : 0, shadowVerticalOffset : 10, label: "{/literal}{$GLOBAL.hashunits.pool}{literal}"});
g3 = new JustGage({id: "hashrate", value: parseFloat({/literal}{$GLOBAL.userdata.hashrate}{literal}).toFixed(2), min: 0, max: Math.round({/literal}{$GLOBAL.userdata.hashrate}{literal} * 2), title: "Hashrate", gaugeColor: '#6f7a8a', valueFontColor: '#555', shadowOpacity : 0.8, shadowSize : 0, shadowVerticalOffset : 10, label: "{/literal}{$GLOBAL.hashunits.personal}{literal}"});

View File

@ -1,5 +1,4 @@
<div class="row">
<div class="col-lg-12">
<div class="col-lg-8">
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title">Overview {if $GLOBAL.config.price.currency}{$GLOBAL.config.currency}/{$GLOBAL.config.price.currency}: <span id="b-price">{$GLOBAL.price|number_format:"8"|default:"0"}</span>{/if} / Pool Workers: <span id="b-dworkers">{$GLOBAL.workers}</span></h4>
@ -28,5 +27,8 @@
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>
<div class="col-lg-12">
{include file="dashboard/round_data.tpl"}
{include file="dashboard/account_data.tpl"}
</div>
</div>

View File

@ -1,11 +1,10 @@
<div class="col-lg-4">
<div class="col-lg-6">
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title">Round Information</h4>
</div>
<div class="panel-body">
<div class="flot" id="personalround"></div>
<div class="flot" id="poolround"></div>
<div id="round-donut-chart"></div>
</div>
</div>
</div>