From fd42ccba12def0028ddf517b135c00864743837f Mon Sep 17 00:00:00 2001 From: Adam Amstrong Date: Thu, 15 Sep 2011 14:08:45 +0000 Subject: [PATCH] updates git-svn-id: http://www.observium.org/svn/observer/trunk@2462 61d68cd4-352d-0410-923a-c4978735b2b8 --- html/includes/graphs/graph.inc.php | 2 +- html/includes/print-menubar.php | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/html/includes/graphs/graph.inc.php b/html/includes/graphs/graph.inc.php index eb9fa9caa..08b37cb18 100644 --- a/html/includes/graphs/graph.inc.php +++ b/html/includes/graphs/graph.inc.php @@ -89,7 +89,7 @@ function graph_error($string) #$rrd_options .= " HRULE:0#cc0000"; #$rrd_cmd = $config['rrdtool'] . " graph $graphfile $rrd_options" . $rrd_switches; - $rrd_cmd = $config['rrdtool'] . " graph $graphfile --title='".$string."' -l 0 -u 100 -E --start -10y --end now --width 315 --height 110 -c BACK#ff9999cc -c SHADEA#EEEEEE00 -c SHADEB#EEEEEE00 -c FONT#000000 -c CANVAS#FFFFFF00 -c GRID#a5a5a5 -c MGRID#FF9999 -c FRAME#5e5e5e -c ARROW#5e5e5e -R normal --font LEGEND:8:DejaVuSansMono --font AXIS:7:DejaVuSansMono --font-render-mode normal HRULE:0#cc0000" . $rrd_switches; + $rrd_cmd = $config['rrdtool'] . " graph $graphfile --title='".$string."' -l 0 -u 100 -E --start -10y --end now --width $width --height $height -c BACK#ff9999cc -c SHADEA#EEEEEE00 -c SHADEB#EEEEEE00 -c FONT#000000 -c CANVAS#FFFFFF00 -c GRID#a5a5a5 -c MGRID#FF9999 -c FRAME#5e5e5e -c ARROW#5e5e5e -R normal --font LEGEND:8:DejaVuSansMono --font AXIS:7:DejaVuSansMono --font-render-mode normal HRULE:0#cc0000" . $rrd_switches; $woo = shell_exec($rrd_cmd); diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php index 22fe142d3..e44295ef1 100644 --- a/html/includes/print-menubar.php +++ b/html/includes/print-menubar.php @@ -249,12 +249,12 @@ if ($config['show_locations']) if ($ports['errored']) { - echo('
  • Errored ('.$ports['errored'].')
    • '); + echo('
  • Errored ('.$ports['errored'].')
    • '); } if ($ports['ignored']) { - echo('
  • Ignored ('.$ports['ignored'].')
    • '); + echo('
  • Ignored ('.$ports['ignored'].')
    • '); } if ($config['enable_billing']) { echo('
  • Traffic Bills
    • '); $ifbreak = 1; } @@ -279,7 +279,7 @@ if ($ifbreak) { echo('
    • '); } if (isset($interface_alerts)) { - echo('
  • Alerts ('.$interface_alerts.')
    • '); + echo('
  • Alerts ('.$interface_alerts.')
    • '); } $deleted_ports = 0; @@ -292,11 +292,11 @@ foreach (dbFetchRows("SELECT * FROM `ports` AS P, `devices` as D WHERE P.`delete } ?> -
  • Down
    • -
  • Disabled
    • +
  • Down
    • +
  • Disabled
    • Deleted ('.$deleted_ports.')'); } +if ($deleted_ports) { echo('
  • Deleted ('.$deleted_ports.')
    • '); } ?>