From 2ff19bfd402a7bf89bcd7c025cc6c62c7a7cacfe Mon Sep 17 00:00:00 2001
From: Matthew Grooms <mgrooms@pfsense.org>
Date: Tue, 9 Sep 2008 18:54:57 +0000
Subject: [PATCH] Move the 'advanced users only' notice into the tab body so
 the tab headers are not displaced by this message.

---
 usr/local/www/system_advanced_admin.php    | 26 +++++++++-----------
 usr/local/www/system_advanced_firewall.php | 26 +++++++++-----------
 usr/local/www/system_advanced_misc.php     | 28 ++++++++++------------
 usr/local/www/system_advanced_network.php  | 26 +++++++++-----------
 usr/local/www/system_advanced_sysctl.php   | 26 +++++++++-----------
 5 files changed, 56 insertions(+), 76 deletions(-)

diff --git a/usr/local/www/system_advanced_admin.php b/usr/local/www/system_advanced_admin.php
index 9d9ba8c5c8..1517de8563 100644
--- a/usr/local/www/system_advanced_admin.php
+++ b/usr/local/www/system_advanced_admin.php
@@ -189,18 +189,6 @@ function prot_change() {
 ?>
 	<form action="system_advanced_admin.php" method="post" name="iform" id="iform">
 		<table width="100%" border="0" cellpadding="0" cellspacing="0">
-			<tr>
-				<td>
-					<span class="vexpl">
-						<span class="red">
-							<strong>Note:</strong>
-						</span>
-						the options on this page are intended for use by advanced users only.
-						<br/>
-					</span>
-					<br/>
-				</td>
-			</tr>
 			<tr>
 				<td>
 					<?php
@@ -215,9 +203,17 @@ function prot_change() {
 				</td>
 			</tr>
 			<tr>
-				<td>
-					<div id="mainarea">
-						<table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0">
+				<td id="mainarea">
+					<div class="tabcont">
+						<span class="vexpl">
+							<span class="red">
+								<strong>NOTE:&nbsp</strong>
+							</span>
+							The options on this page are intended for use by advanced users only.
+							<br/>
+						</span>
+						<br/>
+						<table width="100%" border="0" cellpadding="6" cellspacing="0">
 							<tr>
 								<td colspan="2" valign="top" class="listtopic">webConfigurator</td>
 							</tr>
diff --git a/usr/local/www/system_advanced_firewall.php b/usr/local/www/system_advanced_firewall.php
index f6fe868ba0..74512cfeec 100644
--- a/usr/local/www/system_advanced_firewall.php
+++ b/usr/local/www/system_advanced_firewall.php
@@ -155,18 +155,6 @@ function update_description(itemnum) {
 ?>
 	<form action="system_advanced_firewall.php" method="post" name="iform" id="iform">
 		<table width="100%" border="0" cellpadding="0" cellspacing="0">
-			<tr>
-				<td>
-					<span class="vexpl">
-						<span class="red">
-							<strong>Note:</strong>
-						</span>
-						the options on this page are intended for use by advanced users only.
-						<br/>
-					</span>
-					<br/>
-				</td>
-			</tr>
 			<tr>
 				<td class="tabnavtbl">
 					<?php
@@ -182,9 +170,17 @@ function update_description(itemnum) {
 				</td>
 			</tr>
 			<tr>
-				<td>
-					<div id="mainarea">
-						<table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0">
+				<td id="mainarea">
+					<div class="tabcont">
+						<span class="vexpl">
+							<span class="red">
+								<strong>NOTE:&nbsp</strong>
+							</span>
+							The options on this page are intended for use by advanced users only.
+							<br/>
+						</span>
+						<br/>
+						<table width="100%" border="0" cellpadding="6" cellspacing="0">
 							<tr>
 								<td colspan="2" valign="top" class="listtopic">Firewall Advanced</td>
 							</tr>
diff --git a/usr/local/www/system_advanced_misc.php b/usr/local/www/system_advanced_misc.php
index 0dfd5aa959..d9048d441c 100644
--- a/usr/local/www/system_advanced_misc.php
+++ b/usr/local/www/system_advanced_misc.php
@@ -101,18 +101,6 @@ include("head.inc");
 ?>
 	<form action="system_advanced_misc.php" method="post" name="iform" id="iform">
 		<table width="100%" border="0" cellpadding="0" cellspacing="0">
-			<tr>
-				<td>
-					<span class="vexpl">
-						<span class="red">
-							<strong>Note:</strong>
-						</span>
-						the options on this page are intended for use by advanced users only.
-						<br/>
-					</span>
-					<br/>
-				</td>
-			</tr>
 			<tr>
 				<td>
 					<?php
@@ -127,9 +115,17 @@ include("head.inc");
 				</td>
 			</tr>
 			<tr>
-				<td>
-					<div id="mainarea">
-						<table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0">
+				<td id="mainarea">
+					<div class="tabcont">
+						<span class="vexpl">
+							<span class="red">
+								<strong>NOTE:&nbsp</strong>
+							</span>
+							The options on this page are intended for use by advanced users only.
+							<br/>
+						</span>
+						<br/>
+						<table width="100%" border="0" cellpadding="6" cellspacing="0">
 							<tr>
 								<td colspan="2" valign="top" class="listtopic">Load Balancing</td>
 							</tr>
@@ -174,7 +170,7 @@ include("head.inc");
 								<td colspan="2" valign="top" class="listtopic">IP Security</td>
 							</tr>
 							<tr>
-								<td width="22%" valign="top" class="vncell">IPsec SA preferral</td>
+								<td width="22%" valign="top" class="vncell">Security Assocications</td>
 								<td width="78%" class="vtable">
 									<input name="preferoldsa_enable" type="checkbox" id="preferoldsa_enable" value="yes" <?php if ($pconfig['preferoldsa_enable']) echo "checked"; ?> />
 									<strong>Prefer older IPsec SAs</strong>
diff --git a/usr/local/www/system_advanced_network.php b/usr/local/www/system_advanced_network.php
index 1f9d12dd1d..275bbf078a 100644
--- a/usr/local/www/system_advanced_network.php
+++ b/usr/local/www/system_advanced_network.php
@@ -137,18 +137,6 @@ function enable_change(enable_over) {
 ?>
 	<form action="system_advanced_network.php" method="post" name="iform" id="iform">
 		<table width="100%" border="0" cellpadding="0" cellspacing="0">
-			<tr>
-				<td>
-					<span class="vexpl">
-	    	        	<span class="red">
-							<strong>Note:</strong>
-						</span>
-						the options on this page are intended for use by advanced users only.
-						<br/>
-					</span>
-					<br/>
-				</td>
-			</tr>
 			<tr>
 				<td>
 					<?php
@@ -163,9 +151,17 @@ function enable_change(enable_over) {
 				</td>
 			</tr>
 			<tr>
-				<td>
-					<div id="mainarea">
-						<table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0">
+				<td id="mainarea">
+					<div class="tabcont">
+						<span class="vexpl">
+		    	        	<span class="red">
+								<strong>NOTE:&nbsp</strong>
+							</span>
+							The options on this page are intended for use by advanced users only.
+							<br/>
+						</span>
+						<br/>
+						<table width="100%" border="0" cellpadding="6" cellspacing="0">
 							<tr>
 								<td colspan="2" valign="top" class="listtopic">IPv6 Options</td>
 							</tr>
diff --git a/usr/local/www/system_advanced_sysctl.php b/usr/local/www/system_advanced_sysctl.php
index a81494eb6c..2ff96dcf34 100644
--- a/usr/local/www/system_advanced_sysctl.php
+++ b/usr/local/www/system_advanced_sysctl.php
@@ -139,18 +139,6 @@ include("head.inc");
 		?>
 	</form>
 	<table width="100%" border="0" cellpadding="0" cellspacing="0">
-		<tr>
-			<td>
-				<span class="vexpl">
-					<span class="red">
-						<strong>Note:</strong>
-					</span>
-					the options on this page are intended for use by advanced users only.
-					<br/>
-				</span>
-				<br/>
-			</td>
-		</tr>
 		<tr>
 			<td>
 				<?php
@@ -166,9 +154,17 @@ include("head.inc");
 		</tr>
 		<?php if ($act != "edit" ): ?>
 		<tr>
-			<td>
-				<div id="mainarea">
-					<table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0">
+			<td id="mainarea">
+				<div class="tabcont">
+					<span class="vexpl">
+						<span class="red">
+							<strong>NOTE:&nbsp</strong>
+						</span>
+						The options on this page are intended for use by advanced users only.
+						<br/>
+					</span>
+					<br/>
+					<table width="100%" border="0" cellpadding="6" cellspacing="0">
 						<tr>
 							<td width="20%" class="listhdrr">Tunable Name</td>
 							<td width="60%" class="listhdrr">Description</td>