prettier device page (maybe not, bu tnow matches device box)

git-svn-id: http://www.observium.org/svn/observer/trunk@2126 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-04-21 12:59:44 +00:00
parent 73e9c628e6
commit 65e030e0fa
3 changed files with 29 additions and 13 deletions

View File

@@ -1,21 +1,36 @@
<?php
if ($device['status'] == '0') { $class = "list-device-down"; } else { $class = "list-device"; }
if ($device['ignore'] == '1') {
$class = "list-device-ignored";
if ($device['status'] == '1') { $class = "list-device-ignored-up"; }
}
if ($device['status'] == '0')
{
$class = "list-device-down";
} else {
$class = "list-device";
}
if ($device['ignore'] == '1')
{
$class = "list-device-ignored";
if ($device['status'] == '1')
{
$class = "list-device-ignored-up";
}
}
if ($device['disabled'] == '1')
{
$class = "list-device-disabled";
}
$type = strtolower($device['os']);
unset($image);
$image = getImage($device['device_id']);
echo("
<tr bgcolor=$device_colour>
<td width='40' align=center valign=middle>$image</td>
<td valign=middle><span style='font-weight: bold; font-size: 20px;'>" . generate_device_link($device) . "</span>
<br />" . $device['location'] . "</td>
echo('
<tr bgcolor="'.$device_colour.'" class="'.$class.'">
<td width="40" align=center valign=middle>'.$image.'</td>
<td valign=middle><span style="font-weight: bold; font-size: 20px;">' . generate_device_link($device) . '</span>
<br />' . $device['location'] . '</td>
<td></td>
</tr>");
</tr>');
?>

View File

@@ -24,7 +24,8 @@ if (device_permitted($_GET['id']) || $check_device == $_GET['id'])
$device = device_by_id_cache($_GET['id']);
if ($config['os'][$device['os']]['group']) { $device['os_group'] = $config['os'][$device['os']]['group']; }
echo('<table cellpadding="15" cellspacing="0" class="devicetable" width="100%">');
echo('<table style="margin: 0px 7px 7px 7px;" cellpadding="15" cellspacing="0" class="devicetable" width="99%">');
#include("includes/hostbox.inc.php");
include("includes/device-header.inc.php");
echo('</table>');

View File

@@ -166,7 +166,7 @@ $config['bad_if'] = array("voip-null", "virtual-", "unrouted", "eobc", "mpls", "
"-atm layer", "-atm subif", "-shdsl", "-aal5", "-atm", "container",
"async", "plip", "-physical", "-signalling", "container", "unrouted",
"bri", "-bearer", "bluetooth", "isatap", "ras", "qos", "miniport", "sonet/sdh",
"span rp", "span sp", "sslvpn");
"span rp", "span sp", "sslvpn", "pppoe-");
$config['bad_if_regexp'] = array("/serial[0-9]:/", "/^ng[0-9]+$/", "/^sl[0-9]/");