mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Status / DHCP leases - Root Cause Sort Issue

Browse Source 
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.
This commit is contained in:
NOYB 2016-02-04 00:01:56 -08:00 committed by Stephen Beaver
parent 85a2b06550
commit 673cf2876d
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/usr/local/www/status_dhcp_leases.php
View File

@ -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>