3 files changed, 43 insertions, 3 deletions
diff --git a/usr/local/www/firewall_nat.php b/usr/local/www/firewall_nat.php
index 11e6058..3ef4ffb 100755
--- a/usr/local/www/firewall_nat.php
+++ b/usr/local/www/firewall_nat.php
@@ -174,7 +174,14 @@ if ($_GET['act'] == "del") {
                       network).</span></p></td>
   </tr>
 </table>
-            </form>
+
+<?php
+if ($pkg['tabs'] <> "") {
+    echo "</td></tr></table>";
+}
+?>
+
+</form>
 <?php include("fend.inc"); ?>
 </body>
 </html>
diff --git a/usr/local/www/pkg.php b/usr/local/www/pkg.php
index 8fb38cf..806b473 100755
--- a/usr/local/www/pkg.php
+++ b/usr/local/www/pkg.php
@@ -117,9 +117,22 @@ if ($pkg['tabs'] <> "") {
 	$active = "tabinact";
 	if(isset($tab['active'])) $active = "tabact";
 	$url = "";
+	$title = $tab['text'];
 	if($tab['url'] <> "") $url = $tab['url'];
 	if($tab['xml'] <> "") $url = "pkg_edit.php?xml=" . $tab['xml'];
-	echo "<li class=\"{$active}\"><a href=\"{$url}\">Server NAT</a></li>";
+	if($active == "tabinact") {
+	    echo "<li class=\"{$active}\">";
+	    echo "<a href=\"";
+	    echo $url;
+	    echo "\">";
+	    echo $title;
+	    echo "</a>";
+	    echo "</li>";
+	} else {
+	    echo "<li class=\"{$active}\">";
+	    echo $title;
+	    echo "</li>";
+	}
     }
     echo "  </ul>";
     echo "</td></tr>";
@@ -179,6 +192,13 @@ if ($pkg['tabs'] <> "") {
     </td>
   </tr>
 </table>
+
+<?php
+if ($pkg['tabs'] <> "") {
+    echo "</td></tr></table>";
+}
+?>
+
 </form>
 <?php include("fend.inc"); ?>
 </body>
diff --git a/usr/local/www/pkg_edit.php b/usr/local/www/pkg_edit.php
index 2387685..d5a184f 100755
--- a/usr/local/www/pkg_edit.php
+++ b/usr/local/www/pkg_edit.php
@@ -236,9 +236,22 @@ if ($pkg['tabs'] <> "") {
 	$active = "tabinact";
 	if(isset($tab['active'])) $active = "tabact";
 	$url = "";
+	$title = $tab['text'];
 	if($tab['url'] <> "") $url = $tab['url'];
 	if($tab['xml'] <> "") $url = "pkg_edit.php?xml=" . $tab['xml'];
-	echo "<li class=\"{$active}\"><a href=\"{$url}\">Server NAT</a></li>";
+	if($active == "tabinact") {
+	    echo "<li class=\"{$active}\">";
+	    echo "<a href=\"";
+	    echo $url;
+	    echo "\">";
+	    echo $title;
+	    echo "</a>";
+	    echo "</li>";
+	} else {
+	    echo "<li class=\"{$active}\">";
+	    echo $title;
+	    echo "</li>";
+	}
     }
     echo "  </ul>";
     echo "</td></tr>";