diff options
| author | Colin Fleming <cj_fleming@sky.com> | 2014-04-04 17:35:02 +0100 |
|---|---|---|
| committer | Colin Fleming <cj_fleming@sky.com> | 2014-04-04 17:35:02 +0100 |
| commit | ee9530e1c023504269fe3c9282b1b43344942d83 (patch) | |
| tree | 41e1530db98b1947ea3dbe642cb715ac34c61d82 /usr | |
| parent | a4b1bf88bbdc0b05f39c5dcca245ccf3f0563f7d (diff) | |
| download | pfsense-ee9530e1c023504269fe3c9282b1b43344942d83.zip pfsense-ee9530e1c023504269fe3c9282b1b43344942d83.tar.gz | |
Tidy up "services_dhcpv6" XHTML
Update alert message
Add "closehead" variable and manually close HEAD
Add CDATA sections to script
Add SUMMARY to tables
Update HTML Boolean operators
Close INPUT
Add missing closing P tag
Remove empty TFOOT tag
Deprecate ampersand
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/local/www/services_dhcpv6.php | 129 | ||||
| -rw-r--r-- | usr/local/www/services_dhcpv6_edit.php | 20 |
2 files changed, 78 insertions, 71 deletions
diff --git a/usr/local/www/services_dhcpv6.php b/usr/local/www/services_dhcpv6.php index c794002..ff0cb04 100644 --- a/usr/local/www/services_dhcpv6.php +++ b/usr/local/www/services_dhcpv6.php @@ -72,8 +72,8 @@ if($config['installedpackages']['olsrd']) { } if (!$_GET['if']) - $savemsg = "<p><b>" . gettext("The DHCPv6 Server can only be enabled on interfaces configured with static IP addresses") . ".</b></p>" . - "<p><b>" . gettext("Only interfaces configured with a static IP will be shown") . ".</b></p>"; + $savemsg = gettext("The DHCPv6 Server can only be enabled on interfaces configured with static IP addresses") . + gettext("Only interfaces configured with a static IP will be shown") . "."; $iflist = get_configured_interface_with_descr(); $iflist = array_merge($iflist, get_configured_pppoe_server_interfaces()); @@ -366,6 +366,7 @@ if ($_GET['act'] == "del") { } } +$closehead = false; $pgtitle = array(gettext("Services"),gettext("DHCPv6 server")); $shortcut_section = "dhcp6"; @@ -377,15 +378,18 @@ include("head.inc"); </script> <script type="text/javascript"> +//<![CDATA[ rowname[0] = "number"; rowtype[0] = "textbox"; rowsize[0] = "10"; rowname[1] = "value"; rowtype[1] = "textbox"; rowsize[1] = "55"; +//]]> </script> <script type="text/javascript"> +//<![CDATA[ function enable_change(enable_over) { var endis; endis = !(document.iform.enable.checked || enable_over); @@ -449,7 +453,9 @@ include("head.inc"); aodiv = document.getElementById('shownetboot'); aodiv.style.display = "block"; } +//]]> </script> +</head> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> @@ -468,7 +474,7 @@ include("head.inc"); <?php if (is_subsystem_dirty('staticmaps')): ?><p> <?php print_info_box_np(gettext("The static mapping configuration has been changed") . ".<br />" . gettext("You must apply the changes in order for them to take effect."));?><br /> <?php endif; ?> -<table width="100%" border="0" cellpadding="0" cellspacing="0"> +<table width="100%" border="0" cellpadding="0" cellspacing="0" summary="dhcpv6 server"> <tr><td> <?php /* active tabs */ @@ -524,11 +530,11 @@ display_top_tabs($tab_array); <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 width="22%" valign="top" class="vncellreq"><?=gettext("DHCPv6 Server");?></td> <td width="78%" class="vtable"> - <input name="enable" type="checkbox" value="yes" <?php if ($pconfig['enable']) echo "checked"; ?> onClick="enable_change(false);"> + <input name="enable" type="checkbox" value="yes" <?php if ($pconfig['enable']) echo "checked=\"checked\""; ?> onclick="enable_change(false);" /> <strong><?php printf(gettext("Enable DHCPv6 server on " . "%s " . "interface"),htmlspecialchars($iflist[$if]));?></strong></td> @@ -588,23 +594,23 @@ display_top_tabs($tab_array); <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Range");?></td> <td width="78%" class="vtable"> - <input name="range_from" type="text" class="formfld unknown" id="range_from" size="28" value="<?=htmlspecialchars($pconfig['range_from']);?>"> - <?=gettext("to"); ?> <input name="range_to" type="text" class="formfld unknown" id="range_to" size="28" value="<?=htmlspecialchars($pconfig['range_to']);?>"> + <input name="range_from" type="text" class="formfld unknown" id="range_from" size="28" value="<?=htmlspecialchars($pconfig['range_from']);?>" /> + <?=gettext("to"); ?> <input name="range_to" type="text" class="formfld unknown" id="range_to" size="28" value="<?=htmlspecialchars($pconfig['range_to']);?>" /> </td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Prefix Delegation Range");?></td> <td width="78%" class="vtable"> - <input name="prefixrange_from" type="text" class="formfld unknown" id="prefixrange_from" size="28" value="<?=htmlspecialchars($pconfig['prefixrange_from']);?>"> - <?=gettext("to"); ?> <input name="prefixrange_to" type="text" class="formfld unknown" id="prefixrange_to" size="28" value="<?=htmlspecialchars($pconfig['prefixrange_to']);?>"> + <input name="prefixrange_from" type="text" class="formfld unknown" id="prefixrange_from" size="28" value="<?=htmlspecialchars($pconfig['prefixrange_from']);?>" /> + <?=gettext("to"); ?> <input name="prefixrange_to" type="text" class="formfld unknown" id="prefixrange_to" size="28" value="<?=htmlspecialchars($pconfig['prefixrange_to']);?>" /> <br /><?=gettext("Prefix Delegation Size"); ?>: <select name="prefixrange_length" class="formselect" id="prefixrange_length"> - <option value="48" <?php if($pconfig['prefixrange_length'] == 48) echo "selected"; ?>>48</option> - <option value="52" <?php if($pconfig['prefixrange_length'] == 52) echo "selected"; ?>>52</option> - <option value="56" <?php if($pconfig['prefixrange_length'] == 56) echo "selected"; ?>>56</option> - <option value="60" <?php if($pconfig['prefixrange_length'] == 60) echo "selected"; ?>>60</option> - <option value="62" <?php if($pconfig['prefixrange_length'] == 62) echo "selected"; ?>>62</option> - <option value="63" <?php if($pconfig['prefixrange_length'] == 63) echo "selected"; ?>>63</option> - <option value="64" <?php if($pconfig['prefixrange_length'] == 64) echo "selected"; ?>>64</option> + <option value="48" <?php if($pconfig['prefixrange_length'] == 48) echo "selected=\"selected\""; ?>>48</option> + <option value="52" <?php if($pconfig['prefixrange_length'] == 52) echo "selected=\"selected\""; ?>>52</option> + <option value="56" <?php if($pconfig['prefixrange_length'] == 56) echo "selected=\"selected\""; ?>>56</option> + <option value="60" <?php if($pconfig['prefixrange_length'] == 60) echo "selected=\"selected\""; ?>>60</option> + <option value="62" <?php if($pconfig['prefixrange_length'] == 62) echo "selected=\"selected\""; ?>>62</option> + <option value="63" <?php if($pconfig['prefixrange_length'] == 63) echo "selected=\"selected\""; ?>>63</option> + <option value="64" <?php if($pconfig['prefixrange_length'] == 64) echo "selected=\"selected\""; ?>>64</option> </select> <br /> <?php echo gettext("You can define a Prefix range here for DHCP Prefix Delegation. This allows for assigning networks to subrouters. The start and end of the range must end on boundaries of the prefix delegation size."); ?> @@ -613,29 +619,29 @@ display_top_tabs($tab_array); <tr> <td width="22%" valign="top" class="vncell"><?=gettext("DNS servers");?></td> <td width="78%" class="vtable"> - <input name="dns1" type="text" class="formfld unknown" id="dns1" size="28" value="<?=htmlspecialchars($pconfig['dns1']);?>"><br /> - <input name="dns2" type="text" class="formfld unknown" id="dns2" size="28" value="<?=htmlspecialchars($pconfig['dns2']);?>"><br /> + <input name="dns1" type="text" class="formfld unknown" id="dns1" size="28" value="<?=htmlspecialchars($pconfig['dns1']);?>" /><br /> + <input name="dns2" type="text" class="formfld unknown" id="dns2" size="28" value="<?=htmlspecialchars($pconfig['dns2']);?>" /><br /> <?=gettext("NOTE: leave blank to use the system default DNS servers - this interface's IP if DNS forwarder is enabled, otherwise the servers configured on the General page.");?> </td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Domain name");?></td> <td width="78%" class="vtable"> - <input name="domain" type="text" class="formfld unknown" id="domain" size="28" value="<?=htmlspecialchars($pconfig['domain']);?>"><br /> + <input name="domain" type="text" class="formfld unknown" id="domain" size="28" value="<?=htmlspecialchars($pconfig['domain']);?>" /><br /> <?=gettext("The default is to use the domain name of this system as the default domain name provided by DHCP. You may specify an alternate domain name here.");?> </td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Domain search list");?></td> <td width="78%" class="vtable"> - <input name="domainsearchlist" type="text" class="formfld unknown" id="domainsearchlist" size="28" value="<?=htmlspecialchars($pconfig['domainsearchlist']);?>"><br /> + <input name="domainsearchlist" type="text" class="formfld unknown" id="domainsearchlist" size="28" value="<?=htmlspecialchars($pconfig['domainsearchlist']);?>" /><br /> <?=gettext("The DHCP server can optionally provide a domain search list. Use the semicolon character as separator");?> </td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Default lease time");?></td> <td width="78%" class="vtable"> - <input name="deftime" type="text" class="formfld unknown" id="deftime" size="10" value="<?=htmlspecialchars($pconfig['deftime']);?>"> + <input name="deftime" type="text" class="formfld unknown" id="deftime" size="10" value="<?=htmlspecialchars($pconfig['deftime']);?>" /> <?=gettext("seconds");?><br /> <?=gettext("This is used for clients that do not ask for a specific " . "expiration time."); ?><br /> @@ -645,7 +651,7 @@ display_top_tabs($tab_array); <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Maximum lease time");?></td> <td width="78%" class="vtable"> - <input name="maxtime" type="text" class="formfld unknown" id="maxtime" size="10" value="<?=htmlspecialchars($pconfig['maxtime']);?>"> + <input name="maxtime" type="text" class="formfld unknown" id="maxtime" size="10" value="<?=htmlspecialchars($pconfig['maxtime']);?>" /> <?=gettext("seconds");?><br /> <?=gettext("This is the maximum lease time for clients that ask". " for a specific expiration time."); ?><br /> @@ -655,10 +661,10 @@ display_top_tabs($tab_array); <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Time format change"); ?></td> <td width="78%" class="vtable"> - <table> + <table summary="time format change"> <tr> <td> - <input name="dhcpv6leaseinlocaltime" type="checkbox" id="dhcpv6leaseinlocaltime" value="yes" <?php if ($pconfig['dhcpv6leaseinlocaltime']) echo "checked"; ?>> + <input name="dhcpv6leaseinlocaltime" type="checkbox" id="dhcpv6leaseinlocaltime" value="yes" <?php if ($pconfig['dhcpv6leaseinlocaltime']) echo "checked=\"checked\""; ?> /> </td> <td> <strong> @@ -681,21 +687,22 @@ display_top_tabs($tab_array); <td width="22%" valign="top" class="vncell"><?=gettext("Dynamic DNS");?></td> <td width="78%" class="vtable"> <div id="showddnsbox"> - <input type="button" onClick="show_ddns_config()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show Dynamic DNS");?></a> + <input type="button" onclick="show_ddns_config()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show Dynamic DNS");?> </div> <div id="showddns" style="display:none"> - <input valign="middle" type="checkbox" value="yes" name="ddnsupdate" id="ddnsupdate" <?php if($pconfig['ddnsupdate']) echo " checked"; ?>> + <input style="vertical-align:middle" type="checkbox" value="yes" name="ddnsupdate" id="ddnsupdate" <?php if($pconfig['ddnsupdate']) echo " checked=\"checked\""; ?> /> <b><?=gettext("Enable registration of DHCP client names in DNS.");?></b><br /> <p> - <input name="ddnsdomain" type="text" class="formfld unknown" id="ddnsdomain" size="28" value="<?=htmlspecialchars($pconfig['ddnsdomain']);?>"><br /> + <input name="ddnsdomain" type="text" class="formfld unknown" id="ddnsdomain" size="28" value="<?=htmlspecialchars($pconfig['ddnsdomain']);?>" /><br /> <?=gettext("Note: Leave blank to disable dynamic DNS registration.");?><br /> <?=gettext("Enter the dynamic DNS domain which will be used to register client names in the DNS server.");?> - <input name="ddnsdomainprimary" type="text" class="formfld unknown" id="ddnsdomainprimary" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomainprimary']);?>"><br /> + <input name="ddnsdomainprimary" type="text" class="formfld unknown" id="ddnsdomainprimary" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomainprimary']);?>" /><br /> <?=gettext("Enter the primary domain name server IP address for the dynamic domain name.");?><br /> - <input name="ddnsdomainkeyname" type="text" class="formfld unknown" id="ddnsdomainkeyname" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomainkeyname']);?>"><br /> + <input name="ddnsdomainkeyname" type="text" class="formfld unknown" id="ddnsdomainkeyname" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomainkeyname']);?>" /><br /> <?=gettext("Enter the dynamic DNS domain key name which will be used to register client names in the DNS server.");?> - <input name="ddnsdomainkey" type="text" class="formfld unknown" id="ddnsdomainkey" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomainkey']);?>"><br /> + <input name="ddnsdomainkey" type="text" class="formfld unknown" id="ddnsdomainkey" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomainkey']);?>" /><br /> <?=gettext("Enter the dynamic DNS domain key secret which will be used to register client names in the DNS server.");?> + </p> </div> </td> </tr> @@ -703,11 +710,11 @@ display_top_tabs($tab_array); <td width="22%" valign="top" class="vncell"><?=gettext("NTP servers");?></td> <td width="78%" class="vtable"> <div id="showntpbox"> - <input type="button" onClick="show_ntp_config()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show NTP configuration");?></a> + <input type="button" onclick="show_ntp_config()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show NTP configuration");?> </div> <div id="showntp" style="display:none"> - <input name="ntp1" type="text" class="formfld unknown" id="ntp1" size="28" value="<?=htmlspecialchars($pconfig['ntp1']);?>"><br /> - <input name="ntp2" type="text" class="formfld unknown" id="ntp2" size="28" value="<?=htmlspecialchars($pconfig['ntp2']);?>"> + <input name="ntp1" type="text" class="formfld unknown" id="ntp1" size="28" value="<?=htmlspecialchars($pconfig['ntp1']);?>" /><br /> + <input name="ntp2" type="text" class="formfld unknown" id="ntp2" size="28" value="<?=htmlspecialchars($pconfig['ntp2']);?>" /> </div> </td> </tr> @@ -716,10 +723,10 @@ display_top_tabs($tab_array); <td width="22%" valign="top" class="vncell"><?=gettext("TFTP server");?></td> <td width="78%" class="vtable"> <div id="showtftpbox"> - <input type="button" onClick="show_tftp_config()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show TFTP configuration");?></a> + <input type="button" onclick="show_tftp_config()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show TFTP configuration");?> </div> <div id="showtftp" style="display:none"> - <input name="tftp" type="text" class="formfld unknown" id="tftp" size="50" value="<?=htmlspecialchars($pconfig['tftp']);?>"><br /> + <input name="tftp" type="text" class="formfld unknown" id="tftp" size="50" value="<?=htmlspecialchars($pconfig['tftp']);?>" /><br /> <?=gettext("Leave blank to disable. Enter a full hostname or IP for the TFTP server.");?> </div> </td> @@ -729,10 +736,10 @@ display_top_tabs($tab_array); <td width="22%" valign="top" class="vncell"><?=gettext("LDAP URI");?></td> <td width="78%" class="vtable"> <div id="showldapbox"> - <input type="button" onClick="show_ldap_config()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show LDAP configuration");?></a> + <input type="button" onclick="show_ldap_config()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show LDAP configuration");?> </div> <div id="showldap" style="display:none"> - <input name="ldap" type="text" class="formfld unknown" id="ldap" size="80" value="<?=htmlspecialchars($pconfig['ldap']);?>"><br /> + <input name="ldap" type="text" class="formfld unknown" id="ldap" size="80" value="<?=htmlspecialchars($pconfig['ldap']);?>" /><br /> <?=gettext("Leave blank to disable. Enter a full URI for the LDAP server in the form ldap://ldap.example.com/dc=example,dc=com");?> </div> </td> @@ -741,14 +748,14 @@ display_top_tabs($tab_array); <td width="22%" valign="top" class="vncell"><?=gettext("Enable network booting");?></td> <td width="78%" class="vtable"> <div id="shownetbootbox"> - <input type="button" onClick="show_netboot_config()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show Network booting");?></a> + <input type="button" onclick="show_netboot_config()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show Network booting");?> </div> <div id="shownetboot" style="display:none"> - <input valign="middle" type="checkbox" value="yes" name="netboot" id="netboot" <?php if($pconfig['netboot']) echo " checked"; ?>> + <input style="vertical-align:middle" type="checkbox" value="yes" name="netboot" id="netboot" <?php if($pconfig['netboot']) echo " checked=\"checked\""; ?> /> <b><?=gettext("Enables network booting.");?></b> <p> <?=gettext("Enter the Bootfile URL");?> - <input name="bootfile_url" type="text" class="formfld unknown" id="bootfile_url" size="28" value="<?=htmlspecialchars($pconfig['bootfile_url']);?>"> + <input name="bootfile_url" type="text" class="formfld unknown" id="bootfile_url" size="28" value="<?=htmlspecialchars($pconfig['bootfile_url']);?>" /> </div> </td> </tr> @@ -756,15 +763,15 @@ display_top_tabs($tab_array); <td width="22%" valign="top" class="vncell"><?=gettext("Additional BOOTP/DHCP Options");?></td> <td width="78%" class="vtable"> <div id="shownumbervaluebox"> - <input type="button" onClick="show_shownumbervalue()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show Additional BOOTP/DHCP Options");?></a> + <input type="button" onclick="show_shownumbervalue()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show Additional BOOTP/DHCP Options");?> </div> <div id="shownumbervalue" style="display:none"> - <table id="maintable"> + <table id="maintable" summary="bootp-dhcp options"> <tbody> <tr> <td colspan="3"> <div style="padding:5px; margin-top: 16px; margin-bottom: 16px; border:1px dashed #000066; background-color: #ffffff; color: #000000; font-size: 8pt;" id="itemhelp"> - <?=gettext("Enter the DHCP option number and the value for each item you would like to include in the DHCP lease information. For a list of available options please visit this"); ?> <a href="http://www.iana.org/assignments/bootp-dhcp-parameters/" target="_new"><?=gettext("URL"); ?></a> + <?=gettext("Enter the DHCP option number and the value for each item you would like to include in the DHCP lease information. For a list of available options please visit this"); ?> <a href="http://www.iana.org/assignments/bootp-dhcp-parameters/" target="_blank"><?=gettext("URL"); ?></a> </div> </td> </tr> @@ -795,17 +802,17 @@ display_top_tabs($tab_array); <?php $counter++; ?> <?php endforeach; ?> </tbody> - <tfoot> - </tfoot> </table> <a onclick="javascript:addRowTo('maintable', 'formfldalias'); return false;" href="#"> <img border="0" src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" alt="" title="<?=gettext("add another entry");?>" /> </a> <script type="text/javascript"> + //<![CDATA[ field_counter_js = 2; rows = 1; totalrows = <?php echo $counter; ?>; loaded = <?php echo $counter; ?>; + //]]> </script> </div> @@ -814,8 +821,8 @@ display_top_tabs($tab_array); <tr> <td width="22%" valign="top"> </td> <td width="78%"> - <input name="if" type="hidden" value="<?=$if;?>"> - <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" onclick="enable_change(true)"> + <input name="if" type="hidden" value="<?=$if;?>" /> + <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" onclick="enable_change(true)" /> </td> </tr> <tr> @@ -832,7 +839,7 @@ display_top_tabs($tab_array); </td> </tr> </table> - <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> + <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0" summary="static mappings"> <tr> <td colspan="4" valign="top" class="listtopic"><?=gettext("DHCPv6 Static Mappings for this interface.");?></td> <td> </td> @@ -843,10 +850,10 @@ display_top_tabs($tab_array); <td width="20%" class="listhdrr"><?=gettext("Hostname");?></td> <td width="30%" class="listhdr"><?=gettext("Description");?></td> <td width="10%" class="list"> - <table border="0" cellspacing="0" cellpadding="1"> + <table border="0" cellspacing="0" cellpadding="1" summary="add"> <tr> <td valign="middle" width="17"></td> - <td valign="middle"><a href="services_dhcpv6_edit.php?if=<?=$if;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td> + <td valign="middle"><a href="services_dhcpv6_edit.php?if=<?=$if;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="add" /></a></td> </tr> </table> </td> @@ -855,23 +862,23 @@ display_top_tabs($tab_array); <?php $i = 0; foreach ($a_maps as $mapent): ?> <?php if($mapent['duid'] <> "" or $mapent['ipaddrv6'] <> ""): ?> <tr> - <td class="listlr" ondblclick="document.location='services_dhcpv6_edit.php?if=<?=$if;?>&id=<?=$i;?>';"> + <td class="listlr" ondblclick="document.location='services_dhcpv6_edit.php?if=<?=$if;?>&id=<?=$i;?>';"> <?=htmlspecialchars($mapent['duid']);?> </td> - <td class="listr" ondblclick="document.location='services_dhcpv6_edit.php?if=<?=$if;?>&id=<?=$i;?>';"> + <td class="listr" ondblclick="document.location='services_dhcpv6_edit.php?if=<?=$if;?>&id=<?=$i;?>';"> <?=htmlspecialchars($mapent['ipaddrv6']);?> </td> - <td class="listr" ondblclick="document.location='services_dhcpv6_edit.php?if=<?=$if;?>&id=<?=$i;?>';"> + <td class="listr" ondblclick="document.location='services_dhcpv6_edit.php?if=<?=$if;?>&id=<?=$i;?>';"> <?=htmlspecialchars($mapent['hostname']);?> </td> - <td class="listbg" ondblclick="document.location='services_dhcpv6_edit.php?if=<?=$if;?>&id=<?=$i;?>';"> + <td class="listbg" ondblclick="document.location='services_dhcpv6_edit.php?if=<?=$if;?>&id=<?=$i;?>';"> <?=htmlspecialchars($mapent['descr']);?> </td> <td valign="middle" nowrap="nowrap" class="list"> - <table border="0" cellspacing="0" cellpadding="1"> + <table border="0" cellspacing="0" cellpadding="1" summary="icons"> <tr> - <td valign="middle"><a href="services_dhcpv6_edit.php?if=<?=$if;?>&id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0"></a></td> - <td valign="middle"><a href="services_dhcpv6.php?if=<?=$if;?>&act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this mapping?");?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td> + <td valign="middle"><a href="services_dhcpv6_edit.php?if=<?=$if;?>&id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" alt="edit" /></a></td> + <td valign="middle"><a href="services_dhcpv6.php?if=<?=$if;?>&act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this mapping?");?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="delete" /></a></td> </tr> </table> </td> @@ -882,10 +889,10 @@ display_top_tabs($tab_array); <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"></td> - <td valign="middle"><a href="services_dhcpv6_edit.php?if=<?=$if;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td> + <td valign="middle"><a href="services_dhcpv6_edit.php?if=<?=$if;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="add" /></a></td> </tr> </table> </td> @@ -897,9 +904,9 @@ display_top_tabs($tab_array); </table> </form> <script type="text/javascript"> -<!-- +//<![CDATA[ enable_change(false); -//--> +//]]> </script> <?php include("fend.inc"); ?> </body> diff --git a/usr/local/www/services_dhcpv6_edit.php b/usr/local/www/services_dhcpv6_edit.php index e049af5..9e1bbef 100644 --- a/usr/local/www/services_dhcpv6_edit.php +++ b/usr/local/www/services_dhcpv6_edit.php @@ -187,14 +187,14 @@ include("head.inc"); <?php include("fbegin.inc"); ?> <?php if ($input_errors) print_input_errors($input_errors); ?> <form action="services_dhcpv6_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="static mapping"> <tr> <td colspan="2" valign="top" class="listtopic"><?=gettext("Static DHCPv6 Mapping");?></td> </tr> <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("DUID Identifier");?></td> <td width="78%" class="vtable"> - <input name="duid" type="text" class="formfld unknown" id="duid" size="40" value="<?=htmlspecialchars($pconfig['duid']);?>"> + <input name="duid" type="text" class="formfld unknown" id="duid" size="40" value="<?=htmlspecialchars($pconfig['duid']);?>" /> <br /> <span class="vexpl"><?=gettext("Enter a DUID Identifier in the following format: ");?><br /> "DUID-LLT - ETH -- TIME --- ---- address ----" <br /> @@ -203,7 +203,7 @@ include("head.inc"); <tr> <td width="22%" valign="top" class="vncell"><?=gettext("IPv6 address");?></td> <td width="78%" class="vtable"> - <input name="ipaddrv6" type="text" class="formfld unknown" id="ipaddrv6" size="28" value="<?=htmlspecialchars($pconfig['ipaddrv6']);?>"> + <input name="ipaddrv6" type="text" class="formfld unknown" id="ipaddrv6" size="28" value="<?=htmlspecialchars($pconfig['ipaddrv6']);?>" /> <br /> <?=gettext("If an IPv6 address is entered, the address must be outside of the pool.");?> <br /> @@ -213,38 +213,38 @@ include("head.inc"); <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Hostname");?></td> <td width="78%" class="vtable"> - <input name="hostname" type="text" class="formfld unknown" id="hostname" size="28" value="<?=htmlspecialchars($pconfig['hostname']);?>"> + <input name="hostname" type="text" class="formfld unknown" id="hostname" size="28" value="<?=htmlspecialchars($pconfig['hostname']);?>" /> <br /> <span class="vexpl"><?=gettext("Name of the host, without domain part.");?></span></td> </tr> <?php if($netboot_enabled) { ?> <tr> <td width="22%" valign="top" class="vncell">Netboot filename</td> <td width="78%" class="vtable"> - <input name="filename" type="text" class="formfld unknown" id="filename" size="28" value="<?=htmlspecialchars($pconfig['filename']);?>"> + <input name="filename" type="text" class="formfld unknown" id="filename" size="28" value="<?=htmlspecialchars($pconfig['filename']);?>" /> <br /> <span class="vexpl">Name of the file that should be loaded when this host boots off of the network, overrides setting on main page.</span></td> </tr> <tr> <td width="22%" valign="top" class="vncell">Root Path</td> <td width="78%" class="vtable"> - <input name="rootpath" type="text" class="formfld unknown" id="rootpath" size="90" value="<?=htmlspecialchars($pconfig['rootpath']);?>"> + <input name="rootpath" type="text" class="formfld unknown" id="rootpath" size="90" value="<?=htmlspecialchars($pconfig['rootpath']);?>" /> <br /> <span class="vexpl"><?=gettext("Enter the"); ?> <b><?=gettext("root-path"); ?></b>-<?=gettext("string");?>, overrides setting on main page.</span></td> </tr> <?php } ?> <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']);?>"> + <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"> </td> <td width="78%"> - <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>"> <input class="formbtn" type="button" value="<?=gettext("Cancel");?>" onclick="history.back()"> + <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" /> <input class="formbtn" type="button" value="<?=gettext("Cancel");?>" onclick="history.back()" /> <?php if (isset($id) && $a_maps[$id]): ?> - <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>"> + <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" /> <?php endif; ?> - <input name="if" type="hidden" value="<?=htmlspecialchars($if);?>"> + <input name="if" type="hidden" value="<?=htmlspecialchars($if);?>" /> </td> </tr> </table> |
