vpn/pptp: collapse to menu

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

@@ -241,9 +241,11 @@
             <ClientExport url="/vpn_openvpn_export.php*"/>
             <SharedKeyExport url="/vpn_openvpn_export_shared.php"/>
         </OpenVPN>
-        <PPTP url="/vpn_pptp.php">
-            <PPTPUsers url="/vpn_pptp_users.php"/>
-            <PPTPUsersEdit url="/vpn_pptp_users_edit.php"/>
+        <PPTP cssClass="fa fa-road">
+            <Settings url="/vpn_pptp.php"/>
+            <Users url="/vpn_pptp_users.php">
+                <Edit url="/vpn_pptp_users_edit.php*"/>
+            </Users>
         </PPTP>
     </VPN>
     <Status order="6" cssClass="glyphicon glyphicon-tasks">

src/www/shortcuts.inc

@@ -236,10 +236,6 @@ $shortcuts['ntp']['log'] = "diag_logs_ntpd.php";
 $shortcuts['ntp']['status'] = "status_ntpd.php";
 $shortcuts['ntp']['service'] = "ntpd";
 
-$shortcuts['pptps'] = array();
-$shortcuts['pptps']['main'] = "vpn_pptp.php";
-$shortcuts['pptps']['log'] = "diag_logs_vpn.php";
-
 $shortcuts['pppoes'] = array();
 $shortcuts['pppoes']['main'] = "vpn_pppoe.php";
 $shortcuts['pppoes']['log'] = "diag_logs_vpn.php?vpntype=poes";

src/www/vpn_pptp.php

@@ -196,8 +196,7 @@ if ($_POST) {
     }
 }
 
-$pgtitle = array(gettext("VPN"),gettext("VPN PPTP"));
-$shortcut_section = "pptps";
+$pgtitle = array(gettext('VPN'), gettext('PPTP'), gettext('Settings'));
 include("head.inc");
 
 ?>
@@ -313,13 +312,6 @@ function enable_change(enable_over) {
 
 			    <section class="col-xs-12">
 
-				<?php
-                        $tab_array = array();
-                        $tab_array[0] = array(gettext("Configuration"), true, "vpn_pptp.php");
-                        $tab_array[1] = array(gettext("Users"), false, "vpn_pptp_users.php");
-                        display_top_tabs($tab_array);
-                    ?>
-
 					<div class="tab-content content-box col-xs-12">
 
 							<form action="vpn_pptp.php" method="post" name="iform" id="iform">

src/www/vpn_pptp_users.php

@@ -60,8 +60,7 @@ if ($_GET['act'] == "del") {
     }
 }
 
-$pgtitle = array(gettext("VPN"),gettext("VPN PPTP"),gettext("Users"));
-$shortcut_section = "pptps";
+$pgtitle = array(gettext('VPN'), gettext('PPTP'), gettext('Users'));
 include("head.inc");
 
 $main_buttons = array(
@@ -91,13 +90,6 @@ endif; ?>
 
 			    <section class="col-xs-12">
 
-				<?php
-                        $tab_array = array();
-                        $tab_array[0] = array(gettext("Configuration"), false, "vpn_pptp.php");
-                        $tab_array[1] = array(gettext("Users"), true, "vpn_pptp_users.php");
-                        display_top_tabs($tab_array);
-                    ?>
-
 					<div class="tab-content content-box col-xs-12">
 
 							<form action="vpn_pptp_users.php" method="post" name="iform" id="iform">

src/www/vpn_pptp_users_edit.php

@@ -134,8 +134,7 @@ if ($_POST) {
     }
 }
 
-$pgtitle = array(gettext("VPN"),gettext("VPN PPTP"),gettext("User"),gettext("Edit"));
-$shortcut_section = "pptps";
+$pgtitle = array(gettext('VPN'), gettext('PPTP'), gettext('Edit User'));
 include("head.inc");
 
 ?>
@@ -153,14 +152,6 @@ include("head.inc");
 } ?>
 
 			    <section class="col-xs-12">
-
-				<?php
-                        $tab_array = array();
-                        $tab_array[0] = array(gettext("Configuration"), false, "vpn_pptp.php");
-                        $tab_array[1] = array(gettext("Users"), true, "vpn_pptp_users.php");
-                        display_top_tabs($tab_array);
-                    ?>
-
 					<div class="tab-content content-box col-xs-12">
 
 							<form action="vpn_pptp_users_edit.php" method="post" name="iform" id="iform">