Tidy up "vpn_pppoe" XHTML

Add SUMMARY to tables
Close IMG tags and and ALT
Move NOWRAP to class statement
Close INPUT tags

2 files changed, 15 insertions, 16 deletions

diff --git a/usr/local/www/vpn_pppoe.php b/usr/local/www/vpn_pppoe.php
index 94b0650..0ade0d4 100644
--- a/usr/local/www/vpn_pppoe.php
+++ b/usr/local/www/vpn_pppoe.php
@@ -94,7 +94,7 @@ include("head.inc");
 <?php include("fbegin.inc"); ?>
 <form action="vpn_pppoe.php" method="post">
 <?php if ($savemsg) print_info_box($savemsg); ?>
-<?php if (is_subsystem_dirty('vpnpppoe')): ?><p>
+<?php if (is_subsystem_dirty('vpnpppoe')): ?><br/>
 <?php print_info_box_np(gettext("The PPPoE entry list has been changed") . ".<br />" . gettext("You must apply the changes in order for them to take effect."));?>
 <?php endif; ?>
 
@@ -105,10 +105,10 @@ include("head.inc");
   <td width="25%" class="listhdrr"><?=gettext("Number of users");?></td>
   <td width="25%" class="listhdr"><?=gettext("Description");?></td>
   <td width="5%" class="list">
-    <table border="0" cellspacing="0" cellpadding="1">
+    <table border="0" cellspacing="0" cellpadding="1" summary="pppoe server">
       <tr>
 	<td valign="middle" width="17">&nbsp;</td>
-        <td valign="middle"><a href="vpn_pppoe_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" title="<?=gettext("add a new pppoe instance");?>"></a></td>
+        <td valign="middle"><a href="vpn_pppoe_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" title="<?=gettext("add a new pppoe instance");?>" alt="add" /></a></td>
       </tr>
     </table>
   </td>
@@ -127,11 +127,11 @@ include("head.inc");
   <td class="listbg" ondblclick="document.location='vpn_pppoe_edit.php?id=<?=$i;?>';">
     <?=htmlspecialchars($pppoe['descr']);?>&nbsp;
   </td>
-  <td valign="middle" nowrap class="list">
-    <table border="0" cellspacing="0" cellpadding="1">
+  <td valign="middle" class="list nowrap">
+    <table border="0" cellspacing="0" cellpadding="1" summary="icons">
       <tr>
-        <td valign="middle"><a href="vpn_pppoe_edit.php?id=<?=$i;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" title="<?=gettext("edit pppoe instance"); ?>"></a></td>
-        <td><a href="vpn_pppoe.php?act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this entry? All elements that still use it will become invalid (e.g. filter rules)!");?>')"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" title="<?=gettext("delete pppoe instance");?>"></a></td>
+        <td valign="middle"><a href="vpn_pppoe_edit.php?id=<?=$i;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" title="<?=gettext("edit pppoe instance"); ?>" alt="edit" /></a></td>
+        <td><a href="vpn_pppoe.php?act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this entry? All elements that still use it will become invalid (e.g. filter rules)!");?>')"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" title="<?=gettext("delete pppoe instance");?>" alt="delete" /></a></td>
       </tr>
     </table>
   </td>
@@ -140,11 +140,10 @@ include("head.inc");
 <tr>
   <td class="list" colspan="4"></td>
   <td class="list">
-    <table border="0" cellspacing="0" cellpadding="1">
+    <table border="0" cellspacing="0" cellpadding="1" summary="add">
       <tr>
 	<td valign="middle" width="17">&nbsp;</td>
-        <td valign="middle"><a href="vpn_pppoe_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" title="<?=gettext("add a new pppoe instance");?>"></a></td>
-        </td>
+        <td valign="middle"><a href="vpn_pppoe_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" title="<?=gettext("add a new pppoe instance");?>" alt="add" /></a></td>
       </tr>
     </table>
   </td>
diff --git a/usr/local/www/vpn_pppoe_edit.php b/usr/local/www/vpn_pppoe_edit.php
index 540dbb1..96b9cdc 100644
--- a/usr/local/www/vpn_pppoe_edit.php
+++ b/usr/local/www/vpn_pppoe_edit.php
@@ -356,11 +356,11 @@ if ($input_errors)
 if ($savemsg)
 	print_info_box($savemsg);
 ?>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
+<table width="100%" border="0" cellpadding="0" cellspacing="0" summary="pppoe edit">
 	<tr>
 		<td>
 			<div id="mainarea">
-				<table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0">
+				<table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area">
 					<tr>
 						<td height="16" colspan="2" class="listtopic" valign="top"><?php echo gettext("PPPoE server configuration"); ?></td>
 					</tr>
@@ -541,7 +541,7 @@ if ($savemsg)
 					<tr>
 						<td width="22%" valign="top" class="vncell"><div id="addressnetworkport"><?=gettext("User (s)");?></div></td>
 						<td width="78%" class="vtable">
-							<table id="usertable">
+							<table id="usertable" summary="users">
 								<tbody>
 								<tr>
 									<td><div id="onecolumn"><?=gettext("Username");?></div></td>
@@ -571,7 +571,7 @@ if ($savemsg)
 										<input name="ip<?php echo $tracker; ?>" type="text" class="formfld unknown" id="ip<?php echo $tracker; ?>" size="10" value="<?=htmlspecialchars($ip);?>" />
 									</td>
 									<td>
-										<a onclick="removeRow(this); return false;" href="#"><img border="0" src="/themes/<?echo $g['theme'];?>/images/icons/icon_x.gif" /></a>
+										<a onclick="removeRow(this); return false;" href="#"><img border="0" src="/themes/<?echo $g['theme'];?>/images/icons/icon_x.gif" alt="delete" /></a>
 									</td>
 								</tr>
 <?php
@@ -594,11 +594,11 @@ if ($savemsg)
 						<td width="78%">
 <?php
 						if (isset($id))
-							echo "<input type='hidden' name='id' id='id' value='" . htmlspecialchars($id, ENT_QUOTES | ENT_HTML401) . "' />";
+							echo "<input type=\"hidden\" name=\"id\" id=\"id\" value=\"" . htmlspecialchars($id, ENT_QUOTES | ENT_HTML401) . "\" />";
 ?>
 <?php
 						if (isset($pconfig['pppoeid']))
-							echo "<input type='hidden' name='pppoeid' id='pppoeid' value='{$pppoeid}' />";
+							echo "<input type=\"hidden\" name=\"pppoeid\" id=\"pppoeid\" value=\"{$pppoeid}\" />";
 ?>
 							<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>"  onclick="enable_change(true)" />
 							<a href="vpn_pppoe.php"><input name="Cancel" type="button" class="formbtn" value="<?=gettext("Cancel"); ?>" /></a>