From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

---
 interface/web/dns/lib/module.conf.php |   66 ++++++++++++++++++---------------
 1 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/interface/web/dns/lib/module.conf.php b/interface/web/dns/lib/module.conf.php
index 8018e98..75b17a9 100644
--- a/interface/web/dns/lib/module.conf.php
+++ b/interface/web/dns/lib/module.conf.php
@@ -1,28 +1,34 @@
 <?php
 
-$module["name"] 		= "dns";
-$module["title"] 		= "top_menu_dns";
-$module["template"] 	= "module.tpl.htm";
-$module["startpage"] 	= "dns/dns_soa_list.php";
+$module["name"]   = "dns";
+$module["title"]   = "top_menu_dns";
+$module["template"]  = "module.tpl.htm";
+$module["startpage"]  = "dns/dns_soa_list.php";
 $module["tab_width"]    = '';
+$module['order']    = '50';
 
 
-$items[] = array( 'title' 	=> "Add DNS Zone",
-				  'target' 	=> 'content',
-				  'link'	=> 'dns/dns_wizard.php',
-				  'html_id' => 'dns_wizard');
+$items[] = array( 'title'  => "Add DNS Zone",
+	'target'  => 'content',
+	'link' => 'dns/dns_wizard.php',
+	'html_id' => 'dns_wizard');
+
+$items[] = array( 'title'  => "Import Zone File",
+	'target'  => 'content',
+	'link' => 'dns/dns_import.php',
+	'html_id' => 'dns_import');
 
 if($_SESSION["s"]["user"]["typ"] == 'admin') {
-  $items[] = array( 	'title' 	=> "Templates",
-				  'target' 	=> 'content',
-				  'link'		=> 'dns/dns_template_list.php',
-				  'html_id' => 'dns_template_list');
+	$items[] = array(  'title'  => "Templates",
+		'target'  => 'content',
+		'link'  => 'dns/dns_template_list.php',
+		'html_id' => 'dns_template_list');
 }
 
 
-$module["nav"][] = array(	'title'	=> 'DNS Wizard',
-							'open' 	=> 1,
-							'items'	=> $items);
+$module["nav"][] = array( 'title' => 'DNS Wizard',
+	'open'  => 1,
+	'items' => $items);
 
 
 unset($items);
@@ -32,10 +38,10 @@
 */
 
 
-$items[] = array( 'title' 	=> "Zones",
-				  'target' 	=> 'content',
-				  'link'	=> 'dns/dns_soa_list.php',
-				  'html_id' => 'dns_soa_list');
+$items[] = array( 'title'  => "Zones",
+	'target'  => 'content',
+	'link' => 'dns/dns_soa_list.php',
+	'html_id' => 'dns_soa_list');
 /*
 $items[] = array( 'title' 	=> "A-Records",
 				  'target' 	=> 'content',
@@ -44,20 +50,20 @@
 */
 
 
-$module["nav"][] = array(	'title'	=> 'DNS',
-							'open' 	=> 1,
-							'items'	=> $items);
+$module["nav"][] = array( 'title' => 'DNS',
+	'open'  => 1,
+	'items' => $items);
 
 unset($items);
 
-$items[] = array( 'title' 	=> "Secondary Zones",
-				  'target' 	=> 'content',
-				  'link'	=> 'dns/dns_slave_list.php',
-				  'html_id' => 'dns_slave_list');
+$items[] = array( 'title'  => "Secondary Zones",
+	'target'  => 'content',
+	'link' => 'dns/dns_slave_list.php',
+	'html_id' => 'dns_slave_list');
 
-$module["nav"][] = array(	'title'	=> 'Secondary DNS',
-							'open' 	=> 1,
-							'items'	=> $items);
+$module["nav"][] = array( 'title' => 'Secondary DNS',
+	'open'  => 1,
+	'items' => $items);
 
 unset($items);
 
@@ -65,4 +71,4 @@
 
 
 
-?>
\ No newline at end of file
+?>

--
Gitblit v1.9.1