add some new icons (better/works, bleh). add graphs/nographs display type to health.

git-svn-id: http://www.observium.org/svn/observer/trunk@1145 61d68cd4-352d-0410-923a-c4978735b2b8

html/css/styles.css

@@ -828,3 +828,7 @@ color: #cc0000;
   float: left;
 }
 
+.optionicon { 
+  vertical-align:middle;
+  margin-top: -4px
+}

html/includes/functions.inc.php

@@ -172,7 +172,7 @@ function generate_port_thumbnail($args)
 function print_optionbar_start ($height = 20, $width = 0) 
 {
   echo("
-    <div style='margin:auto; text-align: center; margin-top: 0px; margin-bottom: 10px; " . ($width ? 'max-width: ' . $width . 'px; ' : '') . "'>
+    <div style='text-align: center; margin-top: 0px; margin-bottom: 0px; " . ($width ? 'max-width: ' . $width . 'px; ' : '') . "'>
     <b class='rounded'>
     <b class='rounded1'><b></b></b>
     <b class='rounded2'><b></b></b>

html/includes/print-menubar.php

@@ -177,8 +177,8 @@ echo('<li><a href="ports/?status=0"><img src="images/16/link_error.png" border="
 <!--[if IE 7]><!--></a><!--<![endif]-->
         <table><tr><td>
         <ul>
-	<li><a href="health/processors/"><img src="images/icons/overview/processors.png" border="0" align="absmiddle" /> Processors</a></li>
-        <li><a href="health/memory/"><img src="images/icons/overview/mempools.png" border="0" align="absmiddle" /> Memory</a></li>
+	<li><a href="health/processors/"><img src="images/icons/processors.png" border="0" align="absmiddle" /> Processors</a></li>
+        <li><a href="health/memory/"><img src="images/icons/memory.png" border="0" align="absmiddle" /> Memory</a></li>
         <li><a href="health/storage/"><img src="images/icons/storage.png" border="0" align="absmiddle" /> Storage</a></li>
         <li><hr width=140 /></li>
         <li><a href="health/temperatures/"><img src="images/icons/temperature.png" border="0" align="absmiddle" /> Temperatures</a></li>

html/pages/health.php

@@ -1,27 +1,42 @@
 <?php
 
-$datas = array('Processors','Memory','Storage','Temperatures', 'Voltages', 'Fanspeeds', 'Frequencies', 'Current');
+$datas = array('Processors','Memory','Storage','Temperatures', 'Fanspeeds', 'Voltages', 'Frequencies', 'Current');
 
 if(!$_GET['opta']) { $_GET['opta'] = "processors"; }
+if(!$_GET['optb']) { $_GET['optb'] = "nographs"; }
 
-print_optionbar_start();
+
+print_optionbar_start('', '');
 
 $sep = "";
 foreach ($datas as $texttype) {
   $type = strtolower($texttype);
-  if (!isset($_GET['opta'])) { $_GET['opta'] = $type; }
   echo($sep);
   if ($_GET['opta'] == $type) { echo("<strong>"); }
-  echo("<a href='".$config['base_url']."/health/" . $type . "/'> " . $texttype ."</a>\n");
+  echo('<img src="images/icons/'.$type.'.png" class="optionicon" />');
+  echo("<a href='".$config['base_url']."/health/" . $type . "/" . $_GET['optb']. "/'> " . $texttype ."</a>\n");
   if ($_GET['opta'] == $type) { echo("</strong>"); }
   $sep = ' | ';
 }
 unset ($sep);
 
+echo('<div style="float: right;">');
+
+if($_GET['optb'] == "graphs") { echo('<strong>'); }
+echo('<img src="images/16/chart_curve.png" class="optionicon" />');
+echo('<a href="http://demo.observernms.org/health/'. $_GET['opta'].'/graphs/"> Graphs</a>');
+if($_GET['optb'] == "graphs") { echo('</strong>'); }
+echo(' | ');
+if($_GET['optb'] == "nographs") { echo('<strong>'); }
+echo('<img src="images/16/table.png" class="optionicon" />');
+echo('<a href="http://demo.observernms.org/health/'. $_GET['opta'].'/nographs/"> No Graphs</a>');
+if($_GET['optb'] == "nographs") { echo('</strong>'); }
+
+
+echo('</div>');
+
 print_optionbar_end();
 
-
-
 switch ($_GET['opta'])
 {
   case 'processors':