Merge pull request #55 from cubedro/develop

Added miner name + fixes

public/css/style.css

@@ -240,8 +240,7 @@ table td {
 }
 
 .th-peerPropagationChart {
-	text-align: center;
+	width: 140px;
-	width: 125px;
 }
 
 @media only screen and (max-width: 639px) {

public/js/controllers.js

@@ -106,23 +106,7 @@ function StatsCtrl($scope, $filter, socket, _, toastr) {
 				var index = findIndex({id: data.id});
 				$scope.nodes[index].stats = data.stats;
 				$scope.nodes[index].history = data.history;
-				$scope.nodes[index].propagation = _.map(data.history, function(block) {
+				makePeerPropagationChart(index);
-					return block.propagation;
-				});
-				jQuery('.' + data.id).sparkline($scope.nodes[index].propagation, {
-					type: 'bar',
-					height: 18,
-					barWidth : 2,
-					barSpacing : 1,
-					tooltipSuffix: 'ms',
-					colorMap: jQuery.range_map({
-						'0:1': '#10a0de',
-						'1:5000': '#7bcc3a',
-						'5001:12000': '#FFD162',
-						'12001:20000': '#ff8a00',
-						'20001:': '#F74B4B'
-					})
-				});
 				break;
 
 			case "info":
@@ -151,6 +135,28 @@ function StatsCtrl($scope, $filter, socket, _, toastr) {
 		return _.findIndex($scope.nodes, search);
 	}
 
+	function makePeerPropagationChart(index)
+	{
+		$scope.nodes[index].propagation = _.map($scope.nodes[index].history, function(block) {
+			return block.propagation;
+		});
+
+		jQuery('.' + $scope.nodes[index].id).sparkline($scope.nodes[index].propagation, {
+			type: 'bar',
+			height: 18,
+			barWidth : 2,
+			barSpacing : 1,
+			tooltipSuffix: 'ms',
+			colorMap: jQuery.range_map({
+				'0:1': '#10a0de',
+				'1:1000': '#7bcc3a',
+				'1001:3000': '#FFD162',
+				'3001:7000': '#ff8a00',
+				'7001:': '#F74B4B'
+			})
+		});
+	}
+
 	function addNewNode(data)
 	{
 		var index = findIndex({id: data.id});
@@ -163,9 +169,7 @@ function StatsCtrl($scope, $filter, socket, _, toastr) {
 
 		$scope.nodes[index] = data;
 		$scope.nodes[index].history = data.history;
-		$scope.nodes[index].propagation = _.map(data.history, function(block) {
+		makePeerPropagationChart(index);
-			return block.propagation;
-		});
 
 		return false;
 	}

public/js/filters.js

@@ -201,8 +201,11 @@ angular.module('netStatsApp.filters', [])
 	};
 })
 .filter('minerNameFilter', function() {
-	return function(name) {
+	return function(address, name) {
-		return name.replace('0x', '');
+		if(typeof name !== 'undefined' && name !== false && name.length > 0)
+			return name;
+
+		return address.replace('0x', '');
 	};
 })
 .filter('minerBlocksClass', function() {

views/index.jade

@@ -87,7 +87,7 @@ block content
               span.small-title last blocks miners
               div.blocks-holder(ng-repeat='miner in miners', data-toggle="tooltip", data-placement="right", title="{{miner.blocks}}")
                 div.block-count ({{miner.blocks}})
-                div.small-title-miner {{miner.miner | minerNameFilter}}
+                div.small-title-miner {{miner.miner | minerNameFilter : miner.name}}
                 div.block(ng-repeat="i in getNumber(miner.blocks) track by $index", class="{{miner.blocks | minerBlocksClass}}")
                 div.clearfix