From 58034ce1627ae97589fffbe14a34aa979891a20e Mon Sep 17 00:00:00 2001 From: Adam Amstrong Date: Mon, 19 Sep 2011 02:20:16 +0000 Subject: [PATCH] change styles a bit. put graphs on device header git-svn-id: http://www.observium.org/svn/observer/trunk@2497 61d68cd4-352d-0410-923a-c4978735b2b8 --- html/css/styles.css | 26 +++++++++-- html/includes/device-header.inc.php | 67 +++++++++++++++++++++------ html/index.php | 8 ++-- html/pages/device.inc.php | 2 +- html/pages/device/edit/device.inc.php | 24 ++++++++++ 5 files changed, 102 insertions(+), 25 deletions(-) diff --git a/html/css/styles.css b/html/css/styles.css index 98b4e737d4..b5f71369b5 100644 --- a/html/css/styles.css +++ b/html/css/styles.css @@ -576,7 +576,7 @@ a:active { color: #00f; } .vspace { margin-top: 4px; margin-bottom: 4px; } p.vspace { padding-top: 3px; padding-bottom: 3px; } -.content-mat { padding: 0px; margin: auto; } +.content-mat { padding: 0px; margin: auto; display:block; } .clearer { clear: both; display: block; padding: 0px; height: 0px; line-height: 1px; font-size: 0px; } @@ -712,10 +712,9 @@ a.interface-upup:hover, a.interface-updown:hover, a.interface-admindown:hover { color: #aaaaaa; } -#center { +#container { width:1200px; - margin:0px auto 0px auto; - + margin:0 auto; } #logo { @@ -1238,3 +1237,22 @@ a.interface-upup:hover, a.interface-updown:hover, a.interface-admindown:hover { display: none; /* keeps the popup hidden if no JS available */ } +.div-normal { + +} +.div-alert { + border: 2px solid; + #border-radius: 10px; + border-color: #cc0000; +} +.div-ignore { + +} +.div-ignore-alert { + +} + +.div-disabled { + +} + diff --git a/html/includes/device-header.inc.php b/html/includes/device-header.inc.php index edc07d8540..19bb78bf7b 100644 --- a/html/includes/device-header.inc.php +++ b/html/includes/device-header.inc.php @@ -1,25 +1,19 @@ - '.$image.' - ' . generate_device_link($device) . ' + '.$image.' + ' . generate_device_link($device) . '
' . $device['location'] . ' - - '); + '); -?> \ No newline at end of file + if (isset($config['os'][$device['os']]['over'])) + { + $graphs = $config['os'][$device['os']]['over']; + } + elseif (isset($device['os_group']) && isset($config['os'][$device['os_group']]['over'])) + { + $graphs = $config['os'][$device['os_group']]['over']; + } + else + { + $graphs = $config['os']['default']['over']; + } + + $graph_array['height'] = "100"; + $graph_array['width'] = "310"; + $graph_array['to'] = $now; + $graph_array['id'] = $device['device_id']; + $graph_array['type'] = "device_bits"; + $graph_array['from'] = $day; + $graph_array['legend'] = "no"; + $graph_array['popup_title'] = $descr; +# $graph_array['link'] = generate_device_link($device_id); +# print_graph_popup($graph_array); + + $graph_array['height'] = "45"; + $graph_array['width'] = "150"; + $graph_array['bg'] = "FFFFFF00"; + + foreach ($graphs as $entry) + { + $graph_array['type'] = $entry['graph']; + $graphhead = $entry['text']; + + echo("
"); + print_graph_popup($graph_array); + echo("
".$entry['text']."
"); + echo("
"); + } + + unset($graph_array); + +echo(' + '); + +?> diff --git a/html/index.php b/html/index.php index 61920e41cf..4e80ab537a 100755 --- a/html/index.php +++ b/html/index.php @@ -227,7 +227,7 @@ function popUp(URL) // End --> -
+
-
-
-
+
+
-
'); + echo(''); #include("includes/hostbox.inc.php"); include("includes/device-header.inc.php"); echo('
'); diff --git a/html/pages/device/edit/device.inc.php b/html/pages/device/edit/device.inc.php index 57e49a14ca..2c1a6eabb4 100644 --- a/html/pages/device/edit/device.inc.php +++ b/html/pages/device/edit/device.inc.php @@ -49,9 +49,33 @@ if ($_POST['editing']) $descr = $device['purpose']; +function foldersize($path) { + $total_size = 0; + $files = scandir($path); + $total_files = 0; + foreach($files as $t) { + if (is_dir(rtrim($path, '/') . '/' . $t)) { + if ($t<>"." && $t<>"..") { + $size = foldersize(rtrim($path, '/') . '/' . $t); + $total_size += $size; + } + } else { + $size = filesize(rtrim($path, '/') . '/' . $t); + $total_size += $size; + $total_files++; + } + } + return array($total_size, $total_files); +} + $override_sysLocation_bool = get_dev_attrib($device,'override_sysLocation_bool'); $override_sysLocation_string = get_dev_attrib($device,'override_sysLocation_string'); +list($sizeondisk, $numrrds) = foldersize($config['rrd_dir']."/".$device['hostname']); + +echo("Size on Disk:" . formatStorage($sizeondisk) . " in " . $numrrds . " RRD files."); + + if ($updated && $update_message) { print_message($update_message);