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

removing static-ish stats width, use table width instead

Browse Source
This commit is contained in:
Sebastian Grewe 2013-06-13 22:26:12 +02:00
parent e7bb725da4
commit 90640d345e
3 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
public/site_assets/mmcFE/js/custom.js
View File

@ -16,19 +16,12 @@ $(function () {
var statsType = 'area';
}
// calculate width of graph so it doesnt overflow its parent div
//var chart_width = ($(this).parent('div').width()) - 60;
// hack to statically set width as something is broken with div width calculation - anni
var chart_width = $(document).width() - 400;
if (statsType == 'line' || statsType == 'pie') {
$(this).hide().visualize({
type: statsType,
// 'bar', 'area', 'pie', 'line'
width: chart_width,
height: '240px',
colors: ['#6fb9e8', '#ec8526', '#9dc453', '#ddd74c'],
lineDots: 'double',
interaction: true,
multiHover: 5,
@ -43,9 +36,8 @@ $(function () {
});
} else {
$(this).hide().visualize({
type: statsType,
// 'bar', 'area', 'pie', 'line'
width: chart_width,
type: statsType,
height: '240px',
colors: ['#6fb9e8', '#ec8526', '#9dc453', '#ddd74c']
});

9
public/templates/mmcFE/statistics/blocks/default.tpl
View File

@ -1,5 +1,6 @@
{include file="global/block_header.tpl" BLOCK_HEADER="Block Luck" BLOCK_STYLE="clear:none;"}
<table class="stats" rel="line" style="">
{include file="global/block_header.tpl" BLOCK_HEADER="Block Shares" BLOCK_STYLE="clear:none;"}
<table width="70%" class="stats" rel="line">
<caption>Block Shares</caption>
<thead>
<tr>
{section block $BLOCKSFOUND step=-1}
@ -9,13 +10,13 @@
</thead>
<tbody>
<tr>
<th scope="row">Expected Shares</th>
<th scope="row">Expected</th>
{section block $BLOCKSFOUND step=-1}
<td>{round(pow(2,32 - $GLOBAL.config.targetdiff) * $BLOCKSFOUND[block].difficulty)}</td>
{/section}
</tr>
<tr>
<th scope="row">Actual Shares</th>
<th scope="row">Actual</th>
{section block $BLOCKSFOUND step=-1}
<td>{$BLOCKSFOUND[block].shares}</td>
{/section}

4
public/templates/mmcFE/statistics/user/default.tpl
View File

@ -1,8 +1,8 @@
{include file="global/block_header.tpl" BLOCK_HEADER="Your Average Hourly Hash Rate" BUTTONS=array(mine,pool,both)}
{if is_array($YOURHASHRATES)}
<div class="block_content tab_content" id="mine" style="padding-left:30px;">
<table class="stats" rel="area" cellpadding="0">
<caption>Your Hashrate&nbsp;</caption>
<table width="60%" class="stats" rel="area">
<caption>Your Hashrate</caption>
<thead>
<tr>
<td></td>