Fixed #5395

2 files changed, 20 insertions, 8 deletions

diff --git a/src/usr/local/www/diag_logs.php b/src/usr/local/www/diag_logs.php
index 1e7ce2b..0800456 100755
--- a/src/usr/local/www/diag_logs.php
+++ b/src/usr/local/www/diag_logs.php
@@ -172,18 +172,29 @@ if ($logfile == 'dhcpd')
 
 <div class="panel panel-default">
 	<div class="panel-heading"><h2 class="panel-title"><?=gettext("Last ")?><?=$nentries?> <?=$logfile?><?=gettext(" log entries")?></h2></div>
-	<pre><?php
+	<div class="table table-responsive">
+		<table class="table table-striped table-hover">
+			<thead>
+				<tr>
+					<th class="col-sm-2"></th>
+					<th></th>
+				</tr>
+			</thead>
+			<tbody>
+<?php
 	if (($logfile == 'resolver') || ($logfile == 'system'))
 		$inverse = array("ppp");
 	else
 		$inverse = null;
 
 	if ($filtertext)
-		dump_clog_no_table($system_logfile, $nentries, true, array("$filtertext"), $inverse);
+		dump_clog($system_logfile, $nentries, true, array("$filtertext"), $inverse);
 	else
-		dump_clog_no_table($system_logfile, $nentries, true, array(), $inverse);
+		dump_clog($system_logfile, $nentries, true, array(), $inverse);
 ?>
-	</pre>
+			</tbody>
+		</table>
+	</div>
 </div>
 
 <?php include("foot.inc"); ?>
diff --git a/src/usr/local/www/guiconfig.inc b/src/usr/local/www/guiconfig.inc
index 2d29550..363395a 100644
--- a/src/usr/local/www/guiconfig.inc
+++ b/src/usr/local/www/guiconfig.inc
@@ -687,9 +687,10 @@ function dump_clog($logfile, $tail, $withorig = true, $grepfor = "", $grepinvert
 			}
 		}
 	}
+
 	foreach ($logarr as $logent) {
 		$logent = preg_split("/\s+/", $logent, 6);
-		echo "<tr valign=\"top\">\n";
+		echo "<tr>\n";
 		if ($withorig) {
 			if (isset($config['system']['usefifolog'])) {
 				$entry_date_time = htmlspecialchars(date("F j, Y, g:i a", "" . $logent[1] . ""));
@@ -699,10 +700,10 @@ function dump_clog($logfile, $tail, $withorig = true, $grepfor = "", $grepinvert
 				$entry_text = ($logent[3] == $config['system']['hostname']) ? "" : $logent[3] . " ";
 				$entry_text .= htmlspecialchars($logent[4] . " " . $logent[5]);
 			}
-			echo "<td class=\"listlr nowrap\">{$entry_date_time}</td>\n";
-			echo "<td class=\"listr\">{$entry_text}</td>\n";
+			echo "<td>{$entry_date_time}</td>\n";
+			echo "<td>{$entry_text}</td>\n";
 		} else {
-				echo "<td class=\"listlr\" colspan=\"2\">" . htmlspecialchars($logent[5]) . "</td>\n";
+				echo "<td>" . htmlspecialchars($logent[5]) . "</td>\n";
 		}
 		echo "</tr>\n";
 	}