clones/librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-09-22 19:08:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

cosmetic changes to search. add starter to optionbar for health/search/services and fix routing link on menubar

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2207 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong 2011-04-29 23:09:35 +00:00
parent 8e8a43f811
commit a6a09b31b9
7 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
html/includes/print-menubar.php
View File

@ -310,7 +310,7 @@ if ($_SESSION['userlevel'] >= '5')
?>
<li><a class="menu2four" href=""><img src="images/16/find.png" border="0" align="absmiddle" /> Search
<li><a class="menu2four" href="search/"><img src="images/16/find.png" border="0" align="absmiddle" /> Search
<!--[if IE 7]><!--></a><!--<![endif]-->
<table><tr><td>
<ul>

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

@ -28,6 +28,8 @@ if (!$_GET['optb']) { $_GET['optb'] = "nographs"; }
print_optionbar_start('', '');
echo('<span style="font-weight: bold;">Health</span> &#187; ');
$sep = "";
foreach ($datas as $texttype)
{

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

@ -6,6 +6,8 @@ if (!$_GET['opta']) { $_GET['opta'] = "ipv4"; }
print_optionbar_start('', '');
echo('<span style="font-weight: bold;">Search</span> &#187; ');
unset($sep);
foreach ($sections as $type => $texttype)
{

8
html/pages/search/ipv4.inc.php
View File

@ -38,7 +38,7 @@ while ($data = mysql_fetch_assoc($query))
print_optionbar_end();
echo('<table width="100%" cellspacing="0" cellpadding="2">');
echo('<table width="100%" cellspacing="0" cellpadding="5">');
if (is_numeric($_POST['device_id'])) { $where .= " AND I.device_id = '".$_POST['device_id']."'"; }
if ($_POST['interface']) { $where .= " AND I.ifDescr LIKE '".mres($_POST['interface'])."'"; }
@ -76,9 +76,11 @@ while ($interface = mysql_fetch_assoc($query))
if (port_permitted($interface['interface_id']))
{
$interface = ifLabel ($interface, $interface);
echo('<tr bgcolor="' . $row_colour . '">
<td class="list-bold">' . generate_device_link($interface) . '</td>
<td class="list-bold">' . generate_port_link($interface, makeshortif(fixifname($interface['ifDescr']))) . ' ' . $error_img . '</td>
<td class="list-bold">' . generate_port_link($interface) . ' ' . $error_img . '</td>
<td>' . $interface['ipv4_address'] . '/'.$length.'</td>
<td>' . $interface['ifAlias'] . "</td>
</tr>\n");
@ -92,4 +94,4 @@ while ($interface = mysql_fetch_assoc($query))
echo("</table>");
?>
?>

6
html/pages/search/ipv6.inc.php
View File

@ -38,7 +38,7 @@ while ($data = mysql_fetch_assoc($query))
print_optionbar_end();
echo('<table width="100%" cellspacing="0" cellpadding="2">');
echo('<table width="100%" cellspacing="0" cellpadding="5">');
if (is_numeric($_POST['device_id'])) { $where .= " AND I.device_id = '".$_POST['device_id']."'"; }
if ($_POST['interface']) { $where .= " AND I.ifDescr LIKE '".mres($_POST['interface'])."'"; }
@ -76,6 +76,8 @@ while ($interface = mysql_fetch_assoc($query))
if (port_permitted($interface['interface_id']))
{
$interface = ifLabel ($interface, $interface);
echo('<tr bgcolor="' . $row_colour . '">
<td class="list-bold">' . generate_device_link($interface) . '</td>
<td class="list-bold">' . generate_port_link($interface, makeshortif(fixifname($interface['ifDescr']))) . ' ' . $error_img . '</td>
@ -92,4 +94,4 @@ while ($interface = mysql_fetch_assoc($query))
echo("</table>");
?>
?>

4
html/pages/search/mac.inc.php
View File

@ -38,7 +38,7 @@ while ($data = mysql_fetch_assoc($query))
print_optionbar_end();
echo('<table width="100%" cellspacing="0" cellpadding="2">');
echo('<table width="100%" cellspacing="0" cellpadding="5">');
$where = "AND `ifPhysAddress` LIKE '%".$_POST['address']."%'";
if (is_numeric($_POST['device_id'])) { $where .= " AND I.device_id = '".$_POST['device_id']."'"; }
@ -67,6 +67,8 @@ while ($entry = mysql_fetch_assoc($query))
if (port_permitted($entry['interface_id']))
{
$interface = ifLabel ($interface, $interface);
echo('<tr bgcolor="' . $row_colour . '">
<td class="list-bold">' . generate_device_link($entry) . '</td>
<td class="list-bold">' . generate_port_link($entry, makeshortif(fixifname($entry['ifDescr']))) . ' ' . $error_img . '</td>

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

@ -1,5 +1,7 @@
<?php print_optionbar_start();
echo('<span style="font-weight: bold;">Services</span> &#187; ');
$menu_options = array('basic' => 'Basic',
'details' => 'Details');