Skip to content

Commit

Permalink
adjust css for d3 charts
Browse files Browse the repository at this point in the history
  • Loading branch information
@jdillard
jdillard committed Aug 23, 2016
1 parent f8dd35d commit 23ea8ae
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 31 deletions.
2 changes: 1 addition & 1 deletion net/pfSense-pkg-Status_Traffic_Totals/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# $FreeBSD$

PORTNAME= pfSense-pkg-Status_Traffic_Totals
PORTVERSION= 1.1
PORTVERSION= 1.2
PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= # empty
Expand Down
24 changes: 12 additions & 12 deletions net/pfSense-pkg-Status_Traffic_Totals/files/usr/local/www/status_traffic_totals.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ function vnstat_delete_nic_dbs($portlist) {
<div class="panel-body">
<div class="alert alert-info" id="loading-msg">Loading Graph...</div>
<div id="chart-error" class="alert alert-danger" style="display: none;"></div>
<div id="chart" class="with-3d-shadow with-transitions">
<div id="traffic-totals-chart" class="d3-chart">
<svg></svg>
</div>
</div>
Expand Down Expand Up @@ -522,7 +522,7 @@ function draw_graph() {

var errorMsg = raw_json.error;

$("#chart").hide();
$("#traffic-totals-chart").hide();
$("#loading-msg").hide();

//check if interface databases don't exist
Expand Down Expand Up @@ -550,7 +550,7 @@ function draw_graph() {
//The Top 10 logic doesn't work with more than one interface
if(timePeriod === "top" && interfaces.length > 1) {

$("#chart").hide();
$("#traffic-totals-chart").hide();
$("#loading-msg").hide();
$('#summary tbody').empty();
$('#summary thead').empty();
Expand Down Expand Up @@ -889,12 +889,12 @@ interface_index = index;

});

$("#chart").show();
$("#traffic-totals-chart").show();
$("#loading-msg").hide();

d3.select("svg").remove(); //delete previous svg so it can be drawn from scratch
d3.select("div[id^=nvtooltip-]").remove(); //delete previous tooltip in case it gets hung
d3.select('#chart').append('svg'); //re-add blank svg so it and be drawn on
d3.select('#traffic-totals-chart').append('svg'); //re-add blank svg so it and be drawn on

var data = json;
var offset = 0;
Expand Down Expand Up @@ -967,7 +967,7 @@ interface_index = index;

//add system name
var systemName = '<?=htmlspecialchars($config['system']['hostname'] . "." . $config['system']['domain']); ?>';
d3.select('#chart svg')
d3.select('#traffic-totals-chart svg')
.append("text")
.attr("x", 225)
.attr("y", 415)
Expand All @@ -976,7 +976,7 @@ interface_index = index;

//add time period
var timePeriod = $( "li.active" ).text();
d3.select('#chart svg')
d3.select('#traffic-totals-chart svg')
.append("text")
.attr("x", 480)
.attr("y", 415)
Expand All @@ -987,7 +987,7 @@ interface_index = index;
//TODO change to updated date
//console.log(raw_json.interfaces[0].updated);
var currentDate = d3.time.format('%b %d, %Y %H:%M')(new Date());
d3.select('#chart svg')
d3.select('#traffic-totals-chart svg')
.append("text")
.attr("x", 680)
.attr("y", 415)
Expand Down Expand Up @@ -1043,7 +1043,7 @@ interface_index = index;

});

