grassrootseconomics/ethstats-server
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #155 from cubedro/develop

Browse Source 
Bug fixes
This commit is contained in:
Marian OANCΞA 2015-05-27 09:27:44 +03:00
commit 996bd8213e
6 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/index.html vendored
View File

File diff suppressed because one or more lines are too long

2
dist/js/netstats.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/js/netstats.min.js.map vendored
View File

File diff suppressed because one or more lines are too long

3
public/js/filters.js
View File

@ -291,6 +291,9 @@ angular.module('netStatsApp.filters', [])
}) })
.filter('networkHashrateFilter', ['$sce', '$filter', function($sce, filter) { .filter('networkHashrateFilter', ['$sce', '$filter', function($sce, filter) {
return function(hashes, isMining) { return function(hashes, isMining) {
if(hashes === null)
hashes = 0;
var result = 0; var result = 0;
var unit = 'K'; var unit = 'K';

11
views/index.jade
View File

@ -1,4 +1,5 @@
extends layout //- index.jade
extends ./layout.jade
block content block content
div.container-fluid(ng-controller='StatsCtrl') div.container-fluid(ng-controller='StatsCtrl')
@ -16,7 +17,7 @@ block content
div.pull-left.icon-full-width div.pull-left.icon-full-width
i.icon-uncle i.icon-uncle
div.big-details-holder div.big-details-holder
span.small-title uncles #[ ] span.small-title uncles 
span.small (current / last 50) span.small (current / last 50)
span.big-details {{ bestStats.block.uncles.length }}/{{ uncleCount }} span.big-details {{ bestStats.block.uncles.length }}/{{ uncleCount }}
div.clearfix div.clearfix
@ -121,7 +122,7 @@ block content
div.col-xs-3.stat-holder div.col-xs-3.stat-holder
div.big-info.chart.text-info div.big-info.chart.text-info
//- i.icon-uncle //- i.icon-uncle
span.small-title uncle count #[ ] span.small-title uncle count 
span.small (25 blocks per bar) span.small (25 blocks per bar)
//- span.small-value {{ bestStats.block.uncles.length }}/{{ uncleCount }} //- span.small-value {{ bestStats.block.uncles.length }}/{{ uncleCount }}
sparkchart.big-details.spark-uncles(data="{{uncleCountChart.join(',')}}") sparkchart.big-details.spark-uncles(data="{{uncleCountChart.join(',')}}")
@ -166,7 +167,7 @@ block content
i.icon-network(data-toggle="tooltip", data-placement="top", title="Pending transactions", ng-click="orderTable(['-stats.pending'], false)") i.icon-network(data-toggle="tooltip", data-placement="top", title="Pending transactions", ng-click="orderTable(['-stats.pending'], false)")
th th
i.icon-block(data-toggle="tooltip", data-placement="top", title="Last block", ng-click="orderTable(['-stats.block.number', 'stats.block.propagation'], false)") i.icon-block(data-toggle="tooltip", data-placement="top", title="Last block", ng-click="orderTable(['-stats.block.number', 'stats.block.propagation'], false)")
th.th-blockhash #[ ] th.th-blockhash 
th.th-blockhash th.th-blockhash
i.icon-difficulty(data-toggle="tooltip", data-placement="top", title="Total difficulty", ng-click="orderTable(['-stats.block.totalDifficulty'], false)") i.icon-difficulty(data-toggle="tooltip", data-placement="top", title="Total difficulty", ng-click="orderTable(['-stats.block.totalDifficulty'], false)")
th th
@ -188,7 +189,7 @@ block content
i(ng-click="node.pinned = !node.pinned", class="{{ node.pinned | nodePinClass }}", data-toggle="tooltip", data-placement="right", data-original-title="Click to {{ node.pinned ? 'un' : '' }}pin") i(ng-click="node.pinned = !node.pinned", class="{{ node.pinned | nodePinClass }}", data-toggle="tooltip", data-placement="right", data-original-title="Click to {{ node.pinned ? 'un' : '' }}pin")
td.nodeInfo(rel="{{node.id}}") td.nodeInfo(rel="{{node.id}}")
span.small(data-toggle="tooltip", data-placement="top", data-html="true", data-original-title="{{node | geoTooltip}}") {{node.info.name}} span.small(data-toggle="tooltip", data-placement="top", data-html="true", data-original-title="{{node | geoTooltip}}") {{node.info.name}}
span.small #[ ]({{node.info.ip}}) span.small ({{node.info.ip}})
a.small(href="https://github.com/ethereum/wiki/wiki/Network-Status#updating", target="_blank", data-toggle="tooltip", data-placement="top", data-html="true", data-original-title="Netstats client needs update.<br>Click this icon for instructions.", class="{{ node.info | nodeClientClass : currentApiVersion }}") a.small(href="https://github.com/ethereum/wiki/wiki/Network-Status#updating", target="_blank", data-toggle="tooltip", data-placement="top", data-html="true", data-original-title="Netstats client needs update.<br>Click this icon for instructions.", class="{{ node.info | nodeClientClass : currentApiVersion }}")
i.icon-warning-o i.icon-warning-o
td td

1
views/layout.jade
View File

@ -1,3 +1,4 @@
//- layout.jade
doctype html doctype html
html(ng-app="netStatsApp") html(ng-app="netStatsApp")
head head