Move failver vpn settings to ipsec area in a tab

Suggested-by: hoba

6 files changed, 32 insertions, 3 deletions

diff --git a/usr/local/pkg/sasyncd.xml b/usr/local/pkg/sasyncd.xml
index ebfe9e6..ab4f08b 100644
--- a/usr/local/pkg/sasyncd.xml
+++ b/usr/local/pkg/sasyncd.xml
@@ -24,6 +24,33 @@
 		    <fieldname>peerip</fieldname>
 	    </columnitem>
 	</adddeleteeditpagefields>
+	<tabs>
+	    <tab>
+		<text>Tunnels</text>
+		<url>vpn_ipsec.php</url>
+	    </tab>
+	    <tab>
+		<text>Mobile clients</text>
+		<url>vpn_ipsec_mobile.php</url>
+	    </tab>
+	    <tab>
+		<text>Pre-shared keys</text>
+		<url>vpn_ipsec_keys.php</url>
+	    </tab>
+	    <tab>
+		<text>CAs</text>
+		<url>vpn_ipsec_ca.php</url>
+	    </tab>
+	    <tab>
+		<text>Pre-shared keys</text>
+		<url>vpn_ipsec_keys.php</url>
+	    </tab>
+	    <tab>
+		<text>Failover IPSEC</text>
+		<url>/pkg_edit.php?xml=sasyncd.xml&amp;id=0</url>
+		<active/>
+	    </tab>
+	</tabs>	
 	<!-- fields gets invoked when the user adds or edits a item.   the following items
          will be parsed and rendered for the user as a gui with input, and selectboxes. -->
 	<fields>
diff --git a/usr/local/www/fbegin.inc b/usr/local/www/fbegin.inc
index 7a265b0..2af6c28 100755
--- a/usr/local/www/fbegin.inc
+++ b/usr/local/www/fbegin.inc
@@ -111,9 +111,7 @@ function showhide_black(tspan, tri) {
 		&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="/services_snmp.php" class="navlnk">SNMP</a><br>
 		&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="/services_proxyarp.php" class="navlnk">Proxy ARP</a><br>
 		&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="/services_wol.php" class="navlnk">Wake on LAN</a><br>
-		&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="/carp_status.php" class="navlnk">CARP (failover)</a><br>
-		&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="/pkg_edit.php?xml=sasyncd.xml&id=0" class="navlnk">VPN failover</a><br>				
-		
+		&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="/carp_status.php" class="navlnk">CARP (failover)</a><br>		
 	      <?php echo return_ext_menu("Services"); ?>
               <strong>VPN</strong><br>
 		&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="/vpn_ipsec.php" class="navlnk">IPsec</a><br>
diff --git a/usr/local/www/vpn_ipsec.php b/usr/local/www/vpn_ipsec.php
index 26aa54d..40ef34f 100755
--- a/usr/local/www/vpn_ipsec.php
+++ b/usr/local/www/vpn_ipsec.php
@@ -105,6 +105,7 @@ include("head.inc");
 	$tab_array[1] = array("Mobile clients", false, "vpn_ipsec_mobile.php");
 	$tab_array[2] = array("Pre-shared keys", false, "vpn_ipsec_keys.php");
 	$tab_array[3] = array("CAs", false, "vpn_ipsec_ca.php");
+	$tab_array[4] = array("Failover IPSEC", false, "/pkg_edit.php?xml=sasyncd.xml&id=0");
 	display_top_tabs($tab_array);
 ?>  
   </td></tr>
diff --git a/usr/local/www/vpn_ipsec_ca.php b/usr/local/www/vpn_ipsec_ca.php
index 7c7abc0..f764e6d 100755
--- a/usr/local/www/vpn_ipsec_ca.php
+++ b/usr/local/www/vpn_ipsec_ca.php
@@ -69,6 +69,7 @@ include("head.inc");
 	$tab_array[1] = array("Mobile clients", false, "vpn_ipsec_mobile.php");
 	$tab_array[2] = array("Pre-shared keys", false, "vpn_ipsec_keys.php");
 	$tab_array[3] = array("CAs", true, "vpn_ipsec_ca.php");
+	$tab_array[4] = array("Failover IPSEC", false, "/pkg_edit.php?xml=sasyncd.xml&id=0");
 	display_top_tabs($tab_array);
 ?>
   </td></tr>
diff --git a/usr/local/www/vpn_ipsec_keys.php b/usr/local/www/vpn_ipsec_keys.php
index 2c1e795..0cedb20 100755
--- a/usr/local/www/vpn_ipsec_keys.php
+++ b/usr/local/www/vpn_ipsec_keys.php
@@ -68,6 +68,7 @@ include("head.inc");
 	$tab_array[1] = array("Mobile clients", false, "vpn_ipsec_mobile.php");
 	$tab_array[2] = array("Pre-shared keys", true, "vpn_ipsec_keys.php");
 	$tab_array[3] = array("CAs", false, "vpn_ipsec_ca.php");
+	$tab_array[4] = array("Failover IPSEC", false, "/pkg_edit.php?xml=sasyncd.xml&id=0");
 	display_top_tabs($tab_array);
 ?>
   </td></tr>
diff --git a/usr/local/www/vpn_ipsec_mobile.php b/usr/local/www/vpn_ipsec_mobile.php
index b72f470..8138243 100755
--- a/usr/local/www/vpn_ipsec_mobile.php
+++ b/usr/local/www/vpn_ipsec_mobile.php
@@ -199,6 +199,7 @@ function methodsel_change() {
 	$tab_array[1] = array("Mobile clients", true, "vpn_ipsec_mobile.php");
 	$tab_array[2] = array("Pre-shared keys", false, "vpn_ipsec_keys.php");
 	$tab_array[3] = array("CAs", false, "vpn_ipsec_ca.php");
+	$tab_array[4] = array("Failover IPSEC", false, "/pkg_edit.php?xml=sasyncd.xml&id=0");
 	display_top_tabs($tab_array);
 ?>
   </td></tr>