added uncles to top row

public/css/minimal-icons-codes.css

@@ -18,3 +18,4 @@
 .icon-group:before { content: '\e810'; } /* '' */
 .icon-gas:before { content: '\e811'; } /* '' */
 .icon-difficulty:before { content: '\e812'; } /* '' */
+.icon-uncle:before { content: '\e813'; } /* '' */

public/css/minimal-icons-ie7-codes.css

@@ -18,3 +18,4 @@
 .icon-group { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .icon-gas { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .icon-difficulty { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
+.icon-uncle { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }

public/css/minimal-icons-ie7.css

@@ -29,3 +29,4 @@
 .icon-group { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .icon-gas { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .icon-difficulty { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
+.icon-uncle { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }

public/css/minimal-icons.css

@@ -1,10 +1,10 @@
 @font-face {
   font-family: 'minimal-icons';
-  src: url('../fonts/minimal-icons.eot?55431205');
+  src: url('../fonts/minimal-icons.eot?64931020');
-  src: url('../fonts/minimal-icons.eot?55431205#iefix') format('embedded-opentype'),
+  src: url('../fonts/minimal-icons.eot?64931020#iefix') format('embedded-opentype'),
-       url('../fonts/minimal-icons.woff?55431205') format('woff'),
+       url('../fonts/minimal-icons.woff?64931020') format('woff'),
-       url('../fonts/minimal-icons.ttf?55431205') format('truetype'),
+       url('../fonts/minimal-icons.ttf?64931020') format('truetype'),
-       url('../fonts/minimal-icons.svg?55431205#minimal-icons') format('svg');
+       url('../fonts/minimal-icons.svg?64931020#minimal-icons') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -14,7 +14,7 @@
 @media screen and (-webkit-min-device-pixel-ratio:0) {
   @font-face {
     font-family: 'minimal-icons';
-    src: url('../fonts/minimal-icons.svg?55431205#minimal-icons') format('svg');
+    src: url('../fonts/minimal-icons.svg?64931020#minimal-icons') format('svg');
   }
 }
 */
@@ -46,6 +46,10 @@
   /* you can be more comfortable with increased icons size */
   /* font-size: 120%; */
 
+  /* Font smoothing. That was taken from TWBS */
+  /*-webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;*/
+
   /* Uncomment for 3D effect */
   /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
 }
@@ -69,3 +73,4 @@
 .icon-group:before { content: '\e810'; } /* '' */
 .icon-gas:before { content: '\e811'; } /* '' */
 .icon-difficulty:before { content: '\e812'; } /* '' */
+.icon-uncle:before { content: '\e813'; } /* '' */

public/fonts/minimal-icons.svg

@@ -25,6 +25,7 @@
 <glyph glyph-name="group" unicode="&#xe810;" d="m500 429c-58 0-105 48-105 106 0 59 47 107 105 107 58 0 106-48 106-107 0-58-48-106-106-106z m0 181c-40 0-74-33-74-75s34-75 74-75c41 0 74 34 74 75s-33 75-74 75z m243-356h-31c0 63-97 115-211 115-115 0-212-52-212-115h-31c0 82 107 147 243 147 136 0 242-65 242-147z m-544 327c-50 0-91 41-91 90 0 50 41 91 91 91 50 0 91-41 91-91 0-49-41-90-91-90z m0 149c-33 0-60-26-60-59 0-32 27-59 60-59 33 0 60 27 60 59 0 33-27 59-60 59z m181-309h-32c0 57-63 99-150 99-88 0-151-42-151-99h-31c0 75 76 130 182 130 105 0 182-55 182-130z m422 158c-50 0-90 41-90 91 0 50 40 91 90 91s91-41 91-91c0-50-41-91-91-91z m0 151c-32 0-59-27-59-60 0-33 27-59 59-59s60 26 60 59c0 33-27 60-60 60z m182-309h-31c0 58-63 100-150 100-88 0-151-42-151-100h-31c0 76 76 131 182 131 105 0 181-55 181-131z" horiz-adv-x="1000" />
 <glyph glyph-name="gas" unicode="&#xe811;" d="m500 16c-267 0-484 217-484 484 0 103 32 202 93 285l25-19c-57-77-86-169-86-266 0-250 203-453 452-453 250 0 452 203 452 453 0 250-202 453-452 453-79 0-156-20-224-59l-15 27c72 41 155 63 239 63 267 0 484-217 484-484 0-267-217-484-484-484z m280 453l-13 28 66 28c-6 179-153 322-333 322-183 0-333-149-333-332h-31c0 201 163 364 364 364 201 0 364-163 364-364v-10l-84-36z m-280-270v31c25 0 45 20 45 44 0 44-24 259-45 309-21-50-45-265-45-309h-31c0 18 7 102 18 181 21 154 40 167 58 167 19 0 37-13 58-167 11-79 18-163 18-181 0-41-34-75-76-75z" horiz-adv-x="1000" />
 <glyph glyph-name="difficulty" unicode="&#xe812;" d="m498 21c-9 0-17 3-23 9l-450 450c-12 13-12 33 0 45l140 140c-23 6-43 17-60 34-24 24-38 57-38 92s14 67 38 92c25 25 57 38 92 38s68-13 92-38c25-25 39-58 38-93l-31 0c0 27-10 52-29 71-19 19-43 29-70 29-26 0-51-11-70-29-18-19-29-44-29-70 0-26 11-51 29-70 19-19 45-30 71-29l39 0-190-189 450-451 452 450-140 141c-6-23-17-43-34-60-25-24-57-38-92-38s-67 14-92 38c-25 25-38 57-38 92 0 35 13 68 38 92 17 17 37 29 60 34l-153 152-30-29-22 22 29 29c13 13 33 13 46 0l201-201-38 0c-27 1-52-10-71-29-19-19-29-43-29-70s10-51 29-70c19-18 44-29 70-29s51 11 70 29c19 19 29 44 29 71l-1 39 190-190c6-6 9-14 9-22s-3-17-9-23l-450-450c-6-6-15-9-23-9z" horiz-adv-x="1000" />
+<glyph glyph-name="uncle" unicode="&#xe813;" d="m659 0c-125 0-228 102-228 228 0 41 11 81 32 116l-75 75c-28-17-60-25-92-25-101 0-182 81-182 182s81 182 182 182v-31c-84 0-151-68-151-151s68-151 151-151c30 0 60 9 85 27l11 7 111-111-7-11c-22-32-33-70-33-109 0-109 88-197 196-197s196 88 196 197-88 196-196 196c-46 0-90-16-125-45l-11-9-110 110 7 10c17 26 27 55 27 86 0 27-8 53-22 77l-6 10 128 129 11-6c15-9 31-13 48-13 54 0 98 44 98 98s-44 98-98 98c-16 0-32-4-46-11-32-18-52-51-52-87 0-17 5-34 13-48l6-11-117-117-22 22 100 101c-7 17-11 35-11 53 0 48 26 92 69 114 18 10 39 15 60 15 71 0 129-58 129-129 0-71-58-129-129-129-18 0-36 4-53 11l-95-95c13-26 20-54 20-82 0-33-9-64-25-92l72-72c39 28 86 43 134 43 125 0 228-102 228-227s-103-228-228-228z" horiz-adv-x="1000" />
 </font>
 </defs>
 </svg>

public/js/controllers.js

@@ -14,7 +14,7 @@ function StatsCtrl($scope, $filter, socket, _, toastr) {
 	$scope.lastDifficulty = 0;
 	$scope.upTimeTotal = 0;
 	$scope.avgBlockTime = 0;
-	$scope.unclesInLast = 0;
+	$scope.uncleCount = 0;
 	$scope.bestStats = {};
 
 	$scope.lastBlocksTime = [];
@@ -26,7 +26,7 @@ function StatsCtrl($scope, $filter, socket, _, toastr) {
 	$scope.nodes = [];
 	$scope.map = [];
 	$scope.blockPropagationChart = [];
-	$scope.uncleCount = [];
+	$scope.uncleCountChart = [];
 
 	$scope.latency = 0;
 
@@ -132,10 +132,10 @@ function StatsCtrl($scope, $filter, socket, _, toastr) {
 				break;
 
 			case "uncleCount":
-				$scope.uncleCount = data;
+				$scope.uncleCountChart = data;
-				$scope.unclesInLast = data[0];
+				$scope.uncleCount = data[0] + data[1];
 
-				jQuery('.spark-uncles').sparkline($scope.uncleCount.reverse(), {type: 'bar', barSpacing: 1});
+				jQuery('.spark-uncles').sparkline($scope.uncleCountChart.reverse(), {type: 'bar', barSpacing: 1});
 
 				break;
 

views/index.jade

@@ -15,13 +15,22 @@ block content
             span.big-details {{nodesActive}}/{{nodesTotal}}
           div.clearfix
       div.col-xs-2.stat-holder
-        div.big-info.uptime(class="{{ upTimeTotal | upTimeClass : true }}")
+        div.big-info.uncleCount(class="{{ uncleCount | upTimeClass : true }}")
           div.pull-left.icon-full-width
-            i.icon-bulb
+            i.icon-uncle
           div.pull-left
-            span.small-title up-time
+            span.small-title uncles #[ ]
-            span.big-details {{ upTimeTotal | upTimeFilter }}
+              span.small (last 50 blocks)
+            span.big-details {{ uncleCount }}
           div.clearfix
+      //- div.col-xs-2.stat-holder
+      //-   div.big-info.uptime(class="{{ upTimeTotal | upTimeClass : true }}")
+      //-     div.pull-left.icon-full-width
+      //-       i.icon-bulb
+      //-     div.pull-left
+      //-       span.small-title up-time
+      //-       span.big-details {{ upTimeTotal | upTimeFilter }}
+      //-     div.clearfix
       div.col-xs-2.stat-holder
         div.big-info.difficulty.text-info
           div.pull-left.icon-full-width