From 78e507ccc4adc09b4265d8408d34fb8a92928f2b Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Sat, 9 Apr 2011 14:22:43 +0000
Subject: [PATCH] fix more health graphs (removing plurals)

git-svn-id: http://www.observium.org/svn/observer/trunk@2043 61d68cd4-352d-0410-923a-c4978735b2b8
---
 .../{fanspeeds.inc.php => fanspeed.inc.php}   |  0
 ...{frequencies.inc.php => frequency.inc.php} |  0
 .../{mempools.inc.php => mempool.inc.php}     |  0
 .../{processors.inc.php => processor.inc.php} |  0
 ...mperatures.inc.php => temperature.inc.php} |  0
 .../{voltages.inc.php => voltage.inc.php}     |  0
 html/pages/device/health.inc.php              |  6 ++---
 html/pages/device/overview/processors.inc.php |  4 ++--
 html/pages/health.inc.php                     | 23 ++++++++++++-------
 .../{memory.inc.php => mempool.inc.php}       |  0
 10 files changed, 19 insertions(+), 14 deletions(-)
 rename html/includes/graphs/device/{fanspeeds.inc.php => fanspeed.inc.php} (100%)
 rename html/includes/graphs/device/{frequencies.inc.php => frequency.inc.php} (100%)
 rename html/includes/graphs/device/{mempools.inc.php => mempool.inc.php} (100%)
 rename html/includes/graphs/device/{processors.inc.php => processor.inc.php} (100%)
 rename html/includes/graphs/device/{temperatures.inc.php => temperature.inc.php} (100%)
 rename html/includes/graphs/device/{voltages.inc.php => voltage.inc.php} (100%)
 rename html/pages/health/{memory.inc.php => mempool.inc.php} (100%)

diff --git a/html/includes/graphs/device/fanspeeds.inc.php b/html/includes/graphs/device/fanspeed.inc.php
similarity index 100%
rename from html/includes/graphs/device/fanspeeds.inc.php
rename to html/includes/graphs/device/fanspeed.inc.php
diff --git a/html/includes/graphs/device/frequencies.inc.php b/html/includes/graphs/device/frequency.inc.php
similarity index 100%
rename from html/includes/graphs/device/frequencies.inc.php
rename to html/includes/graphs/device/frequency.inc.php
diff --git a/html/includes/graphs/device/mempools.inc.php b/html/includes/graphs/device/mempool.inc.php
similarity index 100%
rename from html/includes/graphs/device/mempools.inc.php
rename to html/includes/graphs/device/mempool.inc.php
diff --git a/html/includes/graphs/device/processors.inc.php b/html/includes/graphs/device/processor.inc.php
similarity index 100%
rename from html/includes/graphs/device/processors.inc.php
rename to html/includes/graphs/device/processor.inc.php
diff --git a/html/includes/graphs/device/temperatures.inc.php b/html/includes/graphs/device/temperature.inc.php
similarity index 100%
rename from html/includes/graphs/device/temperatures.inc.php
rename to html/includes/graphs/device/temperature.inc.php
diff --git a/html/includes/graphs/device/voltages.inc.php b/html/includes/graphs/device/voltage.inc.php
similarity index 100%
rename from html/includes/graphs/device/voltages.inc.php
rename to html/includes/graphs/device/voltage.inc.php
diff --git a/html/pages/device/health.inc.php b/html/pages/device/health.inc.php
index add6bb26d..a976519de 100644
--- a/html/pages/device/health.inc.php
+++ b/html/pages/device/health.inc.php
@@ -31,7 +31,7 @@ $type_text['mempool'] = "Memory";
 $type_text['storage'] = "Disk Usage";
 $type_text['diskio'] = "Disk I/O";
 $type_text['processor'] = "Processor";
-$type_text['voltage'] = "Voltages";
+$type_text['voltage'] = "Voltage";
 $type_text['fanspeed'] = "Fanspeed";
 $type_text['frequency'] = "Frequency";
 $type_text['current'] = "Current";
@@ -48,10 +48,8 @@ foreach ($datas as $type)
   if ($_GET['opta'] == $type)
   {
     echo('<span class="pagemenu-selected">');
-#    echo('<img src="images/icons/'.$type.'.png" class="optionicon" />');
-  } else {
-#    echo('<img src="images/icons/greyscale/'.$type.'.png" class="optionicon" />');
   }
