make sensor_type larger, merge both logs into one tab (ran out of space!)

git-svn-id: http://www.observium.org/svn/observer/trunk@2719 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-11-07 19:39:15 +00:00
parent 9891f0201b
commit 86248c8bce
9 changed files with 56 additions and 41 deletions
+4 -3
View File
@@ -15,7 +15,7 @@ echo('<tr style="background-color: ' . $bg . '">
' . $entry['datetime'] . '
</td>');
if (!isset($_GET['id']) && (!isset($overview) || $overview == 0)) {
if (!isset($vars['device'])) {
$dev = device_by_id_cache($entry['host']);
echo("<td class=list-bold width=150>
" . generate_device_link($dev, shorthost($dev['hostname'])) . "
@@ -24,7 +24,8 @@ if (!isset($_GET['id']) && (!isset($overview) || $overview == 0)) {
if ($entry['type'] == "interface")
{
$entry['link'] = "<b>".generate_port_link(getifbyid($entry['reference']))."</b>";
$this_if = ifLabel(getifbyid($entry['reference']));
$entry['link'] = "<b>".generate_port_link($this_if, makeshortif(strtolower($this_if['label'])))."</b>";
} else {
$entry['link'] = "System";
}
@@ -34,4 +35,4 @@ echo("<td>".$entry['link']."</td>");
echo("<td>".htmlspecialchars($entry['message']) . "</td>
</tr>");
?>
?>
+1 -2
View File
@@ -10,14 +10,13 @@ if (device_permitted($entry['device_id']))
$entry['hostname'] = shorthost($entry['hostname'], 20);
if ($_GET['page'] != "device")
if ($vars['page'] != "device")
{
echo("<td class=syslog width=140>" . $entry['date'] . "</td>");
echo("<td width=160><strong>".generate_device_link($entry)."</strong></td>");
echo("<td class=syslog><strong>" . $entry['program'] . " : </strong> " . htmlspecialchars($entry['msg']) . "</td>");
} else {
echo("<td class=syslog><i>" . $entry['date'] . "</i>&nbsp;&nbsp;&nbsp;<strong>" . $entry['program'] . "</strong>&nbsp;&nbsp;&nbsp;" . htmlspecialchars($entry['msg']) . "</td>");
}
echo("</tr>");