Turn common tabular data areas into sortable items. Revert the sortable.js change that used tabcont and change back to sortable

9 files changed, 49 insertions, 43 deletions

diff --git a/usr/local/www/carp_status.php b/usr/local/www/carp_status.php
index e26ea27..c4d9477 100755
--- a/usr/local/www/carp_status.php
+++ b/usr/local/www/carp_status.php
@@ -99,7 +99,7 @@ include("head.inc");
 ?>
 
 			<p>
-			<table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0">
+			<table class="tabcont sortable" width="100%" border="0" cellpadding="6" cellspacing="0">
 				<tr>
 					<td class="listhdrr"><b><center>Carp Interface</center></b></td>
 					<td class="listhdrr"><b><center>Virtual IP</center></b></td>
diff --git a/usr/local/www/diag_arp.php b/usr/local/www/diag_arp.php
index 2588bae..4b07f8b 100755
--- a/usr/local/www/diag_arp.php
+++ b/usr/local/www/diag_arp.php
@@ -244,7 +244,7 @@ include("head.inc");
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
         <tr>
                 <td>
-<table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
+<table class="tabcont sortable" width="100%" border="0" cellpadding="0" cellspacing="0">
   <tr>
     <td class="listhdrr">IP address</td>
     <td class="listhdrr">MAC address</td>
