Convert back to our tab system

4 files changed, 33 insertions, 19 deletions

diff --git a/usr/local/www/services_captiveportal.php b/usr/local/www/services_captiveportal.php
index 3fdf75f..d52d3d1 100755
--- a/usr/local/www/services_captiveportal.php
+++ b/usr/local/www/services_captiveportal.php
@@ -200,12 +200,14 @@ function enable_change(enable_change) {
 <form action="services_captiveportal.php" method="post" enctype="multipart/form-data" name="iform" id="iform">
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
   <tr><td class="tabnavtbl">
-  <ul id="tabnav">
-	<li class="tabact">Captive portal</li>
-	<li class="tabinact"><a href="services_captiveportal_mac.php">Pass-through MAC</a></li>
-	<li class="tabinact"><a href="services_captiveportal_ip.php">Allowed IP addresses</a></li>
-	<li class="tabinact"><a href="services_captiveportal_users.php">Users</a></li>
-  </ul>
+<?php
+	$tab_array = array();
+	$tab_array[] = array("Captive portal", true, "services_captiveportal.php");
+	$tab_array[] = array("Pass-through MAC", false, "services_captiveportal_mac.php");
+	$tab_array[] = array("Allowed IP addresses", false, "services_captiveportal_ip.php");
+	$tab_array[] = array("Users", true, "services_captiveportal_users.php");
+	display_top_tabs($tab_array);
+?>  
   </td></tr>
   <tr>
   <td class="tabcont">
diff --git a/usr/local/www/services_captiveportal_ip.php b/usr/local/www/services_captiveportal_ip.php
index ceae5ae..7f103a4 100755
--- a/usr/local/www/services_captiveportal_ip.php
+++ b/usr/local/www/services_captiveportal_ip.php
@@ -81,13 +81,15 @@ include("head.inc");
 <input name="apply" type="submit" class="formbtn" id="apply" value="Apply changes"></p>
 <?php endif; ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
-  <tr><td class="tabnavtbl">
-  <ul id="tabnav">
-	<li class="tabinact1"><a href="services_captiveportal.php">Captive portal</a></li>
-	<li class="tabinact"><a href="services_captiveportal_mac.php">Pass-through MAC</a></li>
-	<li class="tabact">Allowed IP addresses</li>
-	<li class="tabinact"><a href="services_captiveportal_users.php">Users</a></li>
-  </ul>
+  <tr><td class="tabnavtbl">  
+<?php
+	$tab_array = array();
+	$tab_array[] = array("Captive portal", false, "services_captiveportal.php");
+	$tab_array[] = array("Pass-through MAC", false, "services_captiveportal_mac.php");
+	$tab_array[] = array("Allowed IP addresses", true, "services_captiveportal_ip.php");
+	$tab_array[] = array("Users", false, "services_captiveportal_users.php");
+	display_top_tabs($tab_array);
+?>
   </td></tr>
   <tr>
   <td class="tabcont">
diff --git a/usr/local/www/services_captiveportal_mac.php b/usr/local/www/services_captiveportal_mac.php
index ae4010b..37a59c0 100755
--- a/usr/local/www/services_captiveportal_mac.php
+++ b/usr/local/www/services_captiveportal_mac.php
@@ -82,12 +82,14 @@ include("head.inc");
 <?php endif; ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
   <tr><td class="tabnavtbl">
-  <ul id="tabnav">
-	<li class="tabinact1"><a href="services_captiveportal.php">Captive portal</a></li>
-	<li class="tabact">Pass-through MAC</li>
-	<li class="tabinact"><a href="services_captiveportal_ip.php">Allowed IP addresses</a></li>
-	<li class="tabinact"><a href="services_captiveportal_users.php">Users</a></li>
-  </ul>
+<?php
+	$tab_array = array();
+	$tab_array[] = array("Captive portal", false, "services_captiveportal.php");
+	$tab_array[] = array("Pass-through MAC", true, "services_captiveportal_mac.php");
+	$tab_array[] = array("Allowed IP addresses", false, "services_captiveportal_ip.php");
+	$tab_array[] = array("Users", true, "services_captiveportal_users.php");
+	display_top_tabs($tab_array);
+?>
   </td></tr>
   <tr>
   <td class="tabcont">
diff --git a/usr/local/www/services_captiveportal_users.php b/usr/local/www/services_captiveportal_users.php
index 89b2238..c2e2564 100755
--- a/usr/local/www/services_captiveportal_users.php
+++ b/usr/local/www/services_captiveportal_users.php
@@ -77,6 +77,14 @@ include("head.inc");
 	<li class="tabinact"><a href="services_captiveportal_ip.php">Allowed IP addresses</a></li>
 	<li class="tabact">Users</li>
   </ul>
+<?php
+	$tab_array = array();
+	$tab_array[] = array("Captive portal", false, "services_captiveportal.php");
+	$tab_array[] = array("Pass-through MAC", false, "services_captiveportal_mac.php");
+	$tab_array[] = array("Allowed IP addresses", false, "services_captiveportal_ip.php");
+	$tab_array[] = array("Users", true, "services_captiveportal_users.php");
+	display_top_tabs($tab_array);
+?>
   </td></tr>
   <tr>
   <td class="tabcont">