nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-30 16:14:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix fabric graph overlib descr and vlan output

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2734 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-11-23 12:53:24 +00:00
parent 69a849c3f0
commit 2237a6ff62
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/includes/print-vlan.inc.php
+2 -1
View File
@@ -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) 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") 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.";'> 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 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'] = ", "; $vlan['port_sep'] = ", ";
} }
} }
html/pages/device/overview/c6kxbar.inc.php
+2
View File
@@ -52,6 +52,8 @@ foreach($entity_state['group']['c6kxbar'] as $index => $entry)
unset($link_array['height'], $link_array['width'], $link_array['legend']); unset($link_array['height'], $link_array['width'], $link_array['legend']);
$link = generate_url($link_array); $link = generate_url($link_array);
$text_descr = $entity['entPhysicalName'] . " - Fabric " . $subindex;
$overlib_content = generate_overlib_content($graph_array, $device['hostname'] . " - " . $text_descr); $overlib_content = generate_overlib_content($graph_array, $device['hostname'] . " - " . $text_descr);
$graph_array['width'] = 80; $graph_array['height'] = 20; $graph_array['bg'] = $graph_colour; $graph_array['width'] = 80; $graph_array['height'] = 20; $graph_array['bg'] = $graph_colour;