clean up temperatures a bit, replace it by sensors in the menu bar, add fans and voltages though not working yet

git-svn-id: http://www.observium.org/svn/observer/trunk@798 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2010-02-09 16:36:06 +00:00
parent 4bec5c75e7
commit 57606eef00
3 changed files with 28 additions and 5 deletions

View File

@@ -153,7 +153,18 @@ echo('<li><a href="interfaces/?status=0"><img src="images/16/link_error.png" bor
</ul></td></tr></table>
</li>
<li><a class="menu2four" href="/temperatures/"><img src="images/16/weather_sun.png" border="0" align="absmiddle" /> Temps</a></li>
<ul>
<li><a class="menu2four" href="sensors/temperatures/"><img src="images/16/contrast.png" border="0" align="absmiddle" /> Sensors</a>
<table><tr><td>
<ul>
<li><a href="sensors/temperatures/"><img src="images/16/weather_sun.png" border="0" align="absmiddle" /> Temperatures</a></li>
<li><a href="sensors/fans/"><img src="images/16/chart_curve.png" border="0" align="absmiddle" /> Fans</a></li>
<li><a href="sensors/voltages/"><img src="images/16/chart_bar.png" border="0" align="absmiddle" /> Voltages</a></li>
</ul>
</td></tr></table>
</li>
</ul>
<li><a class="menu2four" href="/storage/"><img src="images/16/database.png" border="0" align="absmiddle" /> Storage</a></li>

15
html/pages/sensors.php Normal file
View File

@@ -0,0 +1,15 @@
<?php
switch ($_GET['opta'])
{
case 'temperatures':
case 'voltages':
case 'fans':
include('pages/sensors/'.$_GET['opta'].'.php');
break;
default:
include('pages/sensors/temperatures.php');
break;
}
?>

View File

@@ -26,9 +26,6 @@ while($temp = mysql_fetch_array($query))
{
if(is_integer($row/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; }
$speed = humanspeed($temp['ifSpeed']);
$type = humanmedia($temp['ifType']);
$weekly_temp = "graph.php?id=" . $temp['temp_id'] . "&amp;type=temperature&amp;from=$week&amp;to=$now&amp;width=500&amp;height=150";
$temp_popup = "<a onmouseover=\"return overlib('<img src=\'$weekly_temp\'>', LEFT);\" onmouseout=\"return nd();\">
" . $temp['temp_descr'] . "</a>";
@@ -54,7 +51,7 @@ while($temp = mysql_fetch_array($query))
<td width=100>$alert</td>
<td style='color: $temp_colour; text-align: center; font-weight: bold;'>" . $temp['temp_current'] . " &deg;C</td>
<td style='text-align: center'>" . $temp['temp_limit'] . " &deg;C</td>
<td>" . $temp['temp_notes'] . "</td>
<td>" . (isset($temp['temp_notes']) ? $temp['temp_notes'] : '') . "</td>
</tr>\n");
$row++;