webui: Cleanup white backgrounds on certain graphs

This commit is contained in:
VVelox
2017-03-02 12:07:55 -06:00
committed by Neil Lathwood
parent 41bf70dac9
commit 7f91fab663
9 changed files with 11 additions and 15 deletions

View File

@ -675,7 +675,7 @@ function generate_bill_url($bill, $vars = array())
function generate_port_image($args)
{
if (!$args['bg']) {
$args['bg'] = 'FFFFFF';
$args['bg'] = 'FFFFFF00';
}
return "<img src='graph.php?type=".$args['graph_type'].'&amp;id='.$args['port_id'].'&amp;from='.$args['from'].'&amp;to='.$args['to'].'&amp;width='.$args['width'].'&amp;height='.$args['height'].'&amp;bg='.$args['bg']."'>";

View File

@ -4,8 +4,8 @@ require 'includes/graphs/common.inc.php';
$scale_min = 0;
$ds = 'frequency';
$colour_area = 'F6F6F6';
$colour_line = 'B3D0DB';
$colour_area = $config['graph_colours']['pinks'][0].'33';
$colour_line = $config['graph_colours']['pinks'][0];
$colour_area_max = 'FFEE99';
$graph_max = 100;
$unit_text = 'Frequency';

View File

@ -4,8 +4,8 @@ require 'includes/graphs/common.inc.php';
$scale_min = 0;
$ds = 'uptime';
$colour_area = 'EEEEEE';
$colour_line = '36393D';
$colour_area = $config['graph_colours']['purples'][0].'33';
$colour_line = $config['graph_colours']['purples'][0];
$colour_area_max = 'FFEE99';
$graph_max = 0;
$unit_text = 'Seconds';

View File

@ -21,7 +21,7 @@
require 'includes/graphs/common.inc.php';
$scale_min = 0;
$ds = 'charge';
$colour_area = 'EEEEEE';
$colour_area = 'FF330011';
$colour_line = 'FF3300';
$colour_area_max = 'FFEE99';
$graph_max = 0;

View File

@ -21,7 +21,7 @@
require 'includes/graphs/common.inc.php';
$scale_min = 0;
$ds = 'load';
$colour_area = 'EEEEEE';
$colour_area = 'FF330011';
$colour_line = 'FF3300';
$colour_area_max = 'FFEE99';
$graph_max = 0;

View File

@ -21,8 +21,8 @@
require 'includes/graphs/common.inc.php';
$scale_min = 0;
$ds = 'time_remaining';
$colour_area = 'EEEEEE';
$colour_line = '36393D';
$colour_area = 'FF000011';
$colour_line = 'FF0000';
$colour_area_max = 'FFEE99';
$graph_max = 0;
$unit_text = 'Minutes';

View File

@ -25,7 +25,7 @@ $rrd_options .= ' AREA:system_perc#ea8f00:system:STACK';
$rrd_options .= " GPRINT:system_perc:LAST:' %5.2lf%%'";
$rrd_options .= " GPRINT:system_perc:AVERAGE:' %5.2lf%%'";
$rrd_options .= " GPRINT:system_perc:MAX:' %5.2lf%%\\n'";
$rrd_options .= ' AREA:idle_perc#f8f8f3:idle:STACK';
$rrd_options .= ' AREA:idle_perc#00007776:idle:STACK';
$rrd_options .= " GPRINT:idle_perc:LAST:' %5.2lf%%'";
$rrd_options .= " GPRINT:idle_perc:AVERAGE:' %5.2lf%%'";
$rrd_options .= " GPRINT:idle_perc:MAX:' %5.2lf%%\\n'";

View File

@ -9,7 +9,7 @@ $rrd_filename = rrd_name($device['hostname'], 'uptime');
$rrd_options .= ' DEF:uptime='.$rrd_filename.':uptime:AVERAGE';
$rrd_options .= ' CDEF:cuptime=uptime,86400,/';
$rrd_options .= " 'COMMENT:Days Current Minimum Maximum Average\\n'";
$rrd_options .= ' AREA:cuptime#EEEEEE:Uptime';
$rrd_options .= ' AREA:cuptime#00FF0022:Uptime';
$rrd_options .= ' LINE1.25:cuptime#36393D:';
$rrd_options .= ' GPRINT:cuptime:LAST:%6.2lf GPRINT:cuptime:AVERAGE:%6.2lf';
$rrd_options .= " GPRINT:cuptime:MAX:%6.2lf 'GPRINT:cuptime:AVERAGE:%6.2lf\\n'";

View File

@ -11,10 +11,6 @@ $rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
$rrd_options .= " DEF:sensor_max=$rrd_filename:sensor:MAX";
$rrd_options .= " DEF:sensor_min=$rrd_filename:sensor:MIN";
$rrd_options .= ' AREA:sensor_max#c5c5c5';
$rrd_options .= ' AREA:sensor_min#ffffffff';
// $rrd_options .= " AREA:sensor#FFFF99";
$rrd_options .= " LINE1.5:sensor#cc0000:'".rrdtool_escape($sensor['sensor_descr'], 22)."'";
$rrd_options .= ' GPRINT:sensor:LAST:%6.2lfV';
$rrd_options .= ' GPRINT:sensor:MAX:%6.2lfV\l';