make sensor_type larger, merge both logs into one tab (ran out of space!)

git-svn-id: http://www.observium.org/svn/observer/trunk@2719 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-11-07 19:39:15 +00:00
parent 9891f0201b
commit 86248c8bce
9 changed files with 56 additions and 41 deletions

View File

@@ -222,22 +222,13 @@ if (device_permitted($vars['device']) || $check_device == $vars['device'])
if (device_permitted($device['device_id']))
{
echo('<li class="' . $select['events'] . '">
<a href="'.generate_device_url($device, array('tab' => 'events')).'">
<img src="images/16/report_magnify.png" align="absmiddle" border="0" /> Events
echo('<li class="' . $select['logs'] . '">
<a href="'.generate_device_url($device, array('tab' => 'logs')).'">
<img src="images/16/report_magnify.png" align="absmiddle" border="0" /> Logs
</a>
</li>');
}
if ($config['enable_syslog'])
{
echo('<li class="' . $select['syslog'] . '">
<a href="'.generate_device_url($device, array('tab' => 'syslog')).'">
<img src="images/16/printer.png" align="absmiddle" border="0" /> Syslog
</a>
</li>');
}
if ($_SESSION['userlevel'] >= "7")
{
if (!is_array($config['rancid_configs'])) { $config['rancid_configs'] = array($config['rancid_configs']); }

View File

@@ -1,15 +0,0 @@
<?php
$entries = dbFetchRows("SELECT *,DATE_FORMAT(datetime, '%D %b %Y %T') as humandate FROM `eventlog` WHERE `host` = ? ORDER BY `datetime` DESC LIMIT 0,250", array($device['device_id']));
echo('<table cellspacing="0" cellpadding="2" width="100%">');
foreach ($entries as $entry)
{
include("includes/print-event.inc.php");
}
echo('</table>');
$pagetitle[] = "Events";
?>

View File

@@ -0,0 +1,41 @@
<hr />
<form method="post" action="">
<label><strong>Search</strong>
<input type="text" name="string" id="string" value="<?php echo($_POST['string']); ?>" />
</label>
<label>
<strong>Type</strong>
<select name="type" id="type">
<option value="">All Types</option>
<option value="system">System</option>
<?php
foreach (dbFetchRows("SELECT `type` FROM `eventlog` WHERE device_id = ? GROUP BY `type` ORDER BY `type`", array($device['device_id'])) as $data)
{
echo("<option value='".$data['type']."'");
if ($data['type'] == $_POST['type']) { echo("selected"); }
echo(">".$data['type']."</option>");
}
?>
</select>
</label>
<input class=submit type=submit value=Search>
</form>
<?php
print_optionbar_end();
$entries = dbFetchRows("SELECT *,DATE_FORMAT(datetime, '%D %b %Y %T') as humandate FROM `eventlog` WHERE `host` = ? ORDER BY `datetime` DESC LIMIT 0,250", array($device['device_id']));
echo('<table cellspacing="0" cellpadding="2" width="100%">');
foreach ($entries as $entry)
{
include("includes/print-event.inc.php");
}
echo('</table>');
$pagetitle[] = "Events";
?>

View File

@@ -1,8 +1,5 @@
<?php
print_optionbar_start('25');
?>
<hr />
<form method="post" action="">
<label><strong>Search</strong>