From 3cb9dfab36be55132a36049b73ac436fdcdd717e Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 13 Oct 2015 21:24:09 +0200
Subject: [PATCH] vpn/l2tp: pull pages together in menu

---
 .../mvc/app/models/OPNsense/Base/Menu/Menu.xml       |  8 +++++---
 src/www/shortcuts.inc                                |  4 ----
 src/www/vpn_l2tp.php                                 | 11 ++---------
 src/www/vpn_l2tp_users.php                           | 12 ++----------
 src/www/vpn_l2tp_users_edit.php                      | 11 ++---------
 5 files changed, 11 insertions(+), 35 deletions(-)

diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
index 099e0425d..eac0ad089 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
@@ -228,9 +228,11 @@
             <KeysEdit url="/vpn_ipsec_keys_edit.php"/>
             <AdvancedSettings url="/vpn_ipsec_settings.php"/>
         </IPsec>
-        <L2TP url="/vpn_l2tp.php">
-            <L2TPUsers url="/vpn_l2tp_users.php"/>
-            <L2TPUsersEdit url="/vpn_l2tp_users_edit.php*"/>
+        <L2TP cssClass="fa fa-road">
+            <Settings url="/vpn_l2tp.php"/>
+            <Users url="/vpn_l2tp_users.php">
+                <Edit url="/vpn_l2tp_users_edit.php*"/>
+            </Users>
         </L2TP>
         <OpenVPN url="/vpn_openvpn_server.php">
             <ServerEdit url="/vpn_openvpn_server.php?*"/>
diff --git a/src/www/shortcuts.inc b/src/www/shortcuts.inc
index 0d05da324..363c87fcd 100644
--- a/src/www/shortcuts.inc
+++ b/src/www/shortcuts.inc
@@ -244,10 +244,6 @@ $shortcuts['pppoes'] = array();
 $shortcuts['pppoes']['main'] = "vpn_pppoe.php";
 $shortcuts['pppoes']['log'] = "diag_logs_vpn.php?vpntype=poes";
 
-$shortcuts['l2tps'] = array();
-$shortcuts['l2tps']['main'] = "vpn_l2tp.php";
-$shortcuts['l2tps']['log'] = "diag_logs_vpn.php?vpntype=l2tp";
-
 $shortcuts['snmp'] = array();
 $shortcuts['snmp']['main'] = "services_snmp.php";
 $shortcuts['snmp']['service'] = "bsnmpd";
diff --git a/src/www/vpn_l2tp.php b/src/www/vpn_l2tp.php
index 220f257c4..f80619185 100644
--- a/src/www/vpn_l2tp.php
+++ b/src/www/vpn_l2tp.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
 	Copyright (C) 2014-2015 Deciso B.V.
 	Copyright (C) 2005 Scott Ullrich (sullrich@gmail.com)
@@ -26,8 +27,7 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
-$pgtitle = array(gettext("VPN"), gettext("L2TP"), gettext("L2TP"));
-$shortcut_section = "l2tps";
+$pgtitle = array(gettext('VPN'), gettext('L2TP'), gettext('Settings'));
 
 require_once("guiconfig.inc");
 require_once("vpn.inc");
@@ -295,13 +295,6 @@ function enable_change(enable_over) {
 
 			    <section class="col-xs-12">
 
-				<?php
-                        $tab_array = array();
-                        $tab_array[0] = array(gettext("Configuration"), true, "vpn_l2tp.php");
-                        $tab_array[1] = array(gettext("Users"), false, "vpn_l2tp_users.php");
-                        display_top_tabs($tab_array);
-                    ?>
-
 					<div class="tab-content content-box col-xs-12">
 
 							<form action="vpn_l2tp.php" method="post" name="iform" id="iform">
diff --git a/src/www/vpn_l2tp_users.php b/src/www/vpn_l2tp_users.php
index 213bd8def..021ed5a63 100644
--- a/src/www/vpn_l2tp_users.php
+++ b/src/www/vpn_l2tp_users.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
 	Copyright (C) 2014-2015 Deciso B.V.
 	Copyright (C) 2005 Scott Ullrich (sullrich@gmail.com)
@@ -26,13 +27,11 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
-$pgtitle = array(gettext("VPN"),gettext("L2TP"),gettext("Users"));
-$shortcut_section = "l2tps";
+$pgtitle = array(gettext('VPN'),gettext('L2TP'),gettext('Users'));
 
 require_once("guiconfig.inc");
 require_once("vpn.inc");
 
-
 if (!isset($config['l2tp']['user'])) {
     $config['l2tp']['user'] = array();
 }
@@ -98,13 +97,6 @@ endif; ?>
 
 			    <section class="col-xs-12">
 
-				<?php
-                        $tab_array = array();
-                        $tab_array[0] = array(gettext("Configuration"), false, "vpn_l2tp.php");
-                        $tab_array[1] = array(gettext("Users"), true, "vpn_l2tp_users.php");
-                        display_top_tabs($tab_array);
-                    ?>
-
 					<div class="tab-content content-box col-xs-12">
 
 							<form action="vpn_l2tp_users.php" method="post" name="iform" id="iform">
diff --git a/src/www/vpn_l2tp_users_edit.php b/src/www/vpn_l2tp_users_edit.php
index 6bf1ba6de..ec6c9022b 100644
--- a/src/www/vpn_l2tp_users_edit.php
+++ b/src/www/vpn_l2tp_users_edit.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
 	Copyright (C) 2014-2015 Deciso B.V.
 	Copyright (C) 2006 Scott Ullrich (sullrich@gmail.com)
@@ -26,8 +27,7 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
-$pgtitle = array(gettext("VPN"),gettext("L2TP"),gettext("User"),gettext("Edit"));
-$shortcut_section = "l2tps";
+$pgtitle = array(gettext('VPN'), gettext('L2TP'), gettext('Edit User'));
 
 function l2tpusercmp($a, $b)
 {
@@ -161,13 +161,6 @@ include("head.inc");
 
 			    <section class="col-xs-12">
 
-				<?php
-                        $tab_array = array();
-                        $tab_array[0] = array(gettext("Configuration"), false, "vpn_l2tp.php");
-                        $tab_array[1] = array(gettext("Users"), true, "vpn_l2tp_users.php");
-                        display_top_tabs($tab_array);
-                    ?>
-
 					<div class="tab-content content-box col-xs-12">
 
 							<form action="vpn_l2tp_users_edit.php" method="post" name="iform" id="iform">