added second top row

This commit is contained in:
cubedro
2015-04-24 11:44:21 +03:00
parent dd1b642c23
commit 3adf1aa2d8
5 changed files with 113 additions and 65 deletions

View File

@@ -7,14 +7,14 @@ body {
min-width: 1900px;
font-smooth: auto;
-webkit-font-smoothing: antialiased;
-moz-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
table td {
font-size: 14px;
white-space: nowrap !important;
-webkit-font-smoothing: subpixel-antialiased;
-moz-font-smoothing: subpixel-antialiased;
-moz-osx-font-smoothing: auto;
}
.propagationBox {
@@ -116,10 +116,12 @@ div.small-title-miner {
span.small-title span.small {
font-size: 11px;
letter-spacing: -.5px;
font-weight: 600;
line-height: 16px;
letter-spacing: 0px;
color: #666;
-webkit-font-smoothing: subpixel-antialiased;
-moz-font-smoothing: subpixel-antialiased;
-moz-osx-font-smoothing: auto;
}
.big-info .big-details {
@@ -156,7 +158,7 @@ span.small-title span.small {
.blocks-holder {
-webkit-font-smoothing: subpixel-antialiased;
-moz-font-smoothing: subpixel-antialiased;
-moz-osx-font-smoothing: auto;
}
.blocks-holder div.small-title-miner {
@@ -194,15 +196,28 @@ span.small-title span.small {
margin-right: 0px;
}
.page-latency {
position: absolute;
top: 395px;
left: 15px;
.second-row .box {
height: 40px;
line-height: 24px !important;
padding: 5px 15px;
}
.page-latency .small-title {
letter-spacing: 0px;
opacity: .8;
.second-row .box i {
position: relative;
top: 2px;
left: -3px;
font-size: 24px;
-webkit-font-smoothing: subpixel-antialiased;
-moz-osx-font-smoothing: auto;
margin-right: 7px;
float: left;
}
.second-row .box .small-value {
font-weight: 300;
-webkit-font-smoothing: subpixel-antialiased;
-moz-osx-font-smoothing: auto;
float: right;
}
.tableHolder {
@@ -211,7 +226,7 @@ span.small-title span.small {
}
table i {
-webkit-font-smoothing: subpixel-antialiased;
-moz-font-smoothing: subpixel-antialiased;
-moz-osx-font-smoothing: auto;
}
table th,
@@ -402,7 +417,7 @@ svg .axis text {
font-family: "Source Sans Pro";
font-weight: 700;
-webkit-font-smoothing: subpixel-antialiased;
-moz-font-smoothing: subpixel-antialiased;
-moz-osx-font-smoothing: auto;
}
svg .y.axis .tick:first-child text {

View File

@@ -9,12 +9,6 @@ function StatsCtrl($scope, $filter, socket, _, toastr) {
$scope.nodesTotal = 0;
$scope.nodesActive = 0;
$scope.bestBlockObject = {
number: 0,
hash: "0x?",
transactions: [],
uncles: []
}
$scope.bestBlock = 0;
$scope.lastBlock = 0;
$scope.lastDifficulty = 0;
@@ -219,12 +213,11 @@ function StatsCtrl($scope, $filter, socket, _, toastr) {
var bestBlock = _.max($scope.nodes, function(node) {
return parseInt(node.stats.block.number);
}).stats.block;
}).stats.block.number;
if(bestBlock.number > $scope.bestBlock)
if(bestBlock > $scope.bestBlock)
{
$scope.bestBlockObject = bestBlock;
$scope.bestBlock = bestBlock.number;
$scope.bestBlock = bestBlock;
$scope.bestStats = _.max($scope.nodes, function(node) {
return parseInt(node.stats.block.number);
}).stats;
@@ -245,7 +238,7 @@ function StatsCtrl($scope, $filter, socket, _, toastr) {
jQuery('.spark-gasspending').sparkline($scope.gasSpending.reverse(), {type: 'bar'});
}
$scope.lastDifficulty = $scope.bestBlockObject.difficulty;
$scope.lastDifficulty = $scope.bestStats.block.difficulty;
$scope.avgBlockTime = _.max($scope.nodes, function(node) {
return parseInt(node.stats.block.number);

View File

@@ -60,19 +60,9 @@ angular.module('netStatsApp.directives', []).
scope.init();
window.onresize = function() {
scope.$apply();
};
scope.$watch('data', function() {
scope.map.bubbles(scope.data, bubbleConfig);
}, true);
scope.$watch(function() {
return angular.element(window)[0].innerWidth;
}, function() {
scope.init();
});
}
};
}]).

View File

@@ -100,6 +100,32 @@ angular.module('netStatsApp.filters', [])
return (best - current.block.number <= 1 ? 'text-success' : (best - current.block.number > 1 && best - current.block.number < 4 ? 'text-warning' : 'text-danger'));
};
})
.filter('gasPriceFilter', ['$filter', function(filter) {
var numberFilter = filter('number')
return function(price) {
console.log("--------------------");
console.log(price.length);
if(price.length < 4)
return price + " wei";
if(price.length < 7)
return (price/1000) + " kwei";
if(price.length < 10)
return (price/1000000) + " mwei";
if(price.length < 13)
return (price/1000000000) + " gwei";
if(price.length < 16)
return (price/1000000000000) + " szabo";
if(price.length < 19)
return (price.substr(0, price.length - 15)) + " finney";
return numberFilter(price.substr(0, price.length - 18)) + " ether";
}
}])
.filter('gasFilter', function() {
return function(gas) {
return (typeof gas !== 'undefined' ? parseInt(gas) : '?');