From 600e22fce57a20cef1899d791edefb21ca010272 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 21 Sep 2015 09:57:35 +0200
Subject: [PATCH] menu: make entry for alias import

---
 .../mvc/app/models/OPNsense/Base/Menu/Menu.xml      | 13 ++++++-------
 src/www/firewall_aliases.php                        |  1 -
 2 files changed, 6 insertions(+), 8 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 3873003f8..ef9c16950 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
@@ -72,15 +72,14 @@
     </Interfaces>
     <Firewall order="3" cssClass="glyphicon glyphicon-fire">
         <Aliases cssClass="fa fa-list-alt">
-            <IP order="100" url="/firewall_aliases.php?tab=ip">
-              <none url="/firewall_aliases.php"/>
-            </IP>
-            <Ports order="200"  url="/firewall_aliases.php?tab=port"/>
-            <URLs  order="300"  url="/firewall_aliases.php?tab=url"/>
-            <All order="400"  url="/firewall_aliases.php?tab=all">
+            <All order="100"  url="/firewall_aliases.php?tab=all">
               <AliasesEdit url="/firewall_aliases_edit.php*"/>
-              <Import url="/firewall_aliases_import.php"/>
+              <none url="/firewall_aliases.php"/>
             </All>
+            <IP order="200" url="/firewall_aliases.php?tab=ip"/>
+            <Ports order="300"  url="/firewall_aliases.php?tab=port"/>
+            <URLs  order="400"  url="/firewall_aliases.php?tab=url"/>
+            <Import order="500" url="/firewall_aliases_import.php"/>
         </Aliases>
         <NAT cssClass="fa fa-exchange">
             <PortForward order="100" VisibleName="Port Forward" url="/firewall_nat.php">
diff --git a/src/www/firewall_aliases.php b/src/www/firewall_aliases.php
index 4078bf371..f6d8f4c40 100644
--- a/src/www/firewall_aliases.php
+++ b/src/www/firewall_aliases.php
@@ -140,7 +140,6 @@ $pgtitle = array(gettext("Firewall"), gettext("Aliases"));
 $shortcut_section = "aliases";
 $main_buttons = array(
     array('href'=>'firewall_aliases_edit.php?tab='.$selected_tab, 'label'=>gettext("Add a new alias")),
-    array('href'=>'firewall_aliases_import.php', 'label'=>gettext("Bulk import aliases from list")),
 );