+
   echo("<a href='".$config['base_url']."/device/".$device['device_id']."/health/" . $type . ($_GET['optb'] ? "/" . $_GET['optb'] : ''). "/'> " . $type_text[$type] ."</a>");
   if ($_GET['opta'] == $type) { echo("</span>"); }
   $sep = " | ";
diff --git a/html/pages/device/overview/processors.inc.php b/html/pages/device/overview/processors.inc.php
index d6d09392e..dc128003c 100644
--- a/html/pages/device/overview/processors.inc.php
+++ b/html/pages/device/overview/processors.inc.php
@@ -8,7 +8,7 @@ if (mysql_result(mysql_query("SELECT count(*) from processors WHERE device_id =
   echo("<div style='background-color: #eeeeee; margin: 5px; padding: 5px;'>");
   echo("<p style='padding: 0px 5px 5px;' class=sectionhead>");
   echo('<a class="sectionhead" href="device/'.$device['device_id'].'/health/processors/">');
-  echo("<img align='absmiddle' src='".$config['base_url']."/images/icons/processors.png'> Processors</a></p>");
+  echo("<img align='absmiddle' src='".$config['base_url']."/images/icons/processor.png'> Processors</a></p>");
   echo("<table width=100% cellspacing=0 cellpadding=5>");
   $i = '1';
   $procs = mysql_query("SELECT * FROM `processors` WHERE device_id = '" . $device['device_id'] . "' ORDER BY processor_descr ASC");
@@ -52,4 +52,4 @@ if (mysql_result(mysql_query("SELECT count(*) from processors WHERE device_id =
   echo("</div>");
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/html/pages/health.inc.php b/html/pages/health.inc.php
index 3868a46cb..e0707084d 100644
--- a/html/pages/health.inc.php
+++ b/html/pages/health.inc.php
@@ -1,6 +1,18 @@
 <?php
 
-$datas = array('Processor','Memory','Storage','Temperature', 'Humidity', 'Fanspeed', 'Voltage', 'Frequency', 'Current');
+$datas = array('processor','mempool','storage','temperature', 'humidity', 'fanspeed', 'voltage', 'frequency', 'current');
+
+$type_text['overview'] = "Overview";
+$type_text['temperature'] = "Temperature";
+$type_text['humidity'] = "Humidity";
+$type_text['mempool'] = "Memory";
+$type_text['storage'] = "Disk Usage";
+$type_text['diskio'] = "Disk I/O";
+$type_text['processor'] = "Processor";
+$type_text['voltage'] = "Voltages";
+$type_text['fanspeed'] = "Fanspeed";
+$type_text['frequency'] = "Frequency";
+$type_text['current'] = "Current";
 
 if (!$_GET['opta']) { $_GET['opta'] = "processors"; }
 if (!$_GET['optb']) { $_GET['optb'] = "nographs"; }
@@ -15,14 +27,9 @@ foreach ($datas as $texttype)
   if ($_GET['opta'] == $type)
   {
     echo("<span class='pagemenu-selected'>"); 
- #'style='font-weight: bold; background-color: #ffffff; -moz-border-radius: 15px; border-radius: 15px; padding: 2px 8px;'>");
-#    echo('<img src="images/icons/'.$type.'.png" class="optionicon" />');
   }
-  else
-  {
-#    echo('<img src="images/icons/greyscale/'.$type.'.png" class="optionicon" />');
-  }
-  echo('<a href="'.$config['base_url'].'/health/' . $type . ($_GET['optb'] ? '/' . $_GET['optb'] : ''). '/">' . $texttype ."</a>");
+
+  echo('<a href="'.$config['base_url'].'/health/' . $type . ($_GET['optb'] ? '/' . $_GET['optb'] : ''). '/">' . $type_text[$type] ."</a>");
  
  if ($_GET['opta'] == $type) { echo("</span>"); }
 
diff --git a/html/pages/health/memory.inc.php b/html/pages/health/mempool.inc.php
similarity index 100%
rename from html/pages/health/memory.inc.php
rename to html/pages/health/mempool.inc.php