Merge pull request #132 from laf/issue-124

Tidied up eventlog on various pages to use bootstrap
This commit is contained in:
Paul Gear
2014-03-02 13:42:47 +10:00
4 changed files with 34 additions and 11 deletions

View File

@ -7,14 +7,14 @@ unset($icon);
$icon = geteventicon($entry['message']);
if ($icon) { $icon = '<img src="images/16/' . $icon . '" />'; }
echo('<tr class="eventlog">
<td class="syslog" width="160">
echo('<tr>
<td>
' . $entry['datetime'] . '
</td>');
if (!isset($vars['device'])) {
$dev = device_by_id_cache($entry['host']);
echo("<td class=list-bold width=150>
echo("<td>
" . generate_device_link($dev, shorthost($dev['hostname'])) . "
</td>");
}

View File

@ -27,14 +27,20 @@
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%">');
echo(' <div class="panel panel-default panel-condensed">
<div class="panel-heading">
<strong>Eventlog entries</strong>
</div>
<table class="table table-hover table-condensed table-striped">');
foreach ($entries as $entry)
{
include("includes/print-event.inc.php");
}
echo('</table>');
echo(' </table>
</div>');
$pagetitle[] = "Events";

View File

@ -75,13 +75,18 @@ if ($_SESSION['userlevel'] >= '5')
$param[] = $_SESSION['user_id'];
}
echo('<table class="table table-condensed">');
echo('<div class="panel panel-default panel-condensed">
<div class="panel-heading">
<strong>Eventlog entries</strong>
</div>
<table class="table table-hover table-condensed table-striped">');
foreach (dbFetchRows($query, $param) as $entry)
{
include("includes/print-event.inc.php");
}
echo("</table>");
echo("</table>
</div>");
?>

View File

@ -152,9 +152,6 @@ if ($config['enable_syslog'])
echo("</div>");
} else {
echo("<div class=front-eventlog>
<h3>Recent Eventlog Entries</h3>
");
if ($_SESSION['userlevel'] == '10')
{
@ -166,7 +163,19 @@ if ($config['enable_syslog'])
$data = mysql_query($query);
echo('<table class="table table-bordered">');
echo('<div class="container-fluid">
<div class="row">
<div class="col-md-12">
&nbsp;
</div>
</row>
<row>
<div class="col-md-12">
<div class="panel panel-default panel-condensed">
<div class="panel-heading">
<strong>Eventlog entries</strong>
</div>
<table class="table table-hover table-condensed table-striped">');
while ($entry = mysql_fetch_assoc($data)) {
include("includes/print-event.inc.php");
@ -174,6 +183,9 @@ if ($config['enable_syslog'])
echo("</table>");
echo("</div>");
echo("</div>");
echo("</div>");
echo("</div>");
}
echo("</div>");