* Fix diagnostics logging tab menus

* Curve bottom of grey areas if needed
* Curve tabs
* Cleanup

14 files changed, 118 insertions, 26 deletions

diff --git a/usr/local/www/carp_status.php b/usr/local/www/carp_status.php
index f4bf9c8..9e79830 100755
--- a/usr/local/www/carp_status.php
+++ b/usr/local/www/carp_status.php
@@ -101,6 +101,7 @@ if(!is_array($config['installedpackages']['carp']['config'])) {
 
 <p>
 
+<div id="mainarea">
 <table width="100%" border="0" cellpadding="6" cellspacing="0">
 </tr>
 <tr>
@@ -161,8 +162,13 @@ if($config['installedpackages']['carp']['config'] <> "")
 </table>
 </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/diag_logs.php b/usr/local/www/diag_logs.php
index af5ee36..2ff5a81 100755
--- a/usr/local/www/diag_logs.php
+++ b/usr/local/www/diag_logs.php
@@ -56,7 +56,8 @@ include("head.inc");
   <tr><td>
 <?php
 	$tab_array = array();
-	$tab_array[0] = array("Firewall", true, "diag_logs_filter.php");
+	$tab_array[0] = array("System", true, "diag_logs.php");
+	$tab_array[0] = array("Firewall", false, "diag_logs_filter.php");
 	$tab_array[1] = array("DHCP", false, "diag_logs_dhcp.php");
 	$tab_array[2] = array("Portal Auth", false, "diag_logs_auth.php");
 	$tab_array[3] = array("IPSEC VPN", false, "diag_logs_ipsec.php");
diff --git a/usr/local/www/diag_logs_auth.php b/usr/local/www/diag_logs_auth.php
index 68c96e4..e5c21af 100755
--- a/usr/local/www/diag_logs_auth.php
+++ b/usr/local/www/diag_logs_auth.php
@@ -54,6 +54,7 @@ include("head.inc");
   <tr><td>
 <?php
 	$tab_array = array();
+	$tab_array[0] = array("System", false, "diag_logs.php");
 	$tab_array[0] = array("Firewall", false, "diag_logs_filter.php");
 	$tab_array[1] = array("DHCP", false, "diag_logs_dhcp.php");
 	$tab_array[2] = array("Portal Auth", true, "diag_logs_auth.php");
@@ -62,6 +63,7 @@ include("head.inc");
 	$tab_array[5] = array("Settings", false, "diag_logs_settings.php");
 	display_top_tabs($tab_array);
 ?>
+
   </td></tr>
   <tr>
     <td class="tabcont">
diff --git a/usr/local/www/diag_logs_dhcp.php b/usr/local/www/diag_logs_dhcp.php
index a4396e0..46f0ccd 100755
--- a/usr/local/www/diag_logs_dhcp.php
+++ b/usr/local/www/diag_logs_dhcp.php
@@ -56,6 +56,7 @@ include("head.inc");
   <tr><td>
 <?php
 	$tab_array = array();
+	$tab_array[0] = array("System", false, "diag_logs.php");
 	$tab_array[0] = array("Firewall", false, "diag_logs_filter.php");
 	$tab_array[1] = array("DHCP", true, "diag_logs_dhcp.php");
 	$tab_array[2] = array("Portal Auth", false, "diag_logs_auth.php");
@@ -64,6 +65,7 @@ include("head.inc");
 	$tab_array[5] = array("Settings", false, "diag_logs_settings.php");
 	display_top_tabs($tab_array);
 ?>
+
   </td></tr>
   <tr>
     <td class="tabcont">
diff --git a/usr/local/www/diag_logs_filter.php b/usr/local/www/diag_logs_filter.php
index c6cd2bb..587d031 100755
--- a/usr/local/www/diag_logs_filter.php
+++ b/usr/local/www/diag_logs_filter.php
@@ -124,6 +124,7 @@ include("head.inc");
   <tr><td>
 <?php
 	$tab_array = array();
+	$tab_array[0] = array("System", false, "diag_logs.php");
 	$tab_array[0] = array("Firewall", true, "diag_logs_filter.php");
 	$tab_array[1] = array("DHCP", false, "diag_logs_dhcp.php");
 	$tab_array[2] = array("Portal Auth", false, "diag_logs_auth.php");
diff --git a/usr/local/www/pkg.php b/usr/local/www/pkg.php
index 8d8972f..98c832f 100755
--- a/usr/local/www/pkg.php
+++ b/usr/local/www/pkg.php
@@ -149,6 +149,7 @@ if ($pkg['tabs'] <> "") {
 }
 ?>
 
+<div id="mainarea">
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
   <tr>
     <td class="tabcont">
@@ -215,6 +216,7 @@ if ($pkg['tabs'] <> "") {
     </td>
   </tr>
 </table>
+</div>
 
 <?php
 if ($pkg['tabs'] <> "") {
@@ -224,5 +226,11 @@ 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/pkg_mgr.php b/usr/local/www/pkg_mgr.php
index f9d531a..a1b8b99 100755
--- a/usr/local/www/pkg_mgr.php
+++ b/usr/local/www/pkg_mgr.php
@@ -70,6 +70,8 @@ $pkg_info = get_pkg_info('all', array('name', 'category', 'website', 'version',
 $pkg_sizes = get_pkg_sizes();
 
 ?>
+
+<div id="mainarea">
 <table width="100%" border="0" cellpadding="0" cellspacing="0">  <tr><td>
 <?php
 	$tab_array = array();
@@ -142,6 +144,13 @@ $pkg_sizes = get_pkg_sizes();
     </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_install.php b/usr/local/www/pkg_mgr_install.php
index dc8511c..4e7df4d 100755
--- a/usr/local/www/pkg_mgr_install.php
+++ b/usr/local/www/pkg_mgr_install.php
@@ -53,6 +53,7 @@ include("fbegin.inc");
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <?php
 ?>
+<div id="mainarea">
 <table width="100%" border="0" cellpadding="0" cellspacing="0">  <tr><td>
 <?php
 	$tab_array = array();
@@ -91,11 +92,19 @@ include("fbegin.inc");
     </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>
 
+
 <?php
 
 /* mount rw fs */
diff --git a/usr/local/www/pkg_mgr_installed.php b/usr/local/www/pkg_mgr_installed.php
index 19f10dd..ca9255e 100755
--- a/usr/local/www/pkg_mgr_installed.php
+++ b/usr/local/www/pkg_mgr_installed.php
@@ -49,6 +49,7 @@ include("fbegin.inc");
 ?>
 <p class="pgtitle">System: Package Manager</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();
@@ -154,7 +155,14 @@ include("fbegin.inc");
     </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_captiveportal_users.php b/usr/local/www/services_captiveportal_users.php
index 7ceb1cf..7201bde 100755
--- a/usr/local/www/services_captiveportal_users.php
+++ b/usr/local/www/services_captiveportal_users.php
@@ -151,6 +151,7 @@ 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
@@ -171,7 +172,7 @@ if($_GET['act']=="new" || $_GET['act']=="edit"){
 	}
 ?>
 	<form action="services_captiveportal_users.php" method="post" name="iform" id="iform">
-	<div id="mainarea">
+
               <table width="100%" border="0" cellpadding="6" cellspacing="0">
                 <tr>
                   <td width="22%" valign="top" class="vncellreq">Username</td>
@@ -279,5 +280,6 @@ END;
 NiftyCheck();
 Rounded("div#mainarea","bl br","#FFF","#eeeeee","smooth");
 </script>
+
 </body>
 </html>
diff --git a/usr/local/www/vpn_ipsec.php b/usr/local/www/vpn_ipsec.php
index a81c6a7..8f23581 100755
--- a/usr/local/www/vpn_ipsec.php
+++ b/usr/local/www/vpn_ipsec.php
@@ -96,14 +96,17 @@ include("head.inc");
 <?php print_info_box_np("The IPsec tunnel configuration has been changed.<br>You must apply the changes in order for them to take effect.");?><br>
 <input name="apply" type="submit" class="formbtn" id="apply" value="Apply changes"></p>
 <?php endif; ?>
+<div id="mainarea">
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
   <tr><td class="tabnavtbl">
-  <ul id="tabnav">
-    <li class="tabact">Tunnels</li>
-    <li class="tabinact"><a href="vpn_ipsec_mobile.php">Mobile clients</a></li>
-    <li class="tabinact"><a href="vpn_ipsec_keys.php">Pre-shared keys</a></li>
-    <li class="tabinact"><a href="vpn_ipsec_ca.php">CAs</a></li>
-  </ul>
+<?php
+	$tab_array = array();
+	$tab_array[0] = array("Tunnels", true, "vpn_ipsec.php");
+	$tab_array[1] = array("Mobile clients", false, "vpn_ipsec_mobile.php");
+	$tab_array[2] = array("Pre-shared keys", false, "vpn_ipsec_keys.php");
+	$tab_array[3] = array("CAs", false, "vpn_ipsec_ca.php");
+	display_top_tabs($tab_array);
+?>  
   </td></tr>
   <tr> 
     <td class="tabcont">
@@ -184,5 +187,13 @@ include("head.inc");
 			</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/vpn_ipsec_ca.php b/usr/local/www/vpn_ipsec_ca.php
index b062ba1..3da34f0 100755
--- a/usr/local/www/vpn_ipsec_ca.php
+++ b/usr/local/www/vpn_ipsec_ca.php
@@ -62,14 +62,17 @@ include("head.inc");
 <?php print_info_box_np("The IPsec tunnel configuration has been changed.<br>You must apply the changes in order for them to take effect.");?><br>
 <input name="apply" type="submit" class="formbtn" id="apply" value="Apply changes"></p>
 <?php endif; ?>
+<div id="mainarea">
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
   <tr><td>
-  <ul id="tabnav">
-    <li class="tabinact"><a href="vpn_ipsec.php">Tunnels</a></li>
-    <li class="tabinact"><a href="vpn_ipsec_mobile.php">Mobile clients</a></li>
-    <li class="tabinact"><a href="vpn_ipsec_keys.php">Pre-shared keys</a></li>
-    <li class="tabact">CAs</li>
-  </ul>
+<?php
+	$tab_array = array();
+	$tab_array[0] = array("Tunnels", false, "vpn_ipsec.php");
+	$tab_array[1] = array("Mobile clients", false, "vpn_ipsec_mobile.php");
+	$tab_array[2] = array("Pre-shared keys", false, "vpn_ipsec_keys.php");
+	$tab_array[3] = array("CAs", true, "vpn_ipsec_ca.php");
+	display_top_tabs($tab_array);
+?>
   </td></tr>
   <tr> 
     <td class="tabcont">
@@ -95,5 +98,13 @@ include("head.inc");
 			 </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/vpn_ipsec_keys.php b/usr/local/www/vpn_ipsec_keys.php
index c93fab9..4b652f5 100755
--- a/usr/local/www/vpn_ipsec_keys.php
+++ b/usr/local/www/vpn_ipsec_keys.php
@@ -61,14 +61,17 @@ include("head.inc");
 <?php print_info_box_np("The IPsec tunnel configuration has been changed.<br>You must apply the changes in order for them to take effect.");?><br>
 <input name="apply" type="submit" class="formbtn" id="apply" value="Apply changes"></p>
 <?php endif; ?>
+<div id="mainarea">
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
   <tr><td class="tabnavtbl">
-  <ul id="tabnav">
-    <li class="tabinact1"><a href="vpn_ipsec.php">Tunnels</a></li>
-    <li class="tabinact"><a href="vpn_ipsec_mobile.php">Mobile clients</a></li>
-    <li class="tabact">Pre-shared keys</li>
-    <li class="tabinact"><a href="vpn_ipsec_ca.php">CAs</a></li>
-  </ul>
+<?php
+	$tab_array = array();
+	$tab_array[0] = array("Tunnels", false, "vpn_ipsec.php");
+	$tab_array[1] = array("Mobile clients", false, "vpn_ipsec_mobile.php");
+	$tab_array[2] = array("Pre-shared keys", true, "vpn_ipsec_keys.php");
+	$tab_array[3] = array("CAs", false, "vpn_ipsec_ca.php");
+	display_top_tabs($tab_array);
+?>
   </td></tr>
   <tr> 
     <td class="tabcont">
@@ -98,5 +101,13 @@ include("head.inc");
 			 </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>
\ No newline at end of file
diff --git a/usr/local/www/vpn_ipsec_mobile.php b/usr/local/www/vpn_ipsec_mobile.php
index 26377f8..05f3595 100755
--- a/usr/local/www/vpn_ipsec_mobile.php
+++ b/usr/local/www/vpn_ipsec_mobile.php
@@ -192,14 +192,17 @@ function methodsel_change() {
 <?php endif; ?>
 </form>
 <form action="vpn_ipsec_mobile.php" method="post" name="iform" id="iform">
+<div id="mainarea">
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
   <tr><td class="tabnavtbl">
-  <ul id="tabnav">
-    <li class="tabinact1"><a href="vpn_ipsec.php">Tunnels</a></li>
-    <li class="tabact">Mobile clients</li>
-    <li class="tabinact"><a href="vpn_ipsec_keys.php">Pre-shared keys</a></li>
-    <li class="tabinact"><a href="vpn_ipsec_ca.php">CAs</a></li>
-  </ul>
+<?php
+	$tab_array = array();
+	$tab_array[0] = array("Tunnels", false, "vpn_ipsec.php");
+	$tab_array[1] = array("Mobile clients", true, "vpn_ipsec_mobile.php");
+	$tab_array[2] = array("Pre-shared keys", false, "vpn_ipsec_keys.php");
+	$tab_array[3] = array("CAs", false, "vpn_ipsec_ca.php");
+	display_top_tabs($tab_array);
+?>
   </td></tr>
   <tr> 
     <td class="tabcont">
@@ -377,6 +380,7 @@ function methodsel_change() {
 			 </td>
 			</tr>
 		</table>
+		</div>
 </form>
 <script language="JavaScript">
 <!--
@@ -384,3 +388,10 @@ methodsel_change();
 //-->
 </script>
 <?php include("fend.inc"); ?>
+<script type="text/javascript">
+NiftyCheck();
+Rounded("div#mainarea","bl br","#FFF","#eeeeee","smooth");
+</script>
+
+</body>
+</html>