From 673cf2876d66d572ea182ffaa7b7abd1cdfecbe0 Mon Sep 17 00:00:00 2001
From: NOYB <Al_Stu@Frontier.com>
Date: Thu, 4 Feb 2016 00:01:56 -0800
Subject: Status / DHCP leases - Root Cause Sort Issue

Sort routine apparently does not honor colspan attribute.

Here are three possible solutions:
1) Add a description column instead of spanning the start and end columns.  This is the method presented in this commit.

2) Include an empty second column with the description instead of spanning.  This would not be very display/sort friendly though because it would be sharing the start column with the description.

3) Display two empty cells when lease type is static, instead of the description.  This is the way status DHCPv6 leases currently works.
---
 src/usr/local/www/status_dhcp_leases.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'src/usr/local/www/status_dhcp_leases.php')

diff --git a/src/usr/local/www/status_dhcp_leases.php b/src/usr/local/www/status_dhcp_leases.php
index fe160c8..c8fd45a 100644
--- a/src/usr/local/www/status_dhcp_leases.php
+++ b/src/usr/local/www/status_dhcp_leases.php
@@ -379,11 +379,12 @@ if (count($pools) > 0) {
 					<th><?=gettext("IP address")?></th>
 					<th><?=gettext("MAC address")?></th>
 					<th><?=gettext("Hostname")?></th>
+					<th><?=gettext("Description")?></th>
 					<th><?=gettext("Start")?></th>
 					<th><?=gettext("End")?></th>
-					<th data-sortable="false"><?=gettext("Online")?></th>
-					<th data-sortable="false"><?=gettext("Lease Type")?></th>
-					<th data-sortable="false"><?=gettext("Actions")?></th>
+					<th><?=gettext("Online")?></th>
+					<th><?=gettext("Lease Type")?></th>
+					<th><?=gettext("Actions")?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -437,12 +438,9 @@ foreach ($leases as $data):
 						<?php endif; ?>
 					</td>
 					<td><?=htmlentities($data['hostname'])?></td>
-<?php if ($data['type'] != $static_string):?>
+					<td><?=htmlentities($data['descr'])?></td>
 					<td><?=adjust_gmt($data['start'])?></td>
 					<td><?=adjust_gmt($data['end'])?></td>
-<?php else: ?>
-					<td colspan="2"><?=htmlentities($data['descr'])?></td>
-<?php endif; ?>
 					<td><?=$data['online']?></td>
 					<td><?=$data['act']?></td>
 					<td>
-- 
cgit v1.1