mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

location to listview from falz

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2110 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-04-20 16:47:36 +00:00
parent 4d55d5405c
commit 30b2918858
2 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
html/includes/hostbox.inc.php
View File

@@ -22,31 +22,25 @@ echo(' <tr background="'.$bg_image.'" bgcolor="' . $bg . '" onmouseover="this.s
onclick="location.href=\'device/'.$device['device_id'].'/\'" style="cursor: pointer;">
<td width="40" align="center" valign="middle">' . $image . '</td>
<td width="300"><span style="font-weight: bold; font-size: 14px;">' . generate_device_link($device) . '</span>
<br />' . $device['sysName'] . '</td>
<td width=55>');
<br />' . $device['sysName'] . '</td>'
);
echo ('<td width="55">');
if ($port_count) { echo(' <img src="images/icons/port.png" align=absmiddle /> '.$port_count); }
echo('<br />');
if ($sensor_count) { echo(' <img src="images/icons/sensors.png" align=absmiddle /> '.$sensor_count); }
echo ('</td>');
echo(' </td>
<td width="200">' . $device['os_text'] . '<br />
' . $device['version'] . '</td>
<td width="200">' . $device['hardware'] . '<br />
' . $device['features'] . '</td>
<td>' . formatUptime($device['uptime']) . '
<br />');
if (get_dev_attrib($device,'override_sysLocation_bool'))
{
echo(get_dev_attrib($device,'override_sysLocation_string'));
}
else
{
echo($device['location']);
}
echo('</td>
<td width="10">
</td>
</tr>');
echo(' <td>' . $device['hardware'] . '<br />' . $device['features'] . '</td>');
echo(' <td>' . $device['os_text'] . '<br />' . $device['version'] . '</td>');
echo(' <td>' . formatUptime($device['uptime']) . ' <br /></td>');
$location = $device['location'];
if (get_dev_attrib($device,'override_sysLocation_bool')) { $location = get_dev_attrib($device,'override_sysLocation_string'); }
echo(' <td>' . $location . '<br /></td>');
echo (' </tr>');
?>

2
html/pages/devices.inc.php
View File

@@ -121,7 +121,7 @@ if ($_GET['status'] == "alerted")
}
echo('<table cellpadding="7" cellspacing="0" class="devicetable sortable" width="100%">
<tr class="tablehead"><th></th><th>Device</th><th></th><th>Operating System</th><th>Platform</th><th>Uptime</th></tr>');
<tr class="tablehead"><th></th><th>Device</th><th></th><th>Operating System</th><th>Platform</th><th>Uptime</th><th>Location</th></tr>');
$device_query = mysql_query($sql);
while ($device = mysql_fetch_assoc($device_query))