diff --git a/usr/local/www/diag_dhcp_leases.php b/usr/local/www/diag_dhcp_leases.php
index 0233e95..c79f309 100755
--- a/usr/local/www/diag_dhcp_leases.php
+++ b/usr/local/www/diag_dhcp_leases.php
@@ -278,7 +278,7 @@ if ($_GET['order'])
 /* only print pool status when we have one */
 if(count($pools) > 0) {
 ?>
-<table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
+<table class="tabcont sortable" width="100%" border="0" cellpadding="0" cellspacing="0">
   <tr>
     <td class="listhdrr">Failover Group</a></td>
     <td class="listhdrr">My State</a></td>
diff --git a/usr/local/www/diag_dump_states.php b/usr/local/www/diag_dump_states.php
index aa8fef0..6c56b2f 100755
--- a/usr/local/www/diag_dump_states.php
+++ b/usr/local/www/diag_dump_states.php
@@ -122,7 +122,7 @@ include("head.inc");
 	$current_statecount=`pfctl -si | grep "current entries" | awk '{ print $3 }'`;
 ?>
 
-<table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0">
+<table class="tabcont sortable" width="100%" border="0" cellspacing="0" cellpadding="0">
 	<tr>
 		<td>
 			<form action="<?=$_SERVER['SCRIPT_NAME'];?>" method="get">
diff --git a/usr/local/www/status_gateways.php b/usr/local/www/status_gateways.php
index 048c901..e8b0702 100755
--- a/usr/local/www/status_gateways.php
+++ b/usr/local/www/status_gateways.php
@@ -66,7 +66,7 @@ include("head.inc");
   <tr>
     <td>
 	<div id="mainarea">
-              <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
+              <table class="tabcont sortable" width="100%" border="0" cellpadding="0" cellspacing="0">
                 <tr>
                   <td width="10%" class="listhdrr">Name</td>
                   <td width="10%" class="listhdrr">Gateway</td>
diff --git a/usr/local/www/status_openvpn.php b/usr/local/www/status_openvpn.php
index b8c0b86..b8cae6f 100644
--- a/usr/local/www/status_openvpn.php
+++ b/usr/local/www/status_openvpn.php
@@ -110,48 +110,54 @@ echo $buff;
 ?>
 	<?php foreach ($servers as $server): ?>
 
-	<table width="100%" border="0" cellpadding="0" cellspacing="0">
+	<table style="padding-top:0px; padding-bottom:0px; padding-left:0px; padding-right:0px" width="100%" border="0" cellpadding="0" cellspacing="0">
 		<tr>
 			<td colspan="6" class="listtopic"> 
 				Client connections for <?=$server['name'];?>
 			</td>
 		</tr>
 		<tr>
-			<td class="listhdrr">Common Name</td>
-			<td class="listhdrr">Real Address</td>
-			<td class="listhdrr">Virtual Address</td>
-			<td class="listhdrr">Connected Since</td>
-			<td class="listhdrr">Bytes Sent</td>
-			<td class="listhdrr">Bytes Received</td>
-		</tr>
-
-		<?php foreach ($server['conns'] as $conn): ?>
-		<tr>
-			<td class="listlr">
-				<?=$conn['common_name'];?>
-			</td>
-			<td class="listr">
-				<?=$conn['remote_host'];?>
-			</td>
-			<td class="listr">
-				<?=$conn['virtual_addr'];?>
-			</td>
-			<td class="listr">
-				<?=$conn['connect_time'];?>
+			<td>
+				<table style="padding-top:0px; padding-bottom:0px; padding-left:0px; padding-right:0px" class="tabcont sortable" width="100%" border="0" cellpadding="0" cellspacing="0">
+				<tr>
+					<td class="listhdrr">Common Name</td>
+					<td class="listhdrr">Real Address</td>
+					<td class="listhdrr">Virtual Address</td>
+					<td class="listhdrr">Connected Since</td>
+					<td class="listhdrr">Bytes Sent</td>
+					<td class="listhdrr">Bytes Received</td>
+				</tr>
+
+				<?php foreach ($server['conns'] as $conn): ?>
+				<tr>
+					<td class="listlr">
+						<?=$conn['common_name'];?>
+					</td>
+					<td class="listr">
+						<?=$conn['remote_host'];?>
+					</td>
+					<td class="listr">
+						<?=$conn['virtual_addr'];?>
+					</td>
+					<td class="listr">
+						<?=$conn['connect_time'];?>
+					</td>
+					<td class="listr">
+						<?=$conn['bytes_sent'];?>
+					</td>
+					<td class="listr">
+						<?=$conn['bytes_recv'];?>
+					</td>
+				</tr>
+
+				<?php endforeach; ?>
+				<tr>
+					<td colspan="6" class="list" height="12"></td>
+				</tr>
+
+			</table>
 			</td>
-			<td class="listr">
-				<?=$conn['bytes_sent'];?>
-			</td>
-			<td class="listr">
-				<?=$conn['bytes_recv'];?>
-			</td>
-		</tr>
-
-		<?php endforeach; ?>
-		<tr>
-			<td colspan="6" class="list" height="12"></td>
 		</tr>
-
 	</table>
 
 	<?php endforeach; ?>
diff --git a/usr/local/www/status_services.php b/usr/local/www/status_services.php
index daaf627..1a13f4e 100755
--- a/usr/local/www/status_services.php
+++ b/usr/local/www/status_services.php
@@ -212,7 +212,7 @@ include("fbegin.inc");
 <p>
 
 <div id="boxarea">
-<table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
+<table class="tabcont sortable" width="100%" border="0" cellpadding="0" cellspacing="0">
   <tr>
     <td>
     <table width="100%" border="0" cellpadding="6" cellspacing="0">
diff --git a/usr/local/www/status_slbd_pool.php b/usr/local/www/status_slbd_pool.php
index 5754d07..93332b8 100755
--- a/usr/local/www/status_slbd_pool.php
+++ b/usr/local/www/status_slbd_pool.php
@@ -72,7 +72,7 @@ include("head.inc");
   <tr>
     <td>
 	<div id="mainarea">
-              <table width="100%" border="0" cellpadding="0" cellspacing="0" class="tabcont" name="sortabletable" id="sortabletable">
+              <table width="100%" border="0" cellpadding="0" cellspacing="0" class="tabcont sortable" name="sortabletable" id="sortabletable">
                 <tr>
                   <td width="10%" class="listhdrr">Name</td>
 				  <td width="10%" class="listhdrr">Type</td>
diff --git a/usr/local/www/status_slbd_vs.php b/usr/local/www/status_slbd_vs.php
index e888860..b8f78cc 100755
--- a/usr/local/www/status_slbd_vs.php
+++ b/usr/local/www/status_slbd_vs.php
@@ -124,10 +124,10 @@ include("head.inc");
   <tr>
     <td>
 	<div id="mainarea">
-              <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
+              <table class="tabcont sortable" width="100%" border="0" cellpadding="0" cellspacing="0">
                 <tr>
                   <td width="10%" class="listhdrr">Name</td>
-		  <td width="10%" class="listhdrr">Port</td>
+				  <td width="10%" class="listhdrr">Port</td>
                   <td width="10%" class="listhdrr">Servers</td>
                   <td width="30%" class="listhdrr">Status</td>
                   <td width="30%" class="listhdr">Description</td>