diff options
| -rwxr-xr-x | usr/local/www/carp_status.php | 20 | ||||
| -rwxr-xr-x | usr/local/www/firewall_nat.php | 21 | ||||
| -rwxr-xr-x | usr/local/www/firewall_nat_1to1.php | 22 | ||||
| -rwxr-xr-x | usr/local/www/firewall_nat_out.php | 15 | ||||
| -rwxr-xr-x | usr/local/www/firewall_nat_server.php | 24 | ||||
| -rwxr-xr-x | usr/local/www/firewall_rules.php | 46 | ||||
| -rwxr-xr-x | usr/local/www/firewall_shaper.php | 23 | ||||
| -rwxr-xr-x | usr/local/www/firewall_shaper_queues.php | 20 | ||||
| -rwxr-xr-x | usr/local/www/interfaces_assign.php | 16 | ||||
| -rwxr-xr-x | usr/local/www/interfaces_vlan.php | 16 | ||||
| -rwxr-xr-x | usr/local/www/pkg_mgr.php | 14 | ||||
| -rwxr-xr-x | usr/local/www/pkg_mgr_installed.php | 19 | ||||
| -rwxr-xr-x | usr/local/www/services_captiveportal.php | 12 | ||||
| -rwxr-xr-x | usr/local/www/services_captiveportal_ip.php | 12 | ||||
| -rwxr-xr-x | usr/local/www/services_captiveportal_mac.php | 12 | ||||
| -rwxr-xr-x | usr/local/www/services_captiveportal_users.php | 18 | ||||
| -rwxr-xr-x | usr/local/www/services_dhcp.php | 16 | ||||
| -rwxr-xr-x | usr/local/www/services_dhcp_relay.php | 14 |
18 files changed, 130 insertions, 210 deletions
diff --git a/usr/local/www/carp_status.php b/usr/local/www/carp_status.php index fd0895b..ca0df25 100755 --- a/usr/local/www/carp_status.php +++ b/usr/local/www/carp_status.php @@ -68,7 +68,6 @@ include("fbegin.inc"); <form action="carp_status.php" method="post"> <?php if ($savemsg) print_info_box($savemsg); ?> -<div id="mainarea"> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td> @@ -80,8 +79,10 @@ include("fbegin.inc"); display_top_tabs($tab_array); ?> </td></tr> -<tr><td class="tabcont"> - +<tr><td> +<div id="mainarea"> +<table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0"> +<tr><td> <?php if($status == false) { $carp_enabled = false; @@ -90,9 +91,10 @@ include("fbegin.inc"); $carp_enabled = true; echo "<input type=\"submit\" name=\"disablecarp\" id=\"disablecarp\" value=\"Disable Carp\">"; } +echo "</td></tr></table>"; if(!is_array($config['installedpackages']['carp']['config'])) { - echo "</td></tr></table><center><br>Could not locate any defined CARP interfaces."; + echo "</div></td></tr></table><center><br>Could not locate any defined CARP interfaces."; echo "</center>"; include("fend.inc"); @@ -103,7 +105,7 @@ if(!is_array($config['installedpackages']['carp']['config'])) { <p> -<table width="100%" border="0" cellpadding="6" cellspacing="0"> +<table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0"> </tr> <tr> <td class="listhdrr"><b><center>Carp Interface</center></b></td> @@ -161,16 +163,10 @@ if($config['installedpackages']['carp']['config'] <> "") </center> </td></tr> </table> +</div> </td></tr> </table> -</div> <?php include("fend.inc"); ?> -<script type="text/javascript"> -NiftyCheck(); -Rounded("div#mainarea","bl br","#FFF","#eeeeee","smooth"); -</script> - </body> </html> - diff --git a/usr/local/www/firewall_nat.php b/usr/local/www/firewall_nat.php index cf11e19..01d127d 100755 --- a/usr/local/www/firewall_nat.php +++ b/usr/local/www/firewall_nat.php @@ -139,7 +139,6 @@ include("head.inc"); <?php if (file_exists($d_natconfdirty_path)): ?><p> <?php print_info_box_np("The NAT configuration has been changed.<br>You must apply the changes in order for them to take effect.");?> <?php endif; ?> -<div id="mainarea"> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td> <?php @@ -153,8 +152,9 @@ include("head.inc"); ?> </td></tr> <tr> - <td class="tabcont"> - <table width="100%" border="0" cellpadding="0" cellspacing="0"> + <td> + <div id="mainarea"> + <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> <tr id="frheader"> <td width="3%" class="list"> </td> <td width="3%" class="list"> </td> @@ -235,14 +235,17 @@ include("head.inc"); <td><?php if ($nnats == 0): ?><img src="x_d.gif" width="17" height="17" title="delete selected rules" border="0"><?php else: ?><input name="del" type="image" src="x.gif" width="17" height="17" title="delete selected mappings" onclick="return confirm('Do you really want to delete the selected mappings?')"><?php endif; ?></td> </tr> </table></td> - </tr> </table> - <p><span class="vexpl"><span class="red"><strong>Note:<br> + </tr> + <tr><td colspan="8"><p><span class="vexpl"><span class="red"><strong>Note:<br> </strong></span>It is not possible to access NATed services using the WAN IP address from within the LAN (or an optional network).</span></p></td> + </tr> + </table> + </div> + </td> </tr> </table> -</div> <?php if ($pkg['tabs'] <> "") { @@ -252,11 +255,5 @@ if ($pkg['tabs'] <> "") { </form> <?php include("fend.inc"); ?> - -<script type="text/javascript"> -NiftyCheck(); -Rounded("div#mainarea","bl br","#FFF","#eeeeee","smooth"); -</script> - </body> </html> diff --git a/usr/local/www/firewall_nat_1to1.php b/usr/local/www/firewall_nat_1to1.php index 14d985e..9147eb4 100755 --- a/usr/local/www/firewall_nat_1to1.php +++ b/usr/local/www/firewall_nat_1to1.php @@ -82,7 +82,6 @@ include("head.inc"); <?php if (file_exists($d_natconfdirty_path)): ?><p> <?php print_info_box_np("The NAT configuration has been changed.<br>You must apply the changes in order for them to take effect.");?><br> <?php endif; ?> -<div id="mainarea"> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td> <?php $tab_array = array(); @@ -95,8 +94,9 @@ include("head.inc"); ?> </td></tr> <tr> - <td class="tabcont"> - <table width="100%" border="0" cellpadding="0" cellspacing="0"> + <td> + <div id="mainarea"> + <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> <td width="10%" class="listhdrr">Interface</td> <td width="20%" class="listhdrr">External IP</td> @@ -145,18 +145,18 @@ include("head.inc"); </table> </td> </tr> - </table> - <p><span class="vexpl"><span class="red"><strong>Note:<br> + <tr> + <td colspan="4"> + <p><span class="vexpl"><span class="red"><strong>Note:<br> </strong></span>Depending on the way your WAN connection is setup, you may also need <a href="services_proxyarp.php">proxy ARP</a>.</span></p> -</td> + </td> + <tr> + </table> + </div> + </td> </tr> </table> -</div> </form> <?php include("fend.inc"); ?> -<script type="text/javascript"> -NiftyCheck(); -Rounded("div#mainarea","bl br","#FFF","#eeeeee","smooth"); -</script> </body> </html> diff --git a/usr/local/www/firewall_nat_out.php b/usr/local/www/firewall_nat_out.php index b3796c8..f8a3f2a 100755 --- a/usr/local/www/firewall_nat_out.php +++ b/usr/local/www/firewall_nat_out.php @@ -186,7 +186,6 @@ include("head.inc"); <?php if (file_exists($d_natconfdirty_path)): ?><p> <?php print_info_box_np("The NAT configuration has been changed.<br>You must apply the changes in order for them to take effect.");?><br> <?php endif; ?> -<div id="mainarea"> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td> <?php $tab_array = array(); @@ -199,8 +198,9 @@ include("head.inc"); ?> </td></tr> <tr> - <td class="tabcont"> - <table width="100%" border="0" cellpadding="6" cellspacing="0"> + <td> + <div id="mainarea"> + <table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0"> <tr> <td class="vtable"><p> <input name="ipsecpassthru" type="checkbox" id="ipsecpassthru" value="yes" onClick="document.iform.advancedoutbound.checked=false" <?php if (isset($config['nat']['ipsecpassthru']['enable'])) echo "checked";?>> @@ -228,8 +228,7 @@ include("head.inc"); </td> </tr> </table> - <br> - <table width="100%" border="0" cellpadding="0" cellspacing="0"> + <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> <tr id="frheader"> <td width="3%" class="list"> </td> <td width="3%" class="list"> </td> @@ -321,15 +320,11 @@ include("head.inc"); </table></td> </tr> </table> + </div> </td> </tr> </table> -</div> </form> <?php include("fend.inc"); ?> -<script type="text/javascript"> -NiftyCheck(); -Rounded("div#mainarea","bl br","#FFF","#eeeeee","smooth"); -</script> </body> </html> diff --git a/usr/local/www/firewall_nat_server.php b/usr/local/www/firewall_nat_server.php index 893981b..8c58b7e 100755 --- a/usr/local/www/firewall_nat_server.php +++ b/usr/local/www/firewall_nat_server.php @@ -95,7 +95,6 @@ include("head.inc"); <?php if (file_exists($d_natconfdirty_path)): ?><p> <?php print_info_box_np("The NAT configuration has been changed.<br>You must apply the changes in order for them to take effect.");?><br> <?php endif; ?> -<div id="mainarea"> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td> <?php $tab_array = array(); @@ -108,8 +107,9 @@ include("head.inc"); ?> </td></tr> <tr> - <td class="tabcont"> - <table width="80%" border="0" cellpadding="0" cellspacing="0"> + <td> + <div id="mainarea"> + <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> <td width="40%" class="listhdrr">External IP address</td> <td width="50%" class="listhdr">Description</td> @@ -143,18 +143,16 @@ include("head.inc"); </table> </td> </tr> - </table> - <p><span class="vexpl"><span class="red"><strong>Note:<br> + <tr> + <td colspan="2"> + <p><span class="vexpl"><span class="red"><strong>Note:<br> </strong></span>The external IP addresses defined on this page may be used in <a href="firewall_nat.php">inbound NAT</a> mappings. Depending on the way your WAN connection is setup, you may also need <a href="services_proxyarp.php">proxy ARP</a>.</span></p> -</td> - </tr> -</table> -</div> + </td> + </tr> + </table> + </div> + </table> </form> <?php include("fend.inc"); ?> -<script type="text/javascript"> -NiftyCheck(); -Rounded("div#mainarea","bl br","#FFF","#eeeeee","smooth"); -</script> </body> </html> diff --git a/usr/local/www/firewall_rules.php b/usr/local/www/firewall_rules.php index ebb3476..cb0fc3b 100755 --- a/usr/local/www/firewall_rules.php +++ b/usr/local/www/firewall_rules.php @@ -158,7 +158,6 @@ include("head.inc"); <?php if (file_exists($d_filterconfdirty_path)): ?><p> <?php print_info_box_np("The firewall rule configuration has been changed.<br>You must apply the changes in order for them to take effect.");?><br> <?php endif; ?> -<div id="mainarea"> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td class="tabnavtbl"> <?php @@ -175,8 +174,9 @@ include("head.inc"); ?> </td></tr> <tr> - <td class="tabcont"> - <table width="100%" border="0" cellpadding="0" cellspacing="0"> + <td> + <div id="mainarea"> + <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> <tr id="frheader"> <td width="3%" class="list"> </td> <td width="5%" class="list"> </td> @@ -288,7 +288,7 @@ include("head.inc"); </td> </tr> </table> - <table border="0" cellspacing="0" cellpadding="0"> + <table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> <td width="16"><img src="pass.gif" width="11" height="11"></td> <td>pass</td> @@ -303,26 +303,20 @@ include("head.inc"); <td>log</td> </tr> <tr> - <td colspan="5" height="4"></td> - </tr> - <tr> <td><img src="pass_d.gif" width="11" height="11"></td> - <td>pass (disabled)</td> - <td></td> + <td nowrap>pass (disabled)</td> + <td> </td> <td><img src="block_d.gif" width="11" height="11"></td> - <td>block (disabled)</td> - <td></td> + <td nowrap>block (disabled)</td> + <td> </td> <td><img src="reject_d.gif" width="11" height="11"></td> - <td>reject (disabled)</td> - <td></td> + <td nowrap>reject (disabled)</td> + <td> </td> <td width="16"><img src="log_d.gif" width="11" height="11"></td> - <td>log (disabled)</td> + <td nowrap>log (disabled)</td> </tr> - </table> - </td> - </tr> -</table> -</div> + <tr> + <td colspan="9"> <p> <strong><span class="red">Hint:<br> </span></strong>Rules are evaluated on a first-match basis (i.e. @@ -330,15 +324,15 @@ include("head.inc"); This means that if you use block rules, you'll have to pay attention to the rule order. Everything that isn't explicitly passed is blocked by default.</p> + </td> + </tr> + </table> + </div> + </td> + </tr> +</table> <input type="hidden" name="if" value="<?=$if;?>"> </form> <?php include("fend.inc"); ?> - - -<script type="text/javascript"> -NiftyCheck(); -Rounded("div#mainarea","bl br","#FFF","#eeeeee","smooth"); -</script> - </body> </html> diff --git a/usr/local/www/firewall_shaper.php b/usr/local/www/firewall_shaper.php index cf8067e..f954216 100755 --- a/usr/local/www/firewall_shaper.php +++ b/usr/local/www/firewall_shaper.php @@ -194,7 +194,6 @@ include("head.inc"); <?php if (file_exists($d_shaperconfdirty_path)): ?><p> <?php print_info_box_np("The traffic shaper configuration has been changed.<br>You must apply the changes in order for them to take effect.");?><br> <?php endif; ?> -<div id="mainarea"> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td> <?php @@ -206,8 +205,9 @@ include("head.inc"); ?> </td></tr> <tr> - <td class="tabcont"> - <table width="100%" border="0" cellpadding="6" cellspacing="0"> + <td> + <div id="mainarea"> + <table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0"> <tr> <td class="vtable"><p> <input name="enable" type="checkbox" id="enable" value="yes" <?php if ($pconfig['enable'] == "yes") echo "checked";?>> @@ -222,8 +222,7 @@ include("head.inc"); </tr> </table> - <br> - <table width="100%" border="0" cellpadding="0" cellspacing="0"> + <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> <tr id="frheader"> <td width="3%" class="list"> </td> <td width="3%" class="list"> </td> @@ -312,20 +311,18 @@ include("head.inc"); <td class="list" colspan="8"></td> <td class="list"> <a href="firewall_shaper_edit.php"><img src="plus.gif" width="17" height="17" border="0"></a></td> </tr> - </table> - - <p><span class="red"><strong>Note:</strong></span><strong><br> + <tr> + <td colspan="8"><p><span class="red"><strong>Note:</strong></span><strong><br> </strong>the first rule that matches a packet will be executed.<br> The following match patterns are not shown in the list above: IP packet length, TCP flags.</td> + </tr> + </table> + </div> + </td> </tr> </table> -</div> </form> <?php include("fend.inc"); ?> -<script type="text/javascript"> -NiftyCheck(); -Rounded("div#mainarea","bl br","#FFF","#eeeeee","smooth"); -</script> </body> </html> diff --git a/usr/local/www/firewall_shaper_queues.php b/usr/local/www/firewall_shaper_queues.php index 4a81fb5..01fbb42 100755 --- a/usr/local/www/firewall_shaper_queues.php +++ b/usr/local/www/firewall_shaper_queues.php @@ -115,7 +115,6 @@ include("head.inc"); <?php if (file_exists($d_shaperconfdirty_path)): ?><p> <?php print_info_box_np("The traffic shaper configuration has been changed.<br>You must apply the changes in order for them to take effect.");?><br> <?php endif; ?> -<div id="mainarea"> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td> <?php @@ -127,8 +126,9 @@ include("head.inc"); ?> </td></tr> <tr> - <td class="tabcont"> - <table width="100%" border="0" cellpadding="0" cellspacing="0"> + <td> + <div id="mainarea"> + <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> <td width="5%" class="listhdrr">No.</td> <td width="5%" class="listhdrr">Flags</td> @@ -193,21 +193,19 @@ include("head.inc"); </table> </td> </tr> - </table> + <tr><td colspan="6"> <p> <strong><span class="red">Note:</span></strong><strong><br></strong> - A queue can only be deleted if it is not referenced by any rules.<br> - </td> + A queue can only be deleted if it is not referenced by any rules. </p> + </td></tr> + </table> + </div> + </td> </tr> </table> </div> </form> <?php include("fend.inc"); ?> -<script type="text/javascript"> -NiftyCheck(); -Rounded("div#mainarea","bl br","#FFF","#eeeeee","smooth"); -</script> </body> </html> - diff --git a/usr/local/www/interfaces_assign.php b/usr/local/www/interfaces_assign.php index 1c1e72d..8e8cdc5 100755 --- a/usr/local/www/interfaces_assign.php +++ b/usr/local/www/interfaces_assign.php @@ -188,7 +188,6 @@ include("head.inc"); <?php if ($input_errors) print_input_errors($input_errors); ?> <?php if (file_exists($d_sysrebootreqd_path)) print_info_box(get_std_save_message(0)); ?> <form action="interfaces_assign.php" method="post" name="iform" id="iform"> -<div id="mainarea"> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td class="tabnavtbl"> <?php @@ -199,9 +198,10 @@ include("head.inc"); ?> </td></tr> <tr> - <td class="tabcont"> - <table border="0" cellpadding="0" cellspacing="0"> - <tr> + <td> + <div id="mainarea"> + <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> + <tr> <td class="listhdrr">Interface</td> <td class="listhdr">Network port</td> <td class="list"> </td> @@ -250,6 +250,7 @@ include("head.inc"); </tr> <?php endif; ?> </table> +</div> <input name="Submit" type="submit" class="formbtn" value="Save"><br><br> <p><span class="vexpl"><strong><span class="red">Warning:</span><br> </strong>After you click "Save", you must reboot the firewall to make the changes take effect. You may also have to do one or more of the following steps before you can access your firewall again: </span></p> @@ -260,14 +261,7 @@ include("head.inc"); </ul></td> </tr> </table> -</div> </form> <?php include("fend.inc"); ?> - -<script type="text/javascript"> -NiftyCheck(); -Rounded("div#mainarea","bl br","#FFF","#eeeeee","smooth"); -</script> - </body> </html> diff --git a/usr/local/www/interfaces_vlan.php b/usr/local/www/interfaces_vlan.php index ca6eca1..4e11750 100755 --- a/usr/local/www/interfaces_vlan.php +++ b/usr/local/www/interfaces_vlan.php @@ -95,7 +95,6 @@ include("head.inc"); <p class="pgtitle"><?=$pgtitle?></p> <?php if ($input_errors) print_input_errors($input_errors); ?> <?php if (file_exists($d_sysrebootreqd_path)) print_info_box(get_std_save_message(0)); ?> -<div id="mainarea"> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td> <?php @@ -106,8 +105,9 @@ include("head.inc"); ?> </td></tr> <tr> - <td class="tabcont"> -<table width="100%" border="0" cellpadding="0" cellspacing="0"> + <td> + <div id="mainarea"> + <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> <td width="20%" class="listhdrr">Interface</td> <td width="20%" class="listhdrr">VLAN tag</td> @@ -142,16 +142,10 @@ include("head.inc"); <td class="list"> </td> </tr> </table> - </td> + </div> + </td> </tr> </table> -</div> <?php include("fend.inc"); ?> - -<script type="text/javascript"> -NiftyCheck(); -Rounded("div#mainarea","bl br","#FFF","#eeeeee","smooth"); -</script> - </body> </html> diff --git a/usr/local/www/pkg_mgr.php b/usr/local/www/pkg_mgr.php index a940406..4d1952c 100755 --- a/usr/local/www/pkg_mgr.php +++ b/usr/local/www/pkg_mgr.php @@ -71,7 +71,6 @@ $pkg_sizes = get_pkg_sizes(); ?> -<div id="mainarea"> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td> <?php $tab_array = array(); @@ -81,8 +80,9 @@ $pkg_sizes = get_pkg_sizes(); ?> </td></tr> <tr> - <td class="tabcont"> - <table width="100%" border="0" cellpadding="6" cellspacing="0"> + <td> + <div id="mainarea"> + <table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0"> <tr> <td width="10%" class="listhdrr">Package Name</td> <td width="25%" class="listhdrr">Category</td> @@ -141,16 +141,10 @@ $pkg_sizes = get_pkg_sizes(); } ?> </table> + </div> </td> </tr> </table> -</div> <?php include("fend.inc"); ?> - -<script type="text/javascript"> -NiftyCheck(); -Rounded("div#mainarea","bl br","#FFF","#eeeeee","smooth"); -</script> - </body> </html> diff --git a/usr/local/www/pkg_mgr_installed.php b/usr/local/www/pkg_mgr_installed.php index 609c72d..6a4d16b 100755 --- a/usr/local/www/pkg_mgr_installed.php +++ b/usr/local/www/pkg_mgr_installed.php @@ -47,7 +47,6 @@ include("head.inc"); <?php include("fbegin.inc"); ?> <p class="pgtitle"><?=$pgtitle?></p> <?php if ($savemsg) print_info_box($savemsg); ?> -<div id="mainarea"> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td> <?php $tab_array = array(); @@ -57,8 +56,9 @@ include("head.inc"); ?> </td></tr> <tr> - <td class="tabcont"> - <table width="100%" border="0" cellpadding="6" cellspacing="0"> + <td> + <div id="mainarea"> + <table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0"> <tr> <td width="15%" class="listhdrr">Package Name</td> <td width="20%" class="listhdrr">Category</td> @@ -150,20 +150,11 @@ include("head.inc"); } ?> </table> + </div> </td> </tr> </table> -</div> <?php include("fend.inc"); ?> - -<script type="text/javascript"> -NiftyCheck(); -Rounded("div#mainarea","bl br","#FFF","#eeeeee","smooth"); -</script> - </body> </html> - -<?php - conf_mount_ro(); -?> +<?php conf_mount_ro(); ?> diff --git a/usr/local/www/services_captiveportal.php b/usr/local/www/services_captiveportal.php index a215147..3501358 100755 --- a/usr/local/www/services_captiveportal.php +++ b/usr/local/www/services_captiveportal.php @@ -280,7 +280,6 @@ function enable_change(enable_change) { <?php if ($input_errors) print_input_errors($input_errors); ?> <?php if ($savemsg) print_info_box($savemsg); ?> <form action="services_captiveportal.php" method="post" enctype="multipart/form-data" name="iform" id="iform"> -<div id="mainarea"> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td class="tabnavtbl"> <?php @@ -293,8 +292,9 @@ function enable_change(enable_change) { ?> </td></tr> <tr> - <td class="tabcont"> - <table width="100%" border="0" cellpadding="6" cellspacing="0"> + <td> + <div id="mainarea"> + <table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0"> <tr> <td width="22%" valign="top" class="vtable"> </td> <td width="78%" class="vtable"> @@ -452,10 +452,10 @@ The contents of the HTML file that you upload here are displayed when an authent </strong></span>Changing any settings on this page will disconnect all clients! Don't forget to enable the DHCP server on your captive portal interface! Make sure that the default/maximum DHCP lease time is higher than the timeout entered on this page. Also, the DNS forwarder needs to be enabled for DNS lookups by unauthenticated clients to work. </span></td> </tr> </table> + </div> </td> </tr> </table> - </div> </form> <script language="JavaScript"> <!-- @@ -463,9 +463,5 @@ enable_change(false); //--> </script> <?php include("fend.inc"); ?> -<script type="text/javascript"> -NiftyCheck(); -Rounded("div#mainarea","bl br","#FFF","#eeeeee","smooth"); -</script> </body> </html> diff --git a/usr/local/www/services_captiveportal_ip.php b/usr/local/www/services_captiveportal_ip.php index 4e45cfc..fd5765a 100755 --- a/usr/local/www/services_captiveportal_ip.php +++ b/usr/local/www/services_captiveportal_ip.php @@ -81,7 +81,6 @@ include("head.inc"); <?php if (file_exists($d_allowedipsdirty_path)): ?><p> <?php print_info_box_np("The captive portal IP address configuration has been changed.<br>You must apply the changes in order for them to take effect.");?><br> <?php endif; ?> -<div id="mainarea"> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td class="tabnavtbl"> <?php @@ -94,8 +93,9 @@ include("head.inc"); ?> </td></tr> <tr> - <td class="tabcont"> - <table width="100%" border="0" cellpadding="0" cellspacing="0"> + <td> +<div id="mainarea"> + <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> <td width="30%" class="listhdrr">IP address</td> <td width="60%" class="listhdr">Description</td> @@ -156,15 +156,11 @@ include("head.inc"); <td class="list"> </td> </tr> </table> +</div> </td> </tr> </table> - </div> </form> <?php include("fend.inc"); ?> -<script type="text/javascript"> -NiftyCheck(); -Rounded("div#mainarea","bl br","#FFF","#eeeeee","smooth"); -</script> </body> </html> diff --git a/usr/local/www/services_captiveportal_mac.php b/usr/local/www/services_captiveportal_mac.php index 2ce1128..7129ed2 100755 --- a/usr/local/www/services_captiveportal_mac.php +++ b/usr/local/www/services_captiveportal_mac.php @@ -81,7 +81,6 @@ include("head.inc"); <?php if (file_exists($d_passthrumacsdirty_path)): ?><p> <?php print_info_box_np("The captive portal MAC address configuration has been changed.<br>You must apply the changes in order for them to take effect.");?><br> <?php endif; ?> -<div id="mainarea"> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td class="tabnavtbl"> <?php @@ -94,8 +93,9 @@ include("head.inc"); ?> </td></tr> <tr> - <td class="tabcont"> - <table width="100%" border="0" cellpadding="0" cellspacing="0"> + <td> +<div id="mainarea"> + <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> <td width="30%" class="listhdrr">MAC address</td> <td width="60%" class="listhdr">Description</td> @@ -137,15 +137,11 @@ include("head.inc"); <td class="list"> </td> </tr> </table> +</div> </td> </tr> </table> - </div> </form> <?php include("fend.inc"); ?> -<script type="text/javascript"> -NiftyCheck(); -Rounded("div#mainarea","bl br","#FFF","#eeeeee","smooth"); -</script> </body> </html> diff --git a/usr/local/www/services_captiveportal_users.php b/usr/local/www/services_captiveportal_users.php index 45bc206..7665b61 100755 --- a/usr/local/www/services_captiveportal_users.php +++ b/usr/local/www/services_captiveportal_users.php @@ -151,7 +151,6 @@ include("head.inc"); </script> <?php if ($input_errors) print_input_errors($input_errors); ?> <?php if ($savemsg) print_info_box($savemsg); ?> -<div id="mainarea"> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td> <?php @@ -164,7 +163,7 @@ include("head.inc"); ?> </td></tr> <tr> - <td class="tabcont"> + <td> <?php if($_GET['act']=="new" || $_GET['act']=="edit"){ if($_GET['act']=="edit" && isset($_GET['username'])){ @@ -172,8 +171,8 @@ if($_GET['act']=="new" || $_GET['act']=="edit"){ } ?> <form action="services_captiveportal_users.php" method="post" name="iform" id="iform"> - - <table width="100%" border="0" cellpadding="6" cellspacing="0"> +<div id="mainarea"> + <table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0"> <tr> <td width="22%" valign="top" class="vncellreq">Username</td> <td width="78%" class="vtable"> @@ -217,11 +216,13 @@ if($_GET['act']=="new" || $_GET['act']=="edit"){ </td> </tr> </table> + </div> </form> <?php } else { echo <<<END - <table width="100%" border="0" cellpadding="0" cellspacing="0"> +<div id="mainarea"> + <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> <td width="35%" class="listhdrr">Username</td> <td width="20%" class="listhdrr">Full Name</td> @@ -266,6 +267,7 @@ END; </td> </tr> </table> + </div> END; } ?> @@ -273,13 +275,7 @@ END; </td> </tr> </table> -</div> <?php include("fend.inc"); ?> -<script type="text/javascript"> -NiftyCheck(); -Rounded("div#mainarea","bl br","#FFF","#eeeeee","smooth"); -</script> - </body> </html> diff --git a/usr/local/www/services_dhcp.php b/usr/local/www/services_dhcp.php index 8251af6..7ccb1d0 100755 --- a/usr/local/www/services_dhcp.php +++ b/usr/local/www/services_dhcp.php @@ -200,7 +200,6 @@ function enable_change(enable_over) { <?php if (file_exists($d_staticmapsdirty_path)): ?><p> <?php print_info_box_np("The static mapping configuration has been changed.<br>You must apply the changes in order for them to take effect.");?><br> <?php endif; ?> -<div id="mainarea"> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td> <?php @@ -219,8 +218,9 @@ function enable_change(enable_over) { ?> </td></tr> <tr> - <td class="tabcont"> - <table width="100%" border="0" cellpadding="6" cellspacing="0"> + <td> + <div id="mainarea"> + <table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0"> <tr> <td width="22%" valign="top" class="vtable"> </td> <td width="78%" class="vtable"> @@ -327,7 +327,7 @@ The default is to use the IP of the firewall as the gateway. Specify an alterna </tr> </table> - <table width="100%" border="0" cellpadding="0" cellspacing="0"> + <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> <td width="35%" class="listhdrr">MAC address </td> <td width="20%" class="listhdrr">IP address</td> @@ -366,10 +366,10 @@ The default is to use the IP of the firewall as the gateway. Specify an alterna </td> </tr> </table> + </div> </td> </tr> </table> -</div> </form> <script language="JavaScript"> <!-- @@ -377,11 +377,5 @@ enable_change(false); //--> </script> <?php include("fend.inc"); ?> - -<script type="text/javascript"> -NiftyCheck(); -Rounded("div#mainarea","bl br","#FFF","#eeeeee","smooth"); -</script> - </body> </html> diff --git a/usr/local/www/services_dhcp_relay.php b/usr/local/www/services_dhcp_relay.php index 97ccdca..43db595 100755 --- a/usr/local/www/services_dhcp_relay.php +++ b/usr/local/www/services_dhcp_relay.php @@ -167,7 +167,6 @@ function enable_change(enable_over) { <form action="services_dhcp_relay.php" method="post" name="iform" id="iform"> <?php if ($input_errors) print_input_errors($input_errors); ?> <?php if ($savemsg) print_info_box($savemsg); ?> -<div id="master"> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td> <?php @@ -186,8 +185,9 @@ function enable_change(enable_over) { ?> </td></tr> <tr> - <td class="tabcont"> - <table width="100%" border="0" cellpadding="6" cellspacing="0"> + <td> + <div id="mainarea"> + <table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0"> <tr> <td width="22%" valign="top" class="vtable"> </td> <td width="78%" class="vtable"> @@ -220,10 +220,10 @@ function enable_change(enable_over) { </td> </tr> </table> + </div> </td> </tr> </table> -</div> </form> <script language="JavaScript"> <!-- @@ -231,11 +231,5 @@ enable_change(false); //--> </script> <?php include("fend.inc"); ?> - -<script type="text/javascript"> -NiftyCheck(); -Rounded("div#mainarea","bl br","#FFF","#eeeeee","smooth"); -</script> - </body> </html> |
