(legacy) firewall/nat move tabs to menu

src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml

@@ -62,15 +62,19 @@
               <Import url="/firewall_aliases_import.php"/>
             </All>
         </Aliases>
-        <NAT url="/firewall_nat.php">
+        <NAT cssClass="fa fa-exchange">
+            <PortForward order="100" VisibleName="Port Forward" url="/firewall_nat.php">
               <NatEdit url="/firewall_nat_edit.php*"/>
-            <PortForward VisibleName="Port Forward" url="/firewall_nat.php"/>
-            <OneOnOne VisibleName="1:1" url="/firewall_nat_1to1.php"/>
+            </PortForward>
+            <OneOnOne order="200" VisibleName="1:1" url="/firewall_nat_1to1.php">
               <OneOnOneEdit url="/firewall_nat_1to1_edit.php*"/>
-            <Outbound url="/firewall_nat_out.php"/>
+            </OneOnOne>
+            <Outbound order="300" VisibleName="Outbound" url="/firewall_nat_out.php">
               <OutboundEdit url="/firewall_nat_out_edit.php*"/>
-            <NPt url="/firewall_nat_npt.php"/>
+            </Outbound>
+            <NPt VisibleName="NPt (IPv6)"  order="400" url="/firewall_nat_npt.php">
                 <NPtEdit url="/firewall_nat_npt_edit.php*"/>
+            </NPt>
         </NAT>
         <Rules url="/firewall_rules.php">
             <RulesEdit url="/firewall_rules_edit.php*"/>

src/www/firewall_nat.php

@@ -229,15 +229,7 @@ $( document ).ready(function() {
 <?php     print_info_box_apply(gettext("The NAT configuration has been changed") . ".<br />" . gettext("You must apply the changes in order for them to take effect."));?><br />
 <?php   endif; ?>
         <section class="col-xs-12">
-<?php
-          $tab_array = array();
-          $tab_array[] = array(gettext("Port Forward"), true, "firewall_nat.php");
-          $tab_array[] = array(gettext("1:1"), false, "firewall_nat_1to1.php");
-          $tab_array[] = array(gettext("Outbound"), false, "firewall_nat_out.php");
-          $tab_array[] = array(gettext("NPt"), false, "firewall_nat_npt.php");
-          display_top_tabs($tab_array);
-?>
-          <div class="tab-content content-box col-xs-12">
+          <div class="content-box">
             <form action="firewall_nat.php" method="post" name="iform" id="iform">
               <input type="hidden" id="id" name="id" value="" />
               <input type="hidden" id="action" name="act" value="" />

src/www/firewall_nat_1to1.php

@@ -184,15 +184,7 @@ $main_buttons = array(
             gettext("You must apply the changes in order for them to take effect."));
 ?>
           <section class="col-xs-12">
-<?php
-              $tab_array = array();
-              $tab_array[] = array(gettext("Port Forward"), false, "firewall_nat.php");
-              $tab_array[] = array(gettext("1:1"), true, "firewall_nat_1to1.php");
-              $tab_array[] = array(gettext("Outbound"), false, "firewall_nat_out.php");
-              $tab_array[] = array(gettext("NPt"), false, "firewall_nat_npt.php");
-              display_top_tabs($tab_array);
-?>
-          <div class="tab-content content-box col-xs-12">
+          <div class="content-box">
             <form action="firewall_nat_1to1.php" method="post" name="iform" id="iform">
               <input type="hidden" id="id" name="id" value="" />
               <input type="hidden" id="action" name="action" value="" />

src/www/firewall_nat_npt.php

@@ -182,15 +182,7 @@ $main_buttons = array(
         <?php print_info_box_np(gettext("The NAT configuration has been changed") . ".<br />" . gettext("You must apply the changes in order for them to take effect."));?><br />
         <?php endif; ?>
         <section class="col-xs-12">
-<?php
-            $tab_array = array();
-            $tab_array[] = array(gettext("Port Forward"), false, "firewall_nat.php");
-            $tab_array[] = array(gettext("1:1"), false, "firewall_nat_1to1.php");
-            $tab_array[] = array(gettext("Outbound"), false, "firewall_nat_out.php");
-            $tab_array[] = array(gettext("NPt"), true, "firewall_nat_npt.php");
-            display_top_tabs($tab_array);
-?>
-          <div class="tab-content content-box col-xs-12">
+          <div class="content-box">
             <form action="firewall_nat_npt.php" method="post" name="iform" id="iform">
               <input type="hidden" id="id" name="id" value="" />
               <input type="hidden" id="action" name="act" value="" />

src/www/firewall_nat_out.php

@@ -254,15 +254,7 @@ include("head.inc");
           <input type="hidden" id="id" name="id" value="" />
           <input type="hidden" id="action" name="act" value="" />
           <section class="col-xs-12">
-<?php
-              $tab_array = array();
-              $tab_array[] = array(gettext("Port Forward"), false, "firewall_nat.php");
-              $tab_array[] = array(gettext("1:1"), false, "firewall_nat_1to1.php");
-              $tab_array[] = array(gettext("Outbound"), true, "firewall_nat_out.php");
-              $tab_array[] = array(gettext("NPt"), false, "firewall_nat_npt.php");
-              display_top_tabs($tab_array);
-?>
-            <div class="tab-content content-box col-xs-12">
+            <div class="content-box">
               <table class="table table-striped">
                 <thead>
                   <tr>