d3.select('#chart svg')
d3.select('#traffic-totals-chart svg')
.datum(data)
.transition()
.duration(500)
Expand All @@ -1061,7 +1061,7 @@ interface_index = index;

})
.fail(function(error) {
$("#chart").hide();
$("#traffic-totals-chart").hide();
$("#chart-error").show().html('<strong>Error</strong>: ' + error);

console.warn(error);
Expand Down Expand Up @@ -1301,7 +1301,7 @@ function calculate_summary(data, timePeriod) {
}

$( ".update-graph" ).click(function() {
$("#chart").hide();
$("#traffic-totals-chart").hide();
$("#loading-msg").show();
$("#chart-error").hide();
draw_graph();
Expand All @@ -1313,7 +1313,7 @@ function calculate_summary(data, timePeriod) {

$("#time-period").val($(this).find("a").attr('href').substring(1));

$("#chart").hide();
$("#traffic-totals-chart").hide();
$("#loading-msg").show();
$("#chart-error").hide();
draw_graph();
Expand Down
2 changes: 1 addition & 1 deletion sysutils/pfSense-Status_Monitoring/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# $FreeBSD$

PORTNAME= pfSense-Status_Monitoring
PORTVERSION= 1.4.4
PORTVERSION= 1.4.5
PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= # empty
Expand Down
34 changes: 17 additions & 17 deletions sysutils/pfSense-Status_Monitoring/files/usr/local/www/status_monitoring.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ function createOptions($dropdown) {
<div class="panel-body">
<div class="alert alert-info" id="loading-msg">Loading Graph...</div>
<div id="chart-error" class="alert alert-danger" style="display: none;"></div>
<div id="chart" class="with-3d-shadow with-transitions">
<div id="monitoring-chart" class="d3-chart">
<svg></svg>
</div>
</div>
Expand Down Expand Up @@ -819,7 +819,7 @@ function getOptions() {

if(!start || !end) {
error = "Invalid Date/Time in Custom Period."
$("#chart").hide();
$("#monitoring-chart").hide();
$("#chart-error").show().html('<strong>Error</strong>: ' + error);
console.warn(error);
return false;
Expand Down Expand Up @@ -962,7 +962,7 @@ function applySettings(defaults) {
applySettings("<?php echo $pconfig['category']; ?>");

$( ".update-graph" ).click(function() {
$("#chart").hide();
$("#monitoring-chart").hide();
$("#loading-msg").show();
$("#chart-error").hide();
draw_graph(getOptions());
Expand All @@ -986,13 +986,13 @@ function applySettings(defaults) {
.post(getOptions(), function(error, json) {

if (error) {
$("#chart").hide();
$("#monitoring-chart").hide();
$("#chart-error").show().html('<strong>Error</strong>: ' + error);
return console.warn(error);
}

if (json.error) {
$("#chart").hide();
$("#monitoring-chart").hide();
$("#chart-error").show().html('<strong>Error</strong>: ' + json.error);
return console.warn(json.error);
}
Expand Down Expand Up @@ -1056,21 +1056,21 @@ function draw_graph(options) {
.header("Content-Type", "application/x-www-form-urlencoded")
.post(options, function(error, json) {

$("#chart").show();
$("#monitoring-chart").show();
$("#loading-msg").hide();

d3.select("svg").remove(); //delete previous svg so it can be drawn from scratch
d3.select("div[id^=nvtooltip-]").remove(); //delete previous tooltip in case it gets hung
d3.select('#chart').append('svg'); //re-add blank svg so it and be drawn on
d3.select('#monitoring-chart').append('svg'); //re-add blank svg so it and be drawn on

if (error) {
$("#chart").hide();
$("#monitoring-chart").hide();
$("#chart-error").show().html('<strong>Error</strong>: ' + error);
return console.warn(error);
}

if (json.error) {
$("#chart").hide();
$("#monitoring-chart").hide();
$("#chart-error").show().html('<strong>Error</strong>: ' + json.error);
return console.warn(json.error);
}
Expand Down Expand Up @@ -1125,7 +1125,7 @@ function draw_graph(options) {
//add left title
var leftTitle = $("#category-left option:selected").text() + " -- " + $("#graph-left option:selected").text();

d3.select('#chart svg')
d3.select('#monitoring-chart svg')
.append("text")
.attr("x", 150)
.attr("y", 11)
Expand All @@ -1150,7 +1150,7 @@ function draw_graph(options) {

//add right title
var rightTitle = $("#category-right option:selected").text() + " -- " + $("#graph-right option:selected").text();
d3.select('#chart svg')
d3.select('#monitoring-chart svg')
.append("text")
.attr("x", 150)
.attr("y", 28)
Expand All @@ -1159,7 +1159,7 @@ function draw_graph(options) {

//add system name
var systemName = '<?=htmlspecialchars($config['system']['hostname'] . "." . $config['system']['domain']); ?>';
d3.select('#chart svg')
d3.select('#monitoring-chart svg')
.append("text")
.attr("x", 100)
.attr("y", 415)
Expand All @@ -1168,7 +1168,7 @@ function draw_graph(options) {

//add time period
var timePeriod = $("#time-period option:selected").text();
d3.select('#chart svg')
d3.select('#monitoring-chart svg')
.append("text")
.attr("x", 330)
.attr("y", 415)
Expand All @@ -1177,7 +1177,7 @@ function draw_graph(options) {

//add resolution
var Resolution = $("#resolution option:selected").text();
d3.select('#chart svg')
d3.select('#monitoring-chart svg')
.append("text")
.attr("x", 530)
.attr("y", 415)
Expand All @@ -1186,7 +1186,7 @@ function draw_graph(options) {

//add last updated date
var currentDate = d3.time.format('%a %b %d %H:%M:%S %Y')(new Date(data[0].last_updated));
d3.select('#chart svg')
d3.select('#monitoring-chart svg')
.append("text")
.attr("x", 755)
.attr("y", 415)
Expand Down Expand Up @@ -1246,7 +1246,7 @@ function draw_graph(options) {

});

d3.select('#chart svg')
d3.select('#monitoring-chart svg')
.datum(data)
.transition()
.duration(500)
Expand Down Expand Up @@ -1346,7 +1346,7 @@ function calculate_summary(data) {
if(!rrdEnabled) {

$("#loading-msg").hide();
$("#chart").hide();
$("#monitoring-chart").hide();
$("#chart-error").show().html('<strong>Error</strong>: RRD graphs are not enabled. Enable in the Settings above.');

} else {
Expand Down

0 comments on commit 23ea8ae

Please sign in to comment.