From 5b42a459e6d4488616d9e1a3eeb37e98fdb26fa8 Mon Sep 17 00:00:00 2001
From: bcyrill <cyrill@bannwart.info>
Date: Mon, 24 Sep 2012 21:38:08 +0200
Subject: Make tables sortable

---
 usr/local/www/system_authservers.php  | 104 ++++++++++++-----------
 usr/local/www/system_groupmanager.php | 150 +++++++++++++++++----------------
 usr/local/www/system_usermanager.php  | 154 ++++++++++++++++++----------------
 3 files changed, 213 insertions(+), 195 deletions(-)

diff --git a/usr/local/www/system_authservers.php b/usr/local/www/system_authservers.php
index 158e615..bc88f27 100644
--- a/usr/local/www/system_authservers.php
+++ b/usr/local/www/system_authservers.php
@@ -2,7 +2,7 @@
 /*
     system_authservers.php
 
-    Copyright (C) 2010 Ermal Lu�i
+    Copyright (C) 2010 Ermal Luçi
     Copyright (C) 2008 Shrew Soft Inc.
     All rights reserved.
 
@@ -733,54 +733,60 @@ function select_clicked() {
 
 				<?php else: ?>
 
-				<table width="100%" border="0" cellpadding="0" cellspacing="0">
-					<tr>
-						<td width="25%" class="listhdrr"><?=gettext("Server Name");?></td>
-						<td width="25%" class="listhdrr"><?=gettext("Type");?></td>
-						<td width="35%" class="listhdrr"><?=gettext("Host Name");?></td>
-						<td width="10%" class="list"></td>
-					</tr>
-					<?php
-						$i = 0;
-						foreach($a_server as $server):
-							$name = htmlspecialchars($server['name']);
-							$type = htmlspecialchars($auth_server_types[$server['type']]);
-							$host = htmlspecialchars($server['host']);
-					?>
-					<tr <?php if ($i < (count($a_server) - 1)): ?> ondblclick="document.location='system_authservers.php?act=edit&id=<?=$i;?>'" <?php endif; ?>>
-						<td class="listlr"><?=$name?>&nbsp;</td>
-						<td class="listr"><?=$type;?>&nbsp;</td>
-						<td class="listr"><?=$host;?>&nbsp;</td>
-						<td valign="middle" nowrap class="list">
-						<?php if ($i < (count($a_server) - 1)): ?>
-							<a href="system_authservers.php?act=edit&id=<?=$i;?>">
-								<img src="/themes/<?= $g['theme'];?>/images/icons/icon_e.gif" title="<?=gettext("edit server");?>" alt="<?=gettext("edit server");?>" width="17" height="17" border="0" />
-							</a>
-							&nbsp;
-							<a href="system_authservers.php?act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this Server?");?>')">
-								<img src="/themes/<?= $g['theme'];?>/images/icons/icon_x.gif" title="<?=gettext("delete server");?>" alt="<?=gettext("delete server");?>" width="17" height="17" border="0" />
-							</a>
-						<?php endif; ?>
-						</td>
-					</tr>
-					<?php
-						$i++; endforeach;
-					?>
-					<tr>
-						<td class="list" colspan="3"></td>
-						<td class="list">
-							<a href="system_authservers.php?act=new">
-								<img src="/themes/<?= $g['theme'];?>/images/icons/icon_plus.gif" title="<?=gettext("add server");?>" alt="<?=gettext("add server");?>" width="17" height="17" border="0" />
-							</a>
-						</td>
-					</tr>
-					<tr>
-						<td colspan="3">
-							<p>
-								<?=gettext("Additional authentication servers can be added here.");?>
-							</p>
-						</td>
-					</tr>
+				<table class="sortable" width="100%" border="0" cellpadding="0" cellspacing="0">
+					<thead>
+						<tr>
+							<th width="25%" class="listhdrr"><?=gettext("Server Name");?></th>
+							<th width="25%" class="listhdrr"><?=gettext("Type");?></th>
+							<th width="35%" class="listhdrr"><?=gettext("Host Name");?></th>
+							<th width="10%" class="list"></th>
+						</tr>
+					</thead>
+					<tbody>
+						<?php
+							$i = 0;
+							foreach($a_server as $server):
+								$name = htmlspecialchars($server['name']);
+								$type = htmlspecialchars($auth_server_types[$server['type']]);
+								$host = htmlspecialchars($server['host']);
+						?>
+						<tr <?php if ($i < (count($a_server) - 1)): ?> ondblclick="document.location='system_authservers.php?act=edit&id=<?=$i;?>'" <?php endif; ?>>
+							<td class="listlr"><?=$name?>&nbsp;</td>
+							<td class="listr"><?=$type;?>&nbsp;</td>
+							<td class="listr"><?=$host;?>&nbsp;</td>
+							<td valign="middle" nowrap class="list">
+							<?php if ($i < (count($a_server) - 1)): ?>
+								<a href="system_authservers.php?act=edit&id=<?=$i;?>">
+									<img src="/themes/<?= $g['theme'];?>/images/icons/icon_e.gif" title="<?=gettext("edit server");?>" alt="<?=gettext("edit server");?>" width="17" height="17" border="0" />
+								</a>
+								&nbsp;
+								<a href="system_authservers.php?act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this Server?");?>')">
+									<img src="/themes/<?= $g['theme'];?>/images/icons/icon_x.gif" title="<?=gettext("delete server");?>" alt="<?=gettext("delete server");?>" width="17" height="17" border="0" />
+								</a>
+							<?php endif; ?>
+							</td>
+						</tr>
+						<?php
+							$i++; endforeach;
+						?>
+					</tbody>
+					<tfoot>
+						<tr>
+							<td class="list" colspan="3"></td>
+							<td class="list">
+								<a href="system_authservers.php?act=new">
+									<img src="/themes/<?= $g['theme'];?>/images/icons/icon_plus.gif" title="<?=gettext("add server");?>" alt="<?=gettext("add server");?>" width="17" height="17" border="0" />
+								</a>
+							</td>
+						</tr>
+						<tr>
+							<td colspan="3">
+								<p>
+									<?=gettext("Additional authentication servers can be added here.");?>
+								</p>
+							</td>
+						</tr>
+					</tfoot>
 				</table>
 
 				<?php endif; ?>
diff --git a/usr/local/www/system_groupmanager.php b/usr/local/www/system_groupmanager.php
index def20c7..d6ffe25 100644
--- a/usr/local/www/system_groupmanager.php
+++ b/usr/local/www/system_groupmanager.php
@@ -399,78 +399,84 @@ function presubmit() {
 
 				<?php else: ?>
 
-				<table width="100%" border="0" cellpadding="0" cellspacing="0">
-					<tr>
-						<td width="25%" class="listhdrr"><?=gettext("Group name");?></td>
-						<td width="25%" class="listhdrr"><?=gettext("Description");?></td>
-						<td width="30%" class="listhdrr"><?=gettext("Member Count");?></td>
-						<td width="10%" class="list"></td>
-					</tr>
-					<?php
-						$i = 0;
-						foreach($a_group as $group):
-
-							if($group['scope'] == "system")
-								$grpimg = "/themes/{$g['theme']}/images/icons/icon_system-group-grey.png";
-							else
-								$grpimg = "/themes/{$g['theme']}/images/icons/icon_system-group.png";
-							$groupcount = count($group['member']);
-							if ($group["name"] == "all")
-								$groupcount = count($config['system']['user']);
-					?>
-					<tr ondblclick="document.location='system_groupmanager.php?act=edit&id=<?=$i;?>'">
-						<td class="listlr">
-							<table border="0" cellpadding="0" cellspacing="0">
-								<tr>
-									<td align="left" valign="center">
-										<img src="<?=$grpimg;?>" alt="<?=gettext("User");?>" title="<?=gettext("User");?>" border="0" height="16" width="16" />
-									</td>
-									</td>
-									<td align="left" valign="middle">
-										<?=htmlspecialchars($group['name']); ?>&nbsp;
-									</td>
-								</tr>
-							</table>
-						</td>
-						<td class="listr">
-							<?=htmlspecialchars($group['description']);?>&nbsp;
-						</td>
-						<td class="listbg">
-							<?=$groupcount;?>
-						</td>
-						<td valign="middle" nowrap class="list">
-							<a href="system_groupmanager.php?act=edit&id=<?=$i;?>">
-								<img src="./themes/<?=$g['theme'];?>/images/icons/icon_e.gif" title="<?=gettext("edit group");?>" width="17" height="17" border="0">
-							</a>
-							&nbsp;
-							<?php if($group['scope'] != "system"): ?>
-							<a href="system_groupmanager.php?act=delgroup&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this group?"); ?>')">
-								<img src="/themes/<?=$g['theme'];?>/images/icons/icon_x.gif" title="<?=gettext("delete group"); ?>" width="17" height="17" border="0">
-							</a>
-							<?php endif; ?>
-						</td>
-					</tr>
-					<?php
-						$i++;
-						endforeach;
-					?>
-					<tr> 
-						<td class="list" colspan="3"></td>
-						<td class="list">
-							<a href="system_groupmanager.php?act=new"><img src="./themes/<?=$g['theme'];?>/images/icons/icon_plus.gif" title="<?=gettext("add group");?>" width="17" height="17" border="0">
-							</a>
-						</td>
-					</tr>
-					<tr>
-						<td colspan="3">
-							<p>
-								<?=gettext("Additional webConfigurator groups can be added here. 
-								Group permissions can be assigned which are inherited by users who are members of the group.
-								An icon that appears grey indicates that it is a system defined object.
-								Some system object properties can be modified but they cannot be deleted.");?>
-							</p>
-						</td>
-					</tr>
+				<table class="sortable" width="100%" border="0" cellpadding="0" cellspacing="0">
+					<thead>
+						<tr>
+							<th width="25%" class="listhdrr"><?=gettext("Group name");?></th>
+							<th width="25%" class="listhdrr"><?=gettext("Description");?></th>
+							<th width="30%" class="listhdrr"><?=gettext("Member Count");?></th>
+							<th width="10%" class="list"></th>
+						</tr>
+					</thead>
+					<tbody>
+						<?php
+							$i = 0;
+							foreach($a_group as $group):
+
+								if($group['scope'] == "system")
+									$grpimg = "/themes/{$g['theme']}/images/icons/icon_system-group-grey.png";
+								else
+									$grpimg = "/themes/{$g['theme']}/images/icons/icon_system-group.png";
+								$groupcount = count($group['member']);
+								if ($group["name"] == "all")
+									$groupcount = count($config['system']['user']);
+						?>
+						<tr ondblclick="document.location='system_groupmanager.php?act=edit&id=<?=$i;?>'">
+							<td class="listlr">
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td align="left" valign="center">
+											<img src="<?=$grpimg;?>" alt="<?=gettext("User");?>" title="<?=gettext("User");?>" border="0" height="16" width="16" />
+										</td>
+										</td>
+										<td align="left" valign="middle">
+											<?=htmlspecialchars($group['name']); ?>&nbsp;
+										</td>
+									</tr>
+								</table>
+							</td>
+							<td class="listr">
+								<?=htmlspecialchars($group['description']);?>&nbsp;
+							</td>
+							<td class="listbg">
+								<?=$groupcount;?>
+							</td>
+							<td valign="middle" nowrap class="list">
+								<a href="system_groupmanager.php?act=edit&id=<?=$i;?>">
+									<img src="./themes/<?=$g['theme'];?>/images/icons/icon_e.gif" title="<?=gettext("edit group");?>" width="17" height="17" border="0">
+								</a>
+								&nbsp;
+								<?php if($group['scope'] != "system"): ?>
+								<a href="system_groupmanager.php?act=delgroup&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this group?"); ?>')">
+									<img src="/themes/<?=$g['theme'];?>/images/icons/icon_x.gif" title="<?=gettext("delete group"); ?>" width="17" height="17" border="0">
+								</a>
+								<?php endif; ?>
+							</td>
+						</tr>
+						<?php
+							$i++;
+							endforeach;
+						?>
+					</tbody>
+					<tfoot>
+						<tr> 
+							<td class="list" colspan="3"></td>
+							<td class="list">
+								<a href="system_groupmanager.php?act=new"><img src="./themes/<?=$g['theme'];?>/images/icons/icon_plus.gif" title="<?=gettext("add group");?>" width="17" height="17" border="0">
+								</a>
+							</td>
+						</tr>
+						<tr>
+							<td colspan="3">
+								<p>
+									<?=gettext("Additional webConfigurator groups can be added here. 
+									Group permissions can be assigned which are inherited by users who are members of the group.
+									An icon that appears grey indicates that it is a system defined object.
+									Some system object properties can be modified but they cannot be deleted.");?>
+								</p>
+							</td>
+						</tr>
+					</tfoot>
 				</table>
 			
 				<?php endif; ?>
diff --git a/usr/local/www/system_usermanager.php b/usr/local/www/system_usermanager.php
index 68ac908..ab69fe5 100644
--- a/usr/local/www/system_usermanager.php
+++ b/usr/local/www/system_usermanager.php
@@ -780,80 +780,86 @@ function sshkeyClicked(obj) {
 
 				<?php else: ?>
 
-				<table width="100%" border="0" cellpadding="0" cellspacing="0">
-					<tr>
-						<td width="25%" class="listhdrr"><?=gettext("Username"); ?></td>
-						<td width="25%" class="listhdrr"><?=gettext("Full name"); ?></td>
-						<td width="5%" class="listhdrr"><?=gettext("Disabled"); ?></td>
-						<td width="25%" class="listhdrr"><?=gettext("Groups"); ?></td>
-						<td width="10%" class="list"></td>
-					</tr>
-					<?php
-						$i = 0;
-						foreach($a_user as $userent):
-					?>
-					<tr ondblclick="document.location='system_usermanager.php?act=edit&id=<?=$i;?>'">
-						<td class="listlr">
-							<table border="0" cellpadding="0" cellspacing="0">
-								<tr>
-									<td align="left" valign="center">
-										<?php
-											if($userent['scope'] != "user")
-												$usrimg = "/themes/{$g['theme']}/images/icons/icon_system-user-grey.png";
-											else
-												$usrimg = "/themes/{$g['theme']}/images/icons/icon_system-user.png";
-										?>
-										<img src="<?=$usrimg;?>" alt="<?=gettext("User"); ?>" title="<?=gettext("User"); ?>" border="0" height="16" width="16" />
-									</td>
-									<td align="left" valign="middle">
-										<?=htmlspecialchars($userent['name']);?>
-									</td>
-								</tr>
-							</table>
-						</td>
-						<td class="listr"><?=htmlspecialchars($userent['descr']);?>&nbsp;</td>
-						<td class="listr"><?php if(isset($userent['disabled'])) echo "*"; ?></td>
-						<td class="listbg">
-								<?=implode(",",local_user_get_groups($userent));?>
-							&nbsp;
-						</td>
-						<td valign="middle" nowrap class="list">
-							<a href="system_usermanager.php?act=edit&id=<?=$i;?>">
-								<img src="/themes/<?= $g['theme'];?>/images/icons/icon_e.gif" title="<?=gettext("edit user"); ?>" alt="<?=gettext("edit user"); ?>" width="17" height="17" border="0" />
-							</a>
-							<?php if($userent['scope'] != "system"): ?>
-							&nbsp;
-							<a href="system_usermanager.php?act=deluser&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this User?");?>')">
-								<img src="/themes/<?= $g['theme'];?>/images/icons/icon_x.gif" title="<?=gettext("delete user"); ?>" alt="<?=gettext("delete user"); ?>" width="17" height="17" border="0" />
-							</a>
-							<?php endif; ?>
-						</td>
-					</tr>
-					<?php
-							$i++;
-						endforeach;
-					?>
-					<tr>
-						<td class="list" colspan="4"></td>
-						<td class="list">
-							<a href="system_usermanager.php?act=new">
-								<img src="/themes/<?= $g['theme'];?>/images/icons/icon_plus.gif" title="<?=gettext("add user"); ?>" alt="<?=gettext("add user"); ?>" width="17" height="17" border="0" />
-							</a>
-						</td>
-					</tr>
-					<tr>
-						<td colspan="4">
-							<p>
-								<?=gettext("Additional users can be added here. User permissions for accessing " .
-								"the webConfigurator can be assigned directly or inherited from group memberships. " .
-								"An icon that appears grey indicates that it is a system defined object. " .
-								"Some system object properties can be modified but they cannot be deleted."); ?>
-								<br/><br/>
-								<?=gettext("Accounts created here are also used for other parts of the system " .
-								"such as OpenVPN, IPsec, and Captive Portal.");?>
-							</p>
-						</td>
-					</tr>
+				<table class="sortable" width="100%" border="0" cellpadding="0" cellspacing="0">
+					<thead>
+						<tr>
+							<th width="25%" class="listhdrr"><?=gettext("Username"); ?></th>
+							<th width="25%" class="listhdrr"><?=gettext("Full name"); ?></th>
+							<th width="5%" class="listhdrr"><?=gettext("Disabled"); ?></th>
+							<th width="25%" class="listhdrr"><?=gettext("Groups"); ?></th>
+							<th width="10%" class="list"></td>
+						</tr>
+					</thead>
+					<tbody>
+						<?php
+							$i = 0;
+							foreach($a_user as $userent):
+						?>
+						<tr ondblclick="document.location='system_usermanager.php?act=edit&id=<?=$i;?>'">
+							<td class="listlr">
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td align="left" valign="center">
+											<?php
+												if($userent['scope'] != "user")
+													$usrimg = "/themes/{$g['theme']}/images/icons/icon_system-user-grey.png";
+												else
+													$usrimg = "/themes/{$g['theme']}/images/icons/icon_system-user.png";
+											?>
+											<img src="<?=$usrimg;?>" alt="<?=gettext("User"); ?>" title="<?=gettext("User"); ?>" border="0" height="16" width="16" />
+										</td>
+										<td align="left" valign="middle">
+											<?=htmlspecialchars($userent['name']);?>
+										</td>
+									</tr>
+								</table>
+							</td>
+							<td class="listr"><?=htmlspecialchars($userent['descr']);?>&nbsp;</td>
+							<td class="listr"><?php if(isset($userent['disabled'])) echo "*"; ?></td>
+							<td class="listbg">
+									<?=implode(",",local_user_get_groups($userent));?>
+								&nbsp;
+							</td>
+							<td valign="middle" nowrap class="list">
+								<a href="system_usermanager.php?act=edit&id=<?=$i;?>">
+									<img src="/themes/<?= $g['theme'];?>/images/icons/icon_e.gif" title="<?=gettext("edit user"); ?>" alt="<?=gettext("edit user"); ?>" width="17" height="17" border="0" />
+								</a>
+								<?php if($userent['scope'] != "system"): ?>
+								&nbsp;
+								<a href="system_usermanager.php?act=deluser&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this User?");?>')">
+									<img src="/themes/<?= $g['theme'];?>/images/icons/icon_x.gif" title="<?=gettext("delete user"); ?>" alt="<?=gettext("delete user"); ?>" width="17" height="17" border="0" />
+								</a>
+								<?php endif; ?>
+							</td>
+						</tr>
+						<?php
+								$i++;
+							endforeach;
+						?>
+					</tbody>
+					<tfoot>
+						<tr>
+							<td class="list" colspan="4"></td>
+							<td class="list">
+								<a href="system_usermanager.php?act=new">
+									<img src="/themes/<?= $g['theme'];?>/images/icons/icon_plus.gif" title="<?=gettext("add user"); ?>" alt="<?=gettext("add user"); ?>" width="17" height="17" border="0" />
+								</a>
+							</td>
+						</tr>
+						<tr>
+							<td colspan="4">
+								<p>
+									<?=gettext("Additional users can be added here. User permissions for accessing " .
+									"the webConfigurator can be assigned directly or inherited from group memberships. " .
+									"An icon that appears grey indicates that it is a system defined object. " .
+									"Some system object properties can be modified but they cannot be deleted."); ?>
+									<br/><br/>
+									<?=gettext("Accounts created here are also used for other parts of the system " .
+									"such as OpenVPN, IPsec, and Captive Portal.");?>
+								</p>
+							</td>
+						</tr>
+					</tfoot>
 				</table>
 
 				<?php endif; ?>
-- 
cgit v1.1