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

Merge pull request #79 from cubedro/develop

Browse Source 
More styling fixes
This commit is contained in:
Marian OANCΞA 2015-04-17 05:22:58 +03:00
commit c29a5c3fb6
2 changed files with 26 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/css/style.css
View File

@ -22,7 +22,7 @@ table td {
width: 8px;
height: 8px;
float: left;
top: 7px;
top: 6px;
margin-right: 5px;
-webkit-border-radius: 2px;
border-radius: 2px;
@ -99,10 +99,6 @@ table td {
margin-left: -15px;
}
.big-info span {
opacity: 0.7;
}
.big-info span.small-title,
.big-info div.small-title-miner {
display: block;
@ -157,7 +153,7 @@ div.small-title-miner {
letter-spacing: -0.1px;
text-transform: none;
white-space: nowrap;
color: #666;
color: #777;
}
.blocks-holder .block-count {

48
public/js/filters.js
View File

@ -221,23 +221,6 @@ angular.module('netStatsApp.filters', [])
var tooltip = [];
var string = '';
if(node.geo !== null)
{
string = "Location: <b>";
if(node.geo.city !== '')
string += node.geo.city + ", ";
string += node.geo.country + "</b>";
tooltip.push(string);
}
if(node.info.contact !== '') {
string = "Contact: <b>" + (typeof node.info.contact !== 'undefined' ? node.info.contact : '-') + "</b>";
tooltip.push(string);
}
if(node.info.node !== '') {
var eth_version = node.info.node.split('/');
@ -246,19 +229,13 @@ angular.module('netStatsApp.filters', [])
eth_version.splice(1,1);
}
string = "Ethereum: <b>" + node.info.node + "</b>";
string = "<b>" + node.info.node + "</b>";
tooltip.push(string);
string = "Version: <b>" + (eth_version[1]) + "</b>";
tooltip.push(string);
}
if(node.info.port !== '') {
string = "Port: <b>" + (typeof node.info.port !== 'undefined' ? node.info.port : '30303') + "</b>";
tooltip.push(string);
}
if(node.info.net !== '') {
string = "Network: <b>" + (typeof node.info.net !== 'undefined' ? node.info.net : '-') + "</b>";
@ -271,6 +248,12 @@ angular.module('netStatsApp.filters', [])
tooltip.push(string);
}
if(node.info.port !== '') {
string = "Port: <b>" + (typeof node.info.port !== 'undefined' ? node.info.port : '30303') + "</b>";
tooltip.push(string);
}
if(node.info.api !== '') {
string = "Web3: <b>" + node.info.api + "</b>";
@ -289,6 +272,23 @@ angular.module('netStatsApp.filters', [])
tooltip.push(string);
}
if(node.geo !== null)
{
string = "Location: <b>";
if(node.geo.city !== '')
string += node.geo.city + ", ";
string += node.geo.country + "</b>";
tooltip.push(string);
}
if(node.info.contact !== '') {
string = "Contact: <b>" + (typeof node.info.contact !== 'undefined' ? node.info.contact : '-') + "</b>";
tooltip.push(string);
}
return tooltip.join("<br>");
};
})