Actions back to the left. (By popular demand.)

2 files changed, 31 insertions, 32 deletions

diff --git a/src/usr/local/www/diag_logs_filter.php b/src/usr/local/www/diag_logs_filter.php
index 9f6bb27..46ec120 100644
--- a/src/usr/local/www/diag_logs_filter.php
+++ b/src/usr/local/www/diag_logs_filter.php
@@ -367,6 +367,7 @@ if (!isset($config['syslog']['rawfilter'])) {
 	   <div class="table-responsive">
 		<table class="table table striped table-hover table-compact">
 			<tr>
+				<th><?=gettext("Act")?></th>
 				<th><?=gettext("Time")?></th>
 				<th><?=gettext("IF")?></th>
 <?php
@@ -381,7 +382,6 @@ if (!isset($config['syslog']['rawfilter'])) {
 				<th><?=gettext("Source")?></th>
 				<th><?=gettext("Destination")?></th>
 				<th><?=gettext("Proto")?></th>
-				<th><?=gettext("Act")?></th>
 			</tr>
 <?php
 	if ($config['syslog']['filterdescriptions'])
@@ -391,6 +391,24 @@ if (!isset($config['syslog']['rawfilter'])) {
 ?>
 			<tr>
 				<td>
+<?php
+		if ($filterent['act'] == "block") {
+?>
+					<i  class="fa fa-times icon-danger icon-pointer" title="<?php echo $filterent['act'] .'/'. $filterent['tracker'];?>" onclick="javascript:getURL('diag_logs_filter.php?getrulenum=<?="{$filterent['rulenum']},{$filterent['tracker']},{$filterent['act']}"; ?>', outputrule);"></i>
+<?php
+		 }
+		 else {
+?>
+					<i class="fa fa-check icon-success icon-pointer" title="<?php echo $filterent['act'] .'/'. $filterent['tracker'];?>" onclick="javascript:getURL('diag_logs_filter.php?getrulenum=<?="{$filterent['rulenum']},{$filterent['tracker']},{$filterent['act']}"; ?>', outputrule);"></i>
+<?php
+		}
+?>
+<?php
+		if ($filterent['count'])
+			echo $filterent['count'];
+?>
+				</td>
+				<td>
 					<?=htmlspecialchars($filterent['time'])?>
 				</td>
 				<td>
@@ -449,25 +467,6 @@ if (!isset($config['syslog']['rawfilter'])) {
 				<td>
 					<?=htmlspecialchars($filterent['proto'])?>
 				</td>
-
-				<td>
-<?php
-		if ($filterent['act'] == "block") {
-?>
-					<i  class="fa fa-times icon-danger icon-pointer" title="<?php echo $filterent['act'] .'/'. $filterent['tracker'];?>" onclick="javascript:getURL('diag_logs_filter.php?getrulenum=<?="{$filterent['rulenum']},{$filterent['tracker']},{$filterent['act']}"; ?>', outputrule);"></i>
-<?php
-		 }
-		 else {
-?>
-					<i class="fa fa-check icon-success icon-pointer" title="<?php echo $filterent['act'] .'/'. $filterent['tracker'];?>" onclick="javascript:getURL('diag_logs_filter.php?getrulenum=<?="{$filterent['rulenum']},{$filterent['tracker']},{$filterent['act']}"; ?>', outputrule);"></i>
-<?php
-		}
-?>
-<?php
-		if ($filterent['count'])
-			echo $filterent['count'];
-?>
-				</td>
 			</tr>
 <?php
 		if (isset($config['syslog']['filterdescriptions']) && $config['syslog']['filterdescriptions'] === "2") {
diff --git a/src/usr/local/www/diag_logs_filter_dynamic.php b/src/usr/local/www/diag_logs_filter_dynamic.php
index 2c4d7b3..272788e 100755
--- a/src/usr/local/www/diag_logs_filter_dynamic.php
+++ b/src/usr/local/www/diag_logs_filter_dynamic.php
@@ -355,12 +355,12 @@ display_top_tabs($tab_array, false, 'nav nav-tabs');
 			<table class="table table-striped table-hover table-condensed">
 				<thead>
 					<tr>
+						<th><?=gettext("Act")?></th>
 						<th><?=gettext("Time")?></th>
 						<th><?=gettext("IF")?></th>
 						<th><?=gettext("Source")?></th>
 						<th><?=gettext("Destination")?></th>
 						<th><?=gettext("Proto")?></th>
-						<th><?=gettext("Act")?></th> <!-- For the "Block" buttons-->
 					</tr>
 				</thead>
 				<tbody id="filter-log-entries">
@@ -390,17 +390,6 @@ display_top_tabs($tab_array, false, 'nav nav-tabs');
 						$dstPort = "";
 ?>
 					<tr>
-						<td><?=htmlspecialchars($filterent['time'])?></td>
-						<td><?=htmlspecialchars($filterent['interface'])?></td>
-						<td><?=$srcIP . $srcPort?></td>
-						<td><?=$dstIP . $dstPort?></td>
-<?php
-						if ($filterent['proto'] == "TCP") {
-							$filterent['proto'] .= ":{$filterent['tcpflags']}";
-							$tcpcnt++;
-						}
-?>
-						<td><?=htmlspecialchars($filterent['proto'])?></td>
 						<td>
 <?php
 		if ($filterent['act'] == "block") {
@@ -416,6 +405,17 @@ display_top_tabs($tab_array, false, 'nav nav-tabs');
 ?>
 
 						</td>
+						<td><?=htmlspecialchars($filterent['time'])?></td>
+						<td><?=htmlspecialchars($filterent['interface'])?></td>
+						<td><?=$srcIP . $srcPort?></td>
+						<td><?=$dstIP . $dstPort?></td>
+<?php
+						if ($filterent['proto'] == "TCP") {
+							$filterent['proto'] .= ":{$filterent['tcpflags']}";
+							$tcpcnt++;
+						}
+?>
+						<td><?=htmlspecialchars($filterent['proto'])?></td>
 					</tr>
 <?php
 				} // e-o-foreach()