mirror of
https://github.com/librenms/librenms.git
synced 2024-10-07 16:52:45 +00:00
fix fabric graph overlib descr and vlan output
git-svn-id: http://www.observium.org/svn/observer/trunk@2734 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
@@ -10,6 +10,7 @@ echo("<td class=list-bold>");
|
||||
|
||||
foreach (dbFetchRows("SELECT * FROM ports WHERE `device_id` = ? AND `ifVlan` = ?", array($device['device_id'], $vlan['vlan_vlan'])) as $port)
|
||||
{
|
||||
$port = ifLabel($port, $device);
|
||||
if ($vars['view'] == "graphs")
|
||||
{
|
||||
echo("<div style='display: block; padding: 2px; margin: 2px; min-width: 139px; max-width:139px; min-height:85px; max-height:85px; text-align: center; float: left; background-color: ".$list_colour_b_b.";'>
|
||||
@@ -26,7 +27,7 @@ foreach (dbFetchRows("SELECT * FROM ports WHERE `device_id` = ? AND `ifVlan` = ?
|
||||
}
|
||||
else
|
||||
{
|
||||
echo($vlan['port_sep'] . generate_port_link($port, makeshortif(ifnamedescr($port))));
|
||||
echo($vlan['port_sep'] . generate_port_link($port, makeshortif($port['label']));
|
||||
$vlan['port_sep'] = ", ";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -52,6 +52,8 @@ foreach($entity_state['group']['c6kxbar'] as $index => $entry)
|
||||
unset($link_array['height'], $link_array['width'], $link_array['legend']);
|
||||
$link = generate_url($link_array);
|
||||
|
||||
$text_descr = $entity['entPhysicalName'] . " - Fabric " . $subindex;
|
||||
|
||||
$overlib_content = generate_overlib_content($graph_array, $device['hostname'] . " - " . $text_descr);
|
||||
|
||||
$graph_array['width'] = 80; $graph_array['height'] = 20; $graph_array['bg'] = $graph_colour;
|
||||
|
||||
Reference in New Issue
Block a user