fix more broken links on device overview

git-svn-id: http://www.observium.org/svn/observer/trunk@2529 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2011-09-20 16:22:56 +00:00
parent 460bbd42d6
commit fd46d7bff9
9 changed files with 13 additions and 11 deletions

View File

@@ -15,7 +15,7 @@ foreach (dbFetchRows("SELECT * FROM `ucd_diskio` WHERE device_id = ? ORDER BY di
{ {
if (is_integer($row/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; } if (is_integer($row/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; }
$fs_url = "device/".$device['device_id']."/health/diskio/"; $fs_url = "device/device=".$device['device_id']."/tab=health/metric=diskio/";
$graph_array_zoom['id'] = $drive['diskio_id']; $graph_array_zoom['id'] = $drive['diskio_id'];
$graph_array_zoom['type'] = "diskio_ops"; $graph_array_zoom['type'] = "diskio_ops";

View File

@@ -8,7 +8,7 @@ echo("<table width=100% cellpadding=6 cellspacing=0>");
$i = '1'; $i = '1';
foreach (dbFetchRows("SELECT * FROM `processors` WHERE device_id = ?", array($device['device_id'])) as $proc) foreach (dbFetchRows("SELECT * FROM `processors` WHERE device_id = ?", array($device['device_id'])) as $proc)
{ {
$proc_url = "device/".$device['device_id']."/health/processor/"; $proc_url = "device/device=".$device['device_id']."/tab=health/metric=processor/";
$mini_url = "graph.php?id=".$proc['processor_id']."&amp;type=".$graph_type."&amp;from=".$day."&amp;to=".$now."&amp;width=80&amp;height=20&amp;bg=f4f4f4"; $mini_url = "graph.php?id=".$proc['processor_id']."&amp;type=".$graph_type."&amp;from=".$day."&amp;to=".$now."&amp;width=80&amp;height=20&amp;bg=f4f4f4";

View File

@@ -25,7 +25,7 @@ foreach (dbFetchRows("SELECT * FROM `storage` WHERE device_id = ? ORDER BY stora
$total = formatStorage($total); $total = formatStorage($total);
$free = formatStorage($free); $free = formatStorage($free);
$fs_url = "device/".$device['device_id']."/health/storage/"; $fs_url = "device/device=".$device['device_id']."/tab=health/metric=storage/";
$fs_popup = "onmouseover=\"return overlib('<div class=list-large>".$device['hostname']." - ".$drive['storage_descr']; $fs_popup = "onmouseover=\"return overlib('<div class=list-large>".$device['hostname']." - ".$drive['storage_descr'];
$fs_popup .= "</div><img src=\'graph.php?id=" . $drive['storage_id'] . "&amp;type=".$graph_type."&amp;from=$month&amp;to=$now&amp;width=400&amp;height=125\'>"; $fs_popup .= "</div><img src=\'graph.php?id=" . $drive['storage_id'] . "&amp;type=".$graph_type."&amp;from=$month&amp;to=$now&amp;width=400&amp;height=125\'>";

View File

@@ -89,7 +89,7 @@ include("overview/sensors/frequencies.inc.php");
echo("<div style='background-color: #eeeeee; margin: 5px; padding: 5px;'>"); echo("<div style='background-color: #eeeeee; margin: 5px; padding: 5px;'>");
echo("<p style='padding: 0px 5px 5px;' class=sectionhead>"); echo("<p style='padding: 0px 5px 5px;' class=sectionhead>");
echo('<a class="sectionhead" href="device/'.$device['device_id'].'/events/">'); echo('<a class="sectionhead" href="device/device='.$device['device_id'].'/tab=events/">');
echo("<img align='absmiddle' src='images/16/report.png'> Recent Events</a></p>"); echo("<img align='absmiddle' src='images/16/report.png'> Recent Events</a></p>");
echo("<table cellspacing=0 cellpadding=2 width=100%>"); echo("<table cellspacing=0 cellpadding=2 width=100%>");

View File

@@ -5,7 +5,7 @@ $sensors = dbFetchRows("SELECT * FROM `sensors` WHERE `sensor_class` = ? AND dev
if (count($sensors)) if (count($sensors))
{ {
echo('<div style="background-color: #eeeeee; margin: 5px; padding: 5px;">'); echo('<div style="background-color: #eeeeee; margin: 5px; padding: 5px;">');
echo('<p style="padding: 0px 5px 5px;" class="sectionhead"><a class="sectionhead" href="device/'.$device['device_id'].'/health/' . strtolower($sensor_type) . '/"><img align="absmiddle" src="'.$config['base_url'].'/images/icons/' . strtolower($sensor_type) . '.png"> ' . $sensor_type . '</a></p>'); echo('<p style="padding: 0px 5px 5px;" class="sectionhead"><a class="sectionhead" href="device/device='.$device['device_id'].'/tab=health/metric=' . strtolower($sensor_type) . '/"><img align="absmiddle" src="'.$config['base_url'].'/images/icons/' . strtolower($sensor_type) . '.png"> ' . $sensor_type . '</a></p>');
$i = '1'; $i = '1';
echo('<table width="100%" valign="top">'); echo('<table width="100%" valign="top">');
foreach ($sensors as $sensor) foreach ($sensors as $sensor)

View File

@@ -8,7 +8,7 @@ if (count($mempools))
{ {
echo("<div style='background-color: #eeeeee; margin: 5px; padding: 5px;'>"); echo("<div style='background-color: #eeeeee; margin: 5px; padding: 5px;'>");
echo("<p style='padding: 0px 5px 5px;' class=sectionhead>"); echo("<p style='padding: 0px 5px 5px;' class=sectionhead>");
echo('<a class="sectionhead" href="device/'.$device['device_id'].'/health/mempool/">'); echo('<a class="sectionhead" href="device/device='.$device['device_id'].'/tab=health/metric=mempool/">');
echo("<img align='absmiddle' src='".$config['base_url']."/images/icons/memory.png'> Memory Pools</a></p>"); echo("<img align='absmiddle' src='".$config['base_url']."/images/icons/memory.png'> Memory Pools</a></p>");
echo("<table width=100% cellspacing=0 cellpadding=5>"); echo("<table width=100% cellspacing=0 cellpadding=5>");
$mempool_rows = '0'; $mempool_rows = '0';

View File

@@ -9,7 +9,7 @@ if (count($processors))
$processor_rows = 0; $processor_rows = 0;
echo("<div style='background-color: #eeeeee; margin: 5px; padding: 5px;'>"); echo("<div style='background-color: #eeeeee; margin: 5px; padding: 5px;'>");
echo("<p style='padding: 0px 5px 5px;' class=sectionhead>"); echo("<p style='padding: 0px 5px 5px;' class=sectionhead>");
echo('<a class="sectionhead" href="device/'.$device['device_id'].'/health/processor/">'); echo('<a class="sectionhead" href="device/device='.$device['device_id'].'/tab=health/metric=processor/">');
echo("<img align='absmiddle' src='".$config['base_url']."/images/icons/processor.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>"); echo("<table width=100% cellspacing=0 cellpadding=5>");

View File

@@ -8,7 +8,7 @@ if (count($drives))
{ {
echo("<div style='background-color: #eeeeee; margin: 5px; padding: 5px;'>"); echo("<div style='background-color: #eeeeee; margin: 5px; padding: 5px;'>");
echo("<p style='padding: 0px 5px 5px;' class=sectionhead>"); echo("<p style='padding: 0px 5px 5px;' class=sectionhead>");
echo('<a class="sectionhead" href="device/'.$device['device_id'].'/health/storage/">'); echo('<a class="sectionhead" href="device/device='.$device['device_id'].'/tab=health/metric=storage/">');
echo("<img align='absmiddle' src='".$config['base_url']."/images/icons/storage.png'> Storage</a></p>"); echo("<img align='absmiddle' src='".$config['base_url']."/images/icons/storage.png'> Storage</a></p>");
echo("<table width=100% cellspacing=0 cellpadding=5>"); echo("<table width=100% cellspacing=0 cellpadding=5>");
$drive_rows = '0'; $drive_rows = '0';

View File

@@ -2,6 +2,8 @@
include("includes/geshi/geshi.php"); include("includes/geshi/geshi.php");
# FIXME svn stuff still using optc etc, won't work, needs updating!
if ($_SESSION['userlevel'] >= "7") if ($_SESSION['userlevel'] >= "7")
{ {
@@ -21,10 +23,10 @@ if ($_SESSION['userlevel'] >= "7")
if (!$_GET['optc']) { if (!$_GET['optc']) {
echo('<span class="pagemenu-selected">'); echo('<span class="pagemenu-selected">');
echo("<a href='device/".$device['device_id']."/showconfig/'> Latest</a>"); echo("<a href='device/device=".$device['device_id']."/showconfig/'> Latest</a>");
echo("</span>"); echo("</span>");
} else { } else {
echo("<a href='device/".$device['device_id']."/showconfig/'> Latest</a>"); echo("<a href='device/device=".$device['device_id']."/showconfig/'> Latest</a>");
} }
if (function_exists('svn_log')) { if (function_exists('svn_log')) {
@@ -40,7 +42,7 @@ if ($_SESSION['userlevel'] >= "7")
if ($_GET['optc'] == $svnlog["rev"]) { echo('<span class="pagemenu-selected">'); } if ($_GET['optc'] == $svnlog["rev"]) { echo('<span class="pagemenu-selected">'); }
echo("<a href='device/".$device['device_id']."/showconfig/" . $svnlog["rev"] . "/'> r" . $svnlog["rev"] ." <small>". date("d M H:i", strtotime($svnlog["date"])) . "</small></a>"); echo("<a href='device/device=".$device['device_id']."/showconfig/" . $svnlog["rev"] . "/'> r" . $svnlog["rev"] ." <small>". date("d M H:i", strtotime($svnlog["date"])) . "</small></a>");
if ($_GET['optc'] == $svnlog["rev"]) { echo("</span>"); } if ($_GET['optc'] == $svnlog["rev"]) { echo("</span>"); }
$sep = " | "; $sep = " | ";