menu: convert settings tabs to submenu; closes #402

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

@@ -46,13 +46,13 @@
                 <Groups url="/status_gateway_groups.php"/>
             </Status>
         </Gateways>
-        <Settings url="/system_general.php" cssClass="fa fa-cogs">
-            <General VisibleName="General" url="/system_general.php"/>
-            <Admin_Access VisibleName="Admin Access" url="/system_advanced_admin.php"/>
-            <Firewall_NAT VisibleName="Firewall/NAT" url="/system_advanced_firewall.php"/>
-            <Networking url="/system_advanced_network.php"></Networking>
+        <Settings cssClass="fa fa-cogs">
+            <General url="/system_general.php"/>
+            <AdminAccess VisibleName="Admin Access" url="/system_advanced_admin.php"/>
+            <FirewallNAT VisibleName="Firewall/NAT" url="/system_advanced_firewall.php"/>
+            <Networking url="/system_advanced_network.php"/>
             <Miscellaneous url="/system_advanced_misc.php"/>
-            <System_Tunables VisibleName="System Tunables" url="/system_advanced_sysctl.php"/>
+            <Tunables VisibleName="Tunables" url="/system_advanced_sysctl.php"/>
             <Notifications url="/system_advanced_notifications.php"/>
         </Settings>
         <Wizard url="/wizard.php" cssClass="fa fa-magic">

src/www/system_advanced_admin.php

@@ -312,7 +312,6 @@ include("head.inc");
             }
             ?>
             <section class="col-xs-12">
-                <? include('system_advanced_tabs.inc'); ?>
                 <div class="content-box tab-content">
 
 					<form action="system_advanced_admin.php" method="post" name="iform" id="iform">

src/www/system_advanced_firewall.php

@@ -276,7 +276,6 @@ include("head.inc");
             }
             ?>
             <section class="col-xs-12">
-                <? include('system_advanced_tabs.inc'); ?>
 	                <div class="content-box tab-content">
 
 					<form action="system_advanced_firewall.php" method="post" name="iform" id="iform">

src/www/system_advanced_misc.php

@@ -251,7 +251,6 @@ include("head.inc");
             }
             ?>
             <section class="col-xs-12">
-                <? include('system_advanced_tabs.inc'); ?>
                 <div class="content-box tab-content">
 					<form action="system_advanced_misc.php" method="post" name="iform" id="iform">
 						<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area" class="table table-striped">

src/www/system_advanced_network.php

@@ -159,7 +159,6 @@ include("head.inc");
             }
             ?>
             <section class="col-xs-12">
-                <? include('system_advanced_tabs.inc'); ?>
                 <div class="content-box tab-content">
 					<form action="system_advanced_network.php" method="post" name="iform" id="iform">
 

src/www/system_advanced_notifications.php

@@ -188,7 +188,6 @@ include("head.inc");
 			</form>
 
             <section class="col-xs-12">
-                <? include('system_advanced_tabs.inc'); ?>
                 <div class="content-box tab-content">
 
                     <form action="system_advanced_notifications.php" method="post" name="iform">

src/www/system_advanced_sysctl.php

@@ -116,7 +116,7 @@ if ($_POST) {
     }
 }
 
-$pgtitle = array(gettext("System"),gettext("Settings"),gettext("System Tunables"));
+$pgtitle = array(gettext('System'), gettext('Settings'), gettext('Tunables'));
 include("head.inc");
 
 ?>
@@ -144,7 +144,6 @@ include("head.inc");
 			</form>
 
             <section class="col-xs-12">
-                <? include('system_advanced_tabs.inc'); ?>
                 <div class="table-responsive content-box tab-content" style="overflow: auto;">
                     <?php if ($act != "edit") :
 ?>

src/www/system_advanced_tabs.inc

-<?php
-
-$active_tab = isset($active_tab) ? $active_tab : $_SERVER['PHP_SELF'];
-
-$tab_array = array();
-$tab_array[] = array(gettext("General"), $active_tab == "/system_general.php", "system_general.php");
-$tab_array[] = array(gettext("Admin Access"), $active_tab == "/system_advanced_admin.php", "system_advanced_admin.php");
-$tab_array[] = array(gettext("Firewall / NAT"), $active_tab == "/system_advanced_firewall.php", "system_advanced_firewall.php");
-$tab_array[] = array(gettext("Networking"), $active_tab == "/system_advanced_network.php", "system_advanced_network.php");
-$tab_array[] = array(gettext("Miscellaneous"), $active_tab == "/system_advanced_misc.php", "system_advanced_misc.php");
-$tab_array[] = array(gettext("System Tunables"), $active_tab == "/system_advanced_sysctl.php", "system_advanced_sysctl.php");
-$tab_array[] = array(gettext("Notifications"), $active_tab == "/system_advanced_notifications.php", "system_advanced_notifications.php");
-
-display_top_tabs($tab_array);

src/www/system_general.php

@@ -347,7 +347,6 @@ include("head.inc");
 		if (isset($savemsg)) print_info_box($savemsg);
             ?>
             <section class="col-xs-12">
-                <? include('system_advanced_tabs.inc'); ?>
                 <div class="content-box tab-content">
 
 			<form action="system_general.php" method="post">