third-party-mirrors/EDDN
1
0
Fork 0
mirror of https://github.com/EDCD/EDDN.git synced 2025-06-18 16:03:02 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Some polyshing and improvments in performance

Browse Source
This commit is contained in:
AnthorNet 2015-05-07 15:30:23 +02:00
parent 35c7041edb
commit 50a58a6eb0
3 changed files with 50 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
contrib/monitor/css/eddn.css
View File

@ -15,8 +15,13 @@ section.container {
} }
.container .chart { .container .chart {
height: 200px; height: 300px;
margin-bottom: 10px; margin-bottom: 10px;
} }
footer .navbar-default {
border-width: 1px 0 0;
margin-bottom: 0;
}
.highcharts-container{width:100% !important; height:100% !important;} .highcharts-container{width:100% !important; height:100% !important;}

2
contrib/monitor/index.html
View File

@ -337,7 +337,7 @@
<footer> <footer>
<nav class="navbar navbar-default"> <nav class="navbar navbar-default">
<div class="container"> <div class="container">
<p> <p class="navbar-text">
The <em>Elite: Dangerous Data Network</em> is volunteer-run and not affiliated with Frontier Developments. The <em>Elite: Dangerous Data Network</em> is volunteer-run and not affiliated with Frontier Developments.
</p> </p>
</div> </div>

84
contrib/monitor/js/eddn.js
View File

@ -19,6 +19,11 @@ formatNumber = function(num) {
return num.toString().replace(/(\d)(?=(\d{3})+(?!\d))/g, "$1,") return num.toString().replace(/(\d)(?=(\d{3})+(?!\d))/g, "$1,")
} }
makeSlug = function(str) {
var slugcontent_hyphens = str.replace(/\s/g,'-');
var finishedslug = slugcontent_hyphens.replace(/[^a-zA-Z0-9\-]/g,'');
return finishedslug.toLowerCase();
}
secondsToDurationString = function(seconds) { secondsToDurationString = function(seconds) {
var hours = Math.floor(seconds / 3600); var hours = Math.floor(seconds / 3600);
@ -64,7 +69,13 @@ var doUpdateSoftwares = function()
$.each(softwaresTotal, function(software, hits){ $.each(softwaresTotal, function(software, hits){
$('#softwares .table tbody').append( $('#softwares .table tbody').append(
$('<tr>').attr('data-name', software).append( $('<tr>').attr('data-name', software).on('mouseover', function(){
chart.get('software-' + makeSlug(software)).setState('hover');
chart.tooltip.refresh(chart.get('software-' + makeSlug(software)));
}).on('mouseout', function(){
chart.get('software-' + makeSlug(software)).setState('');
chart.tooltip.hide();
}).append(
$('<td>').html('<strong>' + software + '</strong>') $('<td>').html('<strong>' + software + '</strong>')
) )
.append( .append(
@ -78,19 +89,10 @@ var doUpdateSoftwares = function()
) )
); );
var alreadyInChart = false; if(!chart.get('software-' + makeSlug(software)))
for( var i = 0, len = chart.get('softwares').data.length; i < len; i++ ) series.addPoint({id: 'software-' + makeSlug(software), name: software, y: parseInt(hits)}, false);
{ else
if(chart.get('softwares').data[i]['name'] == software) chart.get('software-' + makeSlug(software)).update(parseInt(hits), false);
{
chart.get('softwares').data[i].update(parseInt(hits), false);
alreadyInChart = true;
break;
}
}
if(alreadyInChart === false)
series.addPoint({name: software, y: parseInt(hits)}, false);
}); });
chart.redraw(); chart.redraw();
@ -126,7 +128,13 @@ var doUpdateUploaders = function()
$.each(uploadersTotal, function(uploader, hits){ $.each(uploadersTotal, function(uploader, hits){
$('#uploaders .table tbody').append( $('#uploaders .table tbody').append(
$('<tr>').attr('data-name', uploader).append( $('<tr>').attr('data-name', uploader).on('mouseover', function(){
chart.get('uploader-' + makeSlug(uploader)).setState('hover');
chart.tooltip.refresh(chart.get('uploader-' + makeSlug(uploader)));
}).on('mouseout', function(){
chart.get('uploader-' + makeSlug(uploader)).setState('');
chart.tooltip.hide();
}).append(
$('<td>').html('<strong>' + uploader + '</strong>') $('<td>').html('<strong>' + uploader + '</strong>')
) )
.append( .append(
@ -140,19 +148,10 @@ var doUpdateUploaders = function()
) )
); );
var alreadyInChart = false; if(!chart.get('uploader-' + makeSlug(uploader)))
for( var i = 0, len = chart.get('uploaders').data.length; i < len; i++ ) series.addPoint({id: 'uploader-' + makeSlug(uploader), name: uploader, y: parseInt(hits)}, false);
{ else
if(chart.get('uploaders').data[i]['name'] == uploader) chart.get('uploader-' + makeSlug(uploader)).update(parseInt(hits), false);
{
chart.get('uploaders').data[i].update(parseInt(hits), false);
alreadyInChart = true;
break;
}
}
if(alreadyInChart === false)
series.addPoint({name: uploader, y: parseInt(hits)}, false);
}); });
chart.redraw(); chart.redraw();
@ -188,7 +187,13 @@ var doUpdateSchemas = function()
$.each(schemasTotal, function(schema, hits){ $.each(schemasTotal, function(schema, hits){
$('#schemas .table tbody').append( $('#schemas .table tbody').append(
$('<tr>').attr('data-name', schema).append( $('<tr>').attr('data-name', schema).on('mouseover', function(){
chart.get('schema-' + makeSlug(schema)).setState('hover');
chart.tooltip.refresh(chart.get('schema-' + makeSlug(schema)));
}).on('mouseout', function(){
chart.get('schema-' + makeSlug(schema)).setState('');
chart.tooltip.hide();
}).append(
$('<td>').html('<strong>' + schema + '</strong>') $('<td>').html('<strong>' + schema + '</strong>')
) )
.append( .append(
@ -202,19 +207,10 @@ var doUpdateSchemas = function()
) )
); );
var alreadyInChart = false; if(!chart.get('schema-' + makeSlug(schema)))
for( var i = 0, len = chart.get('schemas').data.length; i < len; i++ ) series.addPoint({id: 'schema-' + makeSlug(schema), name: schema, y: parseInt(hits)}, false);
{ else
if(chart.get('schemas').data[i]['name'] == schema) chart.get('schema-' + makeSlug(schema)).update(parseInt(hits), false);
{
chart.get('schemas').data[i].update(parseInt(hits), false);
alreadyInChart = true;
break;
}
}
if(alreadyInChart === false)
series.addPoint({name: schema, y: parseInt(hits)}, false);
}); });
chart.redraw(); chart.redraw();
@ -487,6 +483,10 @@ var start = function(){
$("select[name=relays]").change(function(){ $("select[name=relays]").change(function(){
showStats('relays', $(this).find('option:selected').html()); showStats('relays', $(this).find('option:selected').html());
}); });
$('#schemas .table tbody tr').on('', function(){
});
} }
$(document).ready(function(){ $(document).ready(function(){