(line endings UNIX format..)

Firewall log alternating colored rows
Firewall log sortable
Fixed several sorting issues in widgets and other pages
Sorting now possible on multiple rows in the header tables
Sorting now possible for text that starts with IPv4:port

2 files changed, 15 insertions, 12 deletions

diff --git a/usr/local/www/widgets/widgets/captive_portal_status.widget.php b/usr/local/www/widgets/widgets/captive_portal_status.widget.php
index 829515f..b9d7933 100644
--- a/usr/local/www/widgets/widgets/captive_portal_status.widget.php
+++ b/usr/local/www/widgets/widgets/captive_portal_status.widget.php
@@ -42,7 +42,6 @@ require_once("captiveportal.inc");
 
 ?>
 
-<script src="/javascript/sorttable.js"></script>
 <?php
 
 if ($_GET['act'] == "del") {
diff --git a/usr/local/www/widgets/widgets/openvpn.widget.php b/usr/local/www/widgets/widgets/openvpn.widget.php
index 1eea8fd..92cc78e 100644
--- a/usr/local/www/widgets/widgets/openvpn.widget.php
+++ b/usr/local/www/widgets/widgets/openvpn.widget.php
@@ -60,7 +60,6 @@ $sk_servers = openvpn_get_active_servers("p2p");
 $clients = openvpn_get_active_clients();
 ?>
 
-<script src="/javascript/sorttable.js" type="text/javascript"></script>
 <br/>
 <script type="text/javascript">
 	function killClient(mport, remipp) {
@@ -102,40 +101,45 @@ $clients = openvpn_get_active_clients();
 	</tr>
 	<tr>
 		<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">
+			<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" sortableMultirow="2">
 			<tr>
 				<td class="listhdrr">Name/Time</td>
 				<td class="listhdrr">Real/Virtual IP</td>
 			</tr>
-			<?php foreach ($server['conns'] as $conn): ?>
-			<tr name='<?php echo "r:{$server['mgmt']}:{$conn['remote_host']}"; ?>'>
-				<td class="listlr">
+			<?php $rowIndex = 0;
+			foreach ($server['conns'] as $conn): 
+			$evenRowClass = $rowIndex % 2 ? " listEven" : " listOdd";
+			$rowIndex++;			
+			?>
+			<tr name='<?php echo "r:{$server['mgmt']}:{$conn['remote_host']}"; ?>' class="<?=$evenRowClass?>">
+				<td class="listlrg">
 					<?=$conn['common_name'];?>
 				</td>
-				<td class="listr">
+				<td class="listrg">
 					<?=$conn['remote_host'];?>
 				</td>
-				<td class='list' rowspan="2">
+				<td class='listg' rowspan="2">
 					<img src='/themes/<?php echo $g['theme']; ?>/images/icons/icon_x.gif' height='17' width='17' border='0'
 					   onclick="killClient('<?php echo $server['mgmt']; ?>', '<?php echo $conn['remote_host']; ?>');" style='cursor:pointer;'
 					   name='<?php echo "i:{$server['mgmt']}:{$conn['remote_host']}"; ?>'
 					   title='Kill client connection from <?php echo $conn['remote_host']; ?>' alt='' />
 				</td>
 			</tr>
-			<tr name='<?php echo "r:{$server['mgmt']}:{$conn['remote_host']}"; ?>'>
-				<td class="listlr">
+			<tr name='<?php echo "r:{$server['mgmt']}:{$conn['remote_host']}"; ?>' class="<?=$evenRowClass?>">
+				<td class="listlrg">
 					<?=$conn['connect_time'];?>
 				</td>
-				<td class="listr">
+				<td class="listrg">
 					<?=$conn['virtual_addr'];?>
 				</td>
 			</tr>
 
 			<?php endforeach; ?>
+			<tfoot>
 			<tr>
 				<td colspan="6" class="list" height="12"></td>
 			</tr>
-
+			</tfoot>
 		</table>
 		</td>
 	</tr>