diff --git a/public/site_assets/bootstrap/css/sparklines.css b/public/site_assets/bootstrap/css/sparklines.css new file mode 100644 index 00000000..a90448d6 --- /dev/null +++ b/public/site_assets/bootstrap/css/sparklines.css @@ -0,0 +1,45 @@ +.sparklines-stats li:first-child { + border-radius: 2px 0 0 2px; + -webkit-border-radius: 2px 0 0 2px; + -moz-border-radius: 2px 0 0 2px; +} +.sparklines-stats li.bg-default { + background-color: #fafafa; + border: 1px solid #e5e5e5; +} +ul.list-justified li { + float: none; + width: 1%; + display: table-cell; +} +.sparklines-stats li { + padding: 12px 18px; + border-left: 1px solid #e5e5e5; + display: inline-block; +} +.sparklines-stats { + margin-left: 0; + padding: 0; + list-style: none; + margin-bottom: 35px; +} +.chart { + float: right; + margin-top: 4px; +} +.sparklines-stats-showcase { + float: left; + margin-right: 18px; +} +.sparklines-stats-showcase span { + font-weight: 600; + font-size: 11px; + text-transform: uppercase; + display: block; + margin-bottom: 4px; +} +.sparklines-stats-showcase h2 { + margin: 0; + font-size: 20px; + line-height: 20px; +} diff --git a/public/templates/bootstrap/dashboard/js_api.tpl b/public/templates/bootstrap/dashboard/js_api.tpl index a2c7fdf2..bc9f17e9 100644 --- a/public/templates/bootstrap/dashboard/js_api.tpl +++ b/public/templates/bootstrap/dashboard/js_api.tpl @@ -9,18 +9,18 @@ $(document).ready(function(){ var url_balance = "{/literal}{$smarty.server.SCRIPT_NAME}?page=api&action=getuserbalance&api_key={$GLOBAL.userdata.api_key}&id={$GLOBAL.userdata.id}{literal}"; // Load initial sparkline values - var storedPersonalHashrate = [ 0, 0, 0, 0, {/literal}{$GLOBAL.userdata.hashrate|number_format:"2"}{literal} ]; - var storedPersonalSharerate = [ 0, 0,0, 0, {/literal}{$GLOBAL.userdata.sharerate|number_format:"2"}{literal} ]; - var storedPoolHashrate = [ 0, 0,0, 0, {/literal}{$GLOBAL.hashrate|number_format:"2"}{literal} ]; - var storedPoolWorkers = [ 0, 0,0, 0, {/literal}{$GLOBAL.workers}{literal} ]; + var storedPersonalHashrate = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {/literal}{$GLOBAL.userdata.hashrate|number_format:"0"}{literal} ]; + 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:"0"}{literal} ]; + var storedPoolWorkers = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {/literal}{$GLOBAL.workers}{literal} ]; // Sparkline options applied to all graphs var sparklineOptions = { type: 'bar', barColor: 'green', - height: '25', - barWidth: 25, - barSpacing: 1, + height: '35', + barWidth: 6, + barSpacing: 2, chartRangeMin: 0 }; @@ -33,11 +33,11 @@ $(document).ready(function(){ function refreshInformation(data) { // Drop one value, add the latest new one to each array storedPersonalHashrate.shift(); - storedPersonalHashrate.push(parseFloat(data.getdashboarddata.data.personal.hashrate).toFixed(2)) + storedPersonalHashrate.push(parseFloat(data.getdashboarddata.data.personal.hashrate).toFixed(0)) storedPersonalSharerate.shift(); storedPersonalSharerate.push(parseFloat(data.getdashboarddata.data.personal.sharerate).toFixed(2)) storedPoolHashrate.shift(); - storedPoolHashrate.push(parseFloat(data.getdashboarddata.data.pool.hashrate).toFixed(2)) + storedPoolHashrate.push(parseFloat(data.getdashboarddata.data.pool.hashrate).toFixed(0)) storedPoolWorkers.shift(); storedPoolWorkers.push(data.getdashboarddata.data.pool.workers); // Redraw all bar graphs @@ -51,8 +51,8 @@ $(document).ready(function(){ function refreshStaticData(data) { $('#b-price').html((parseFloat(data.getdashboarddata.data.pool.price).toFixed(8))); $('#b-poolworkers').html(data.getdashboarddata.data.pool.workers); - $('#b-hashrate').html((parseFloat(data.getdashboarddata.data.personal.hashrate).toFixed(2))); - $('#b-poolhashrate').html((parseFloat(data.getdashboarddata.data.pool.hashrate).toFixed(2))); + $('#b-hashrate').html((parseFloat(data.getdashboarddata.data.personal.hashrate).toFixed(0))) + " " + data.getdashboarddata.data.personal.modifier; + $('#b-poolhashrate').html((parseFloat(data.getdashboarddata.data.pool.hashrate).toFixed(0))); $('#b-sharerate').html((parseFloat(data.getdashboarddata.data.personal.sharerate).toFixed(2))); $('#b-yvalid').html(number_format(data.getdashboarddata.data.personal.shares.valid)); $('#b-yivalid').html(number_format(data.getdashboarddata.data.personal.shares.invalid) + " (" + number_format(data.getdashboarddata.data.personal.shares.invalid_percent, 2) + "%)" ); diff --git a/public/templates/bootstrap/dashboard/overview.tpl b/public/templates/bootstrap/dashboard/overview.tpl index a3d93833..4d888949 100644 --- a/public/templates/bootstrap/dashboard/overview.tpl +++ b/public/templates/bootstrap/dashboard/overview.tpl @@ -4,43 +4,38 @@
My Hashrate
- {$GLOBAL.userdata.hashrate|number_format:"2"} -My Sharerate
- -Pool Hashrate
- {$GLOBAL.hashrate|number_format:"2"} -Pool Workers
- {$GLOBAL.workers} -