Perform table striping via jquery function so that it is correct after selection/de-selection and after re-ordering

1 files changed, 15 insertions, 5 deletions

diff --git a/src/usr/local/www/firewall_rules.php b/src/usr/local/www/firewall_rules.php
index c8ca58f..066d2b9 100644
--- a/src/usr/local/www/firewall_rules.php
+++ b/src/usr/local/www/firewall_rules.php
@@ -266,7 +266,7 @@ display_top_tabs($tab_array);
 	<div class="panel panel-default">
 		<div class="panel-heading"><?=gettext("Rules (Drag to change order)")?></div>
 		<div id="mainarea" class="table-responsive panel-body">
-			<table class="table table-striped table-hover table-condensed">
+			<table name="ruletable" class="table table-hover table-condensed">
 				<thead>
 					<tr>
 						<th><!-- checkbox --></th>
@@ -304,7 +304,7 @@ display_top_tabs($tab_array);
 						<td></td>
 						<td><?=gettext("Anti-Lockout Rule");?></td>
 						<td>
-							<a href="system_advanced_admin.php" class="fa fa-pencil" title="<?=gettext("Edit");?>"></a>
+							<a href="system_advanced_admin.php" class="fa fa-cog" title="<?=gettext("Settings");?>"></a>
 						</td>
 					</tr>
 <?php endif;?>
@@ -322,7 +322,7 @@ display_top_tabs($tab_array);
 						<td></td>
 						<td><?=gettext("Block private networks");?></td>
 						<td>
-							<a href="interfaces.php?if=<?=htmlspecialchars($if)?>" class="fa fa-pencil" title="<?=gettext("Edit rule");?>"></a>
+							<a href="interfaces.php?if=<?=htmlspecialchars($if)?>" class="fa fa-cog" title="<?=gettext("Settings");?>"></a>
 						</td>
 					</tr>
 <?php endif;?>
@@ -340,7 +340,7 @@ display_top_tabs($tab_array);
 						<td>*</td>
 						<td><?=gettext("Block bogon networks");?></td>
 						<td>
-							<a href="interfaces.php?if=<?=htmlspecialchars($if)?>" class="fa fa-pencil" title="<?=gettext("Edit");?>"></a>
+							<a href="interfaces.php?if=<?=htmlspecialchars($if)?>" class="fa fa-cog" title="<?=gettext("Settings");?>"></a>
 						</td>
 					</tr>
 <?php endif;?>
@@ -689,6 +689,11 @@ else
 ?>
 
 <script>
+function stripe_table() {
+	$("tr:odd").addClass('active');
+	$("tr:even").removeClass('active');
+}
+
 function fr_toggle(id, prefix) {
 	if (!prefix)
 		prefix = 'fr';
@@ -711,19 +716,24 @@ function fr_bgcolor(id, prefix) {
 		row.removeClass('active');
 	} else {
 		row.css("background-color", "#FFFFFF");
-		$("tr:odd").addClass('active');
+		stripe_table();
 	}
 }
 
 </script>
 
 <script>
+
 events.push(function() {
+
+	stripe_table();
+
 	// Make rules sortable
 	$('table tbody.user-entries').sortable({
 		cursor: 'grabbing',
 		update: function(event, ui) {
 			$('#order-store').removeAttr('disabled');
+			stripe_table();
 		}
 	});