Merge pull request #530 from ExolonDX/branch_24

Tidy up "system_gateway_groups_edit.php" XHTML

1 files changed, 16 insertions, 19 deletions

diff --git a/usr/local/www/system_gateway_groups_edit.php b/usr/local/www/system_gateway_groups_edit.php
index b470f11..48ee2b5 100755
--- a/usr/local/www/system_gateway_groups_edit.php
+++ b/usr/local/www/system_gateway_groups_edit.php
@@ -224,20 +224,20 @@ jQuery(function ($) {
 <?php include("fbegin.inc"); ?>
 <?php if ($input_errors) print_input_errors($input_errors); ?>
             <form action="system_gateway_groups_edit.php" method="post" name="iform" id="iform">
-              <table width="100%" border="0" cellpadding="6" cellspacing="0">
+              <table width="100%" border="0" cellpadding="6" cellspacing="0" summary="system groups edit">
 		<tr>
 			<td colspan="2" valign="top" class="listtopic"><?=gettext("Edit gateway group entry"); ?></td>
 		</tr>	
                 <tr>
                   <td width="22%" valign="top" class="vncellreq"><?=gettext("Group Name"); ?></td>
                   <td width="78%" class="vtable"> 
-                    <input name="name" type="text" class="formfld unknown" id="name" size="20" value="<?=htmlspecialchars($pconfig['name']);?>"> 
-                    <br> <span class="vexpl"><?=gettext("Group Name"); ?></span></td>
+                    <input name="name" type="text" class="formfld unknown" id="name" size="20" value="<?=htmlspecialchars($pconfig['name']);?>" />
+                    <br/> <span class="vexpl"><?=gettext("Group Name"); ?></span></td>
                 </tr>
 		<tr>
                   <td width="22%" valign="top" class="vncellreq"><?=gettext("Gateway Priority"); ?></td>
                   <td width="78%" class="vtable">
-			<table border=0 cellpadding="6" cellspacing="0">
+			<table border="0" cellpadding="6" cellspacing="0" summary="gateway priority">
 			<tr>
 				<td class="listhdrr">Gateway</td>
 				<td class="listhdrr">Tier</td>
@@ -257,10 +257,10 @@ jQuery(function ($) {
 				foreach((array)$pconfig['item'] as $item) {
 					$itemsplit = explode("|", $item);
 					if($itemsplit[0] == $gwname) {
-						$selected[$itemsplit[1]] = "selected";
+						$selected[$itemsplit[1]] = "selected=\"selected\"";
 						break;
 					} else {
-						$selected[0] = "selected";
+						$selected[0] = "selected=\"selected\"";
 					}
 				}
 				$tr_id = $gwname . "_row";
@@ -282,10 +282,10 @@ jQuery(function ($) {
 				foreach((array)$pconfig['item'] as $item) {
 					$itemsplit = explode("|", $item);
 					if($itemsplit[0] == $gwname) {
-						$selected[$itemsplit[2]] = "selected";
+						$selected[$itemsplit[2]] = "selected=\"selected\"";
 						break;
 					} else {
-						$selected['address'] = "selected";
+						$selected['address'] = "selected=\"selected\"";
 					}
 				}
 				echo "<td class='listr'>";
@@ -301,8 +301,8 @@ jQuery(function ($) {
 						continue;
 					echo "<option value='{$vip}' $selected[$vip] >$vip - $address</option>\n";
 				}
-				echo "</select>";
-				echo "<td class='listr'><strong>{$gateway['descr']}</strong>";
+				echo "</select></td>";
+				echo "<td class='listr'><strong>{$gateway['descr']}&nbsp;</strong>";
 				echo "</td></tr>";
 		 	}
 		?>
@@ -318,8 +318,6 @@ jQuery(function ($) {
 			</span><br />
 		   </td>
                 </tr>
-		  </td>
-		</tr>
                 <tr>
                   <td width="22%" valign="top" class="vncellreq"><?=gettext("Trigger Level"); ?></td>
                   <td width="78%" class="vtable">
@@ -327,26 +325,25 @@ jQuery(function ($) {
 			<?php
 				foreach ($categories as $category => $categoryd) {
 				        echo "<option value=\"$category\"";
-				        if ($category == $pconfig['trigger']) echo " selected";
+				        if ($category == $pconfig['trigger']) echo " selected=\"selected\"";
 					echo ">" . htmlspecialchars($categoryd) . "</option>\n";
 				}
 			?>
 			</select>
-                    <br> <span class="vexpl"><?=gettext("When to trigger exclusion of a member"); ?></span></td>
+                    <br/> <span class="vexpl"><?=gettext("When to trigger exclusion of a member"); ?></span></td>
                 </tr>
 		<tr>
                   <td width="22%" valign="top" class="vncell"><?=gettext("Description"); ?></td>
                   <td width="78%" class="vtable"> 
-                    <input name="descr" type="text" class="formfld unknown" id="descr" size="40" 
-value="<?=htmlspecialchars($pconfig['descr']);?>">
-                    <br> <span class="vexpl"><?=gettext("You may enter a description here for your reference (not parsed)."); ?></span></td>
+                    <input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>" />
+                    <br/> <span class="vexpl"><?=gettext("You may enter a description here for your reference (not parsed)."); ?></span></td>
                 </tr>
                 <tr>
                   <td width="22%" valign="top">&nbsp;</td>
                   <td width="78%"> 
-                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>"> <input type="button" value="<?=gettext("Cancel"); ?>" class="formbtn"  onclick="history.back()">
+                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" /> <input type="button" value="<?=gettext("Cancel"); ?>" class="formbtn"  onclick="history.back()" />
                     <?php if (isset($id) && $a_gateway_groups[$id]): ?>
-                    <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>">
+                    <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
                     <?php endif; ?>
                   </td>
                 </tr>