From b76ad33b3becacbb32597b6f98c2438ed7ffbd83 Mon Sep 17 00:00:00 2001 From: Adam Amstrong Date: Mon, 11 Apr 2011 09:16:50 +0000 Subject: [PATCH] extend simpler menubar to more pages. fix graphname to device_temperature for os definitions. git-svn-id: http://www.observium.org/svn/observer/trunk@2051 61d68cd4-352d-0410-923a-c4978735b2b8 --- html/pages/bill.inc.php | 12 ++++++------ html/pages/device/edit.inc.php | 12 ++++++------ html/pages/health.inc.php | 2 +- includes/static-config.php | 26 +++++++++++++------------- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/html/pages/bill.inc.php b/html/pages/bill.inc.php index 878d96474a..36fc203e21 100644 --- a/html/pages/bill.inc.php +++ b/html/pages/bill.inc.php @@ -69,21 +69,21 @@ if (bill_permitted($bill_id)) if (!$_GET['optb']) { $_GET['optb'] = "details"; } - if ($_GET['optb'] == "details") { echo(""); } + if ($_GET['optb'] == "details") { echo(""); } echo("Details"); - if ($_GET['optb'] == "details") { echo(""); } + if ($_GET['optb'] == "details") { echo(""); } if ($_SESSION['userlevel'] == "10") { echo(" | "); - if ($_GET['optb'] == "edit") { echo(""); } + if ($_GET['optb'] == "edit") { echo(""); } echo("Edit"); - if ($_GET['optb'] == "edit") { echo(""); } + if ($_GET['optb'] == "edit") { echo(""); } echo(" | "); - if ($_GET['optb'] == "delete") { echo(""); } + if ($_GET['optb'] == "delete") { echo(""); } echo("Delete"); - if ($_GET['optb'] == "delete") { echo(""); } + if ($_GET['optb'] == "delete") { echo(""); } } print_optionbar_end(); diff --git a/html/pages/device/edit.inc.php b/html/pages/device/edit.inc.php index 64c918b6f3..d73ed48c61 100644 --- a/html/pages/device/edit.inc.php +++ b/html/pages/device/edit.inc.php @@ -27,14 +27,14 @@ if ($_SESSION['userlevel'] < '7') echo($sep); if ($_GET['opta'] == $type) { - echo(""); - echo(''); + echo(""); + #echo(''); } else { - echo(''); + #echo(''); } - echo(" " . $text ."\n"); - if ($_GET['opta'] == $type) { echo(""); } + echo(" " . $text .""); + if ($_GET['opta'] == $type) { echo(""); } $sep = " | "; } @@ -46,4 +46,4 @@ if ($_SESSION['userlevel'] < '7') } } -?> \ No newline at end of file +?> diff --git a/html/pages/health.inc.php b/html/pages/health.inc.php index e0707084d5..873f9ec4a9 100644 --- a/html/pages/health.inc.php +++ b/html/pages/health.inc.php @@ -14,7 +14,7 @@ $type_text['fanspeed'] = "Fanspeed"; $type_text['frequency'] = "Frequency"; $type_text['current'] = "Current"; -if (!$_GET['opta']) { $_GET['opta'] = "processors"; } +if (!$_GET['opta']) { $_GET['opta'] = "processor"; } if (!$_GET['optb']) { $_GET['optb'] = "nographs"; } print_optionbar_start('', ''); diff --git a/includes/static-config.php b/includes/static-config.php index 75ee951f40..48329050bd 100644 --- a/includes/static-config.php +++ b/includes/static-config.php @@ -551,14 +551,14 @@ $config['os'][$os]['over'][0]['text'] = "Current"; $os = "akcp"; $config['os'][$os]['text'] = "AKCP SensorProbe"; $config['os'][$os]['type'] = "environment"; -$config['os'][$os]['over'][0]['graph'] = "device_temperatures"; -$config['os'][$os]['over'][0]['text'] = "Temperatures"; +$config['os'][$os]['over'][0]['graph'] = "device_temperature"; +$config['os'][$os]['over'][0]['text'] = "temperature"; $os = "minkelsrms"; $config['os'][$os]['text'] = "Minkels RMS"; $config['os'][$os]['type'] = "environment"; -$config['os'][$os]['over'][0]['graph'] = "device_temperatures"; -$config['os'][$os]['over'][0]['text'] = "Temperatures"; +$config['os'][$os]['over'][0]['graph'] = "device_temperature"; +$config['os'][$os]['over'][0]['text'] = "temperature"; $os = "ipoman"; $config['os'][$os]['text'] = "Ingrasys iPoMan"; @@ -570,21 +570,21 @@ $config['os'][$os]['over'][0]['text'] = "Current"; $os = "wxgoos"; $config['os'][$os]['text'] = "ITWatchDogs Goose"; $config['os'][$os]['type'] = "environment"; -$config['os'][$os]['over'][0]['graph'] = "device_temperatures"; -$config['os'][$os]['over'][0]['text'] = "Temperatures"; +$config['os'][$os]['over'][0]['graph'] = "device_temperature"; +$config['os'][$os]['over'][0]['text'] = "temperature"; $os = "papouch-tme"; $config['os'][$os]['text'] = "Papouch TME"; $config['os'][$os]['type'] = "environment"; -$config['os'][$os]['over'][0]['graph'] = "device_temperatures"; -$config['os'][$os]['over'][0]['text'] = "Temperatures"; +$config['os'][$os]['over'][0]['graph'] = "device_temperature"; +$config['os'][$os]['over'][0]['text'] = "temperature"; $os = "cometsystem-p85xx"; $config['os'][$os]['text'] = "Comet System P85xx"; $config['os'][$os]['type'] = "environment"; $config['os'][$os]['icon'] = "comet"; -$config['os'][$os]['over'][0]['graph'] = "device_temperatures"; -$config['os'][$os]['over'][0]['text'] = "Temperatures"; +$config['os'][$os]['over'][0]['graph'] = "device_temperature"; +$config['os'][$os]['over'][0]['text'] = "temperature"; $os = "dell-laser"; $config['os'][$os]['group'] = "printer"; @@ -782,9 +782,9 @@ $config['graph_types']['device']['processor']['descr'] = 'Processor Usage'; $config['graph_types']['device']['storage']['section'] = 'system'; $config['graph_types']['device']['storage']['order'] = '0'; $config['graph_types']['device']['storage']['descr'] = 'Filesystem Usage'; -$config['graph_types']['device']['temperatures']['section'] = 'system'; -$config['graph_types']['device']['temperatures']['order'] = '0'; -$config['graph_types']['device']['temperatures']['descr'] = 'Temperatures'; +$config['graph_types']['device']['temperature']['section'] = 'system'; +$config['graph_types']['device']['temperature']['order'] = '0'; +$config['graph_types']['device']['temperature']['descr'] = 'temperature'; $config['graph_types']['device']['ucd_cpu']['section'] = 'system'; $config['graph_types']['device']['ucd_cpu']['order'] = '0'; $config['graph_types']['device']['ucd_cpu']['descr'] = 'Detailed Processor Usage';