diff --git a/public/site_assets/mmcFE/js/custom.js b/public/site_assets/mmcFE/js/custom.js index ab1b5167..76e967c6 100644 --- a/public/site_assets/mmcFE/js/custom.js +++ b/public/site_assets/mmcFE/js/custom.js @@ -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'] }); diff --git a/public/templates/mmcFE/statistics/blocks/default.tpl b/public/templates/mmcFE/statistics/blocks/default.tpl index 515f5dbb..8bcad85b 100644 --- a/public/templates/mmcFE/statistics/blocks/default.tpl +++ b/public/templates/mmcFE/statistics/blocks/default.tpl @@ -1,5 +1,6 @@ -{include file="global/block_header.tpl" BLOCK_HEADER="Block Luck" BLOCK_STYLE="clear:none;"} - +{include file="global/block_header.tpl" BLOCK_HEADER="Block Shares" BLOCK_STYLE="clear:none;"} +
+ {section block $BLOCKSFOUND step=-1} @@ -9,13 +10,13 @@ - + {section block $BLOCKSFOUND step=-1} {/section} - + {section block $BLOCKSFOUND step=-1} {/section} diff --git a/public/templates/mmcFE/statistics/user/default.tpl b/public/templates/mmcFE/statistics/user/default.tpl index dc285321..debbd23a 100644 --- a/public/templates/mmcFE/statistics/user/default.tpl +++ b/public/templates/mmcFE/statistics/user/default.tpl @@ -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)}
-
Block Shares
Expected SharesExpected{round(pow(2,32 - $GLOBAL.config.targetdiff) * $BLOCKSFOUND[block].difficulty)}
Actual SharesActual{$BLOCKSFOUND[block].shares}
- +
Your Hashrate 
+
Your Hashrate