menu: more consolidation for #461

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

@@ -28,7 +28,7 @@
             <Synchronization url="/system_hasync.php"/>
             <CARPStatus order="100" VisibleName="CARP Status" url="/carp_status.php"/>
         </HighAvailability>
-        <Routes order="40" cssClass="fa fa-wrench">
+        <Routes order="40" cssClass="fa fa-map-signs">
             <All url="/system_routes.php">
                 <Edit url="/system_routes_edit.php*"/>
             </All>
@@ -50,8 +50,8 @@
             <General url="/diag_logs.php"/>
             <Gateways url="/diag_logs_gateways.php"/>
             <Routing url="/diag_logs_routing.php"/>
-            <Resolver url="/diag_logs_resolver.php"/>
             <Wireless url="/diag_logs_wireless.php"/>
+            <DNS url="/diag_logs_resolver.php"/>
             <DHCP url="/diag_logs_dhcp.php"/>
             <PPP url="/diag_logs_ppp.php"/>
             <VPN url="/diag_logs_vpn.php?vpntype=pptp">
@@ -92,6 +92,9 @@
             <Halt VisibleName="Halt System" url="/diag_halt.php"/>
             <Reboot VisibleName="Reboot System" url="/reboot.php"/>
             <SmartStatus VisibleName="SMART Status" url="/diag_smart.php"/>
+            <Services url="/status_services.php">
+                <All url="/status_services.php?*"/>
+            </Services>
         </Diagnostics>
     </System>
     <Interfaces order="2" cssClass="fa fa-sitemap">
@@ -212,18 +215,27 @@
                 <Details url="/status_dhcpv6_leases.php?*"/>
             </Leases>
         </DHCPv6>
-        <DNSFilter VisibleName="DNS Filter" url="/services_opendns.php"/>
-        <DNSForwarder VisibleName="DNS Forwarder" url="/services_dnsmasq.php"/>
-        <DNSResolver VisibleName="DNS Resolver" url="/services_unbound.php">
-            <Advanced url="/services_unbound_advanced.php"/>
-            <ACLs url="/services_unbound_acls.php*"/>
+        <DNSFilter VisibleName="DNS Filter" url="/services_opendns.php" cssClass="fa fa-tags"/>
+        <DNSForwarder VisibleName="DNS Forwarder" url="/services_dnsmasq.php" cssClass="fa fa-tags">
+            <Hosts url="/services_dnsmasq_edit.php*"/>
+            <Domains url="/services_dnsmasq_domainoverride_edit.php*"/>
+        </DNSForwarder>
+        <DNSResolver VisibleName="DNS Resolver" cssClass="fa fa-tags">
+            <General order="10" url="/services_unbound.php">
+                <Hosts url="/services_unbound_host_edit.php*"/>
+                <Domains url="/services_unbound_domainoverride_edit.php*"/>
+            </General>
+            <Advanced order="20" url="/services_unbound_advanced.php"/>
+            <ACL VisibleName="Access Lists" order="30" url="/services_unbound_acls.php">
+                <All url="/services_unbound_acls.php*"/>
+            </ACL>
         </DNSResolver>
-        <DynamicDNS VisibleName="Dynamic DNS" url="/services_dyndns.php">
+        <DynamicDNS VisibleName="Dynamic DNS" url="/services_dyndns.php" cssClass="fa fa-tags">
             <DynamicDNSRFC2136Clients url="/services_rfc2136.php"/>
             <DynamicDNSRFC2136ClientsEdit url="/services_rfc2136_edit.php"/>
             <DynamicDNSEdit url="/services_dyndns_edit.php"/>
         </DynamicDNS>
-        <IGMPProxy VisibleName="IGMP Proxy" url="/services_igmpproxy.php">
+        <IGMPProxy VisibleName="IGMP Proxy" url="/services_igmpproxy.php" cssClass="fa fa-map-signs">
             <IGMPProxyEdit url="/services_igmpproxy_edit.php"/>
         </IGMPProxy>
         <LoadBalancer VisibleName="Load Balancer" cssClass="fa fa-truck">
@@ -248,7 +260,7 @@
             <Status url="/status_ntpd.php"/>
             <Log VisibleName="Log File" url="/diag_logs_ntpd.php"/>
         </NTP>
-        <PPPoEServer VisibleName="PPPoE Server" url="/vpn_pppoe.php">
+        <PPPoEServer VisibleName="PPPoE Server" url="/vpn_pppoe.php" cssClass="fa fa-tty">
             <PPPoeServerEdit url="/vpn_pppoe_edit.php"/>
         </PPPoEServer>
         <PPTP cssClass="fa fa-unlock">
@@ -263,17 +275,14 @@
                 <More url="/diag_logs_proxy.php*"/>
             </Log>
         </Proxy>
-        <SNMP VisibleName="SNMP" url="/services_snmp.php"/>
-        <Status VisibleName="Status Overview" url="/status_services.php">
-            <ServicesActions url="/status_services.php?*"/>
-        </Status>
+        <SNMP VisibleName="SNMP" url="/services_snmp.php" cssClass="fa fa-database"/>
         <UPnP VisibleName="Universal Plug and Play" cssClass="fa fa-plug">
             <Settings url="/services_upnp.php">
                 <Edit url="/services_upnp.php?*"/>
             </Settings>
             <Status url="/status_upnp.php"/>
         </UPnP>
-        <WoL VisibleName="Wake on LAN" url="/services_wol.php">
+        <WoL VisibleName="Wake on LAN" url="/services_wol.php" cssClass="fa fa-power-off">
             <WoLEdit url="/services_wol_edit.php*"/>
         </WoL>
     </Services>

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

 <menu>
     <!-- Plugin IDS menu -->
     <Services order="4" cssClass="glyphicon glyphicon-cog">
-        <IDS VisibleName="Intrusion Detection" url="/ui/ids/"/>
+        <IDS VisibleName="Intrusion Detection" url="/ui/ids/" cssClass="fa fa-shied"/>
     </Services>
 </menu>

src/www/diag_logs_resolver.php

@@ -50,8 +50,7 @@ if (isset($_POST['filtertext'])) {
 	$filtertext = htmlspecialchars($_POST['filtertext']);
 }
 
-$pgtitle = array(gettext('System'), gettext('Log Files'), gettext('Resolver'));
-$shortcut_section = "resolver";
+$pgtitle = array(gettext('System'), gettext('Log Files'), gettext('DNS'));
 include("head.inc");
 
 ?>

src/www/services_dnsmasq.php

@@ -140,8 +140,7 @@ if ($_GET['act'] == "del") {
 }
 
 $closehead = false;
-$pgtitle = array(gettext("Services"),gettext("DNS forwarder"));
-$shortcut_section = "forwarder";
+$pgtitle = array(gettext("Services"),gettext("DNS Forwarder"));
 include("head.inc");
 
 ?>

src/www/services_dnsmasq_domainoverride_edit.php

 <?php
+
 /*
 	Copyright (C) 2014-2015 Deciso B.V.
 	Copyright (C) 2003-2005 Bob Zoller <bob@kludgebox.com> and Manuel Kasper <mk@neon1.net>.
@@ -111,7 +112,6 @@ if ($_POST) {
 }
 
 $pgtitle = array(gettext("Services"),gettext("DNS forwarder"),gettext("Edit Domain Override"));
-$shortcut_section = "resolver";
 include("head.inc");
 
 ?>

src/www/services_dnsmasq_edit.php

 <?php
+
 /*
 	Copyright (C) 2014-2015 Deciso B.V.
 	Copyright (C) 2003-2004 Bob Zoller <bob@kludgebox.com> and Manuel Kasper <mk@neon1.net>.
@@ -156,7 +157,6 @@ if ($_POST) {
 }
 
 $pgtitle = array(gettext("Services"),gettext("DNS forwarder"),gettext("Edit host"));
-$shortcut_section = "resolver";
 include("head.inc");
 
 ?>

src/www/services_unbound.php

@@ -162,8 +162,7 @@ if ($_GET['act'] == "del") {
 }
 
 $closehead = false;
-$pgtitle = array(gettext("Services"),gettext("DNS Resolver"));
-$shortcut_section = "resolver";
+$pgtitle = array(gettext('Services'), gettext('DNS Resolver'), gettext('General'));
 include_once("head.inc");
 
 ?>
@@ -200,14 +199,6 @@ function show_advanced_dns() {
 
 			    <section class="col-xs-12">
 
-				<?php
-						$tab_array = array();
-						$tab_array[] = array(gettext("General settings"), true, "services_unbound.php");
-						$tab_array[] = array(gettext("Advanced settings"), false, "services_unbound_advanced.php");
-						$tab_array[] = array(gettext("Access Lists"), false, "/services_unbound_acls.php");
-						display_top_tabs($tab_array, true);
-					?>
-
 					<div class="tab-content content-box col-xs-12">
 
 								<div class="table-responsive">
@@ -215,7 +206,7 @@ function show_advanced_dns() {
 
 										<tbody>
 											<tr>
-												<td colspan="2" valign="top" class="listtopic"><?=gettext("General DNS Resolver Options");?></td>
+												<td colspan="2" valign="top" class="listtopic"><strong><?=gettext("General DNS Resolver Options");?></strong></td>
 											</tr>
 											<tr>
 												<td width="22%" valign="top" class="vncellreq"><?=gettext("Enable");?></td>

src/www/services_unbound_acls.php

@@ -157,7 +157,7 @@ if ($_POST) {
 }
 
 $closehead = false;
-$pgtitle = "Services: DNS Resolver: Access Lists";
+$pgtitle = array(gettext('Services'), gettext('DNS Resolver'), gettext('Access Lists'));
 include("head.inc");
 
 ?>
@@ -203,14 +203,6 @@ include("head.inc");
 
 			    <section class="col-xs-12">
 
-				<?php
-						$tab_array = array();
-						$tab_array[] = array(gettext("General Settings"), false, "/services_unbound.php");
-						$tab_array[] = array(gettext("Advanced settings"), false, "services_unbound_advanced.php");
-						$tab_array[] = array(gettext("Access Lists"), true, "/services_unbound_acls.php");
-						display_top_tabs($tab_array, true);
-					?>
-
 					<div class="tab-content content-box col-xs-12">
 					    <form action="services_unbound_acls.php" method="post" name="iform" id="iform">
 							<?php if($act=="new" || $act=="edit"): ?>

src/www/services_unbound_advanced.php

@@ -114,7 +114,7 @@ if ($_POST) {
 }
 
 $closehead = false;
-$pgtitle = array(gettext("Services"),gettext("DNS Resolver"),gettext("Advanced"));
+$pgtitle = array(gettext('Services'), gettext('DNS Resolver'), gettext('Advanced'));
 include_once("head.inc");
 
 ?>
@@ -138,17 +138,8 @@ include_once("head.inc");
 
 			    <section class="col-xs-12">
 
-				<?php
-						$tab_array = array();
-						$tab_array[] = array(gettext("General settings"), false, "services_unbound.php");
-						$tab_array[] = array(gettext("Advanced settings"), true, "services_unbound_advanced.php");
-						$tab_array[] = array(gettext("Access Lists"), false, "/services_unbound_acls.php");
-						display_top_tabs($tab_array, true);
-					?>
-
 					<div class="tab-content content-box col-xs-12">
 
-
 							<form action="services_unbound_advanced.php" method="post" name="iform" id="iform">
 
 								<div class="table-responsive">
@@ -156,7 +147,7 @@ include_once("head.inc");
 
 										<tbody>
 											<tr>
-												<td colspan="2" valign="top" class="listtopic"><?=gettext("Advanced Resolver Options");?></td>
+												<td colspan="2" valign="top" class="listtopic"><strong><?=gettext("Advanced Resolver Options");?></strong></td>
 											</tr>
 											<tr>
 												<td width="22%" valign="top" class="vncell"><?=gettext("Hide Identity");?></td>
@@ -412,9 +403,6 @@ include_once("head.inc");
 													</p>
 												</td>
 											</tr>
-											<tr>
-												<td colspan="2">&nbsp;</td>
-											</tr>
 											<tr>
 												<td width="22%"></td>
 												<td width="78%">

src/www/services_unbound_domainoverride_edit.php

@@ -100,8 +100,7 @@ if ($_POST) {
     }
 }
 
-$pgtitle = array(gettext("Services"),gettext("DNS Resolver"),gettext("Edit Domain Override"));
-$shortcut_section = "resolver";
+$pgtitle = array(gettext('Services'), gettext('DNS Resolver'), gettext('Edit Domain Override'));
 include("head.inc");
 
 ?>

src/www/services_unbound_host_edit.php

 <?php
+
 /*
 	Copyright (C) 2014-2015 Deciso B.V.
-	Copyright (C) 2014 Warren Baker (warren@decoy.co.za)
+	Copyright (C) 2014 Warren Baker <warren@decoy.co.za>
 	Copyright (C) 2003-2004 Bob Zoller <bob@kludgebox.com> and Manuel Kasper <mk@neon1.net>.
 	All rights reserved.
 
@@ -154,8 +155,7 @@ if ($_POST) {
 	}
 }
 
-$pgtitle = array(gettext("Services"),gettext("DNS Resolver"),gettext("Edit host"));
-$shortcut_section = "resolver";
+$pgtitle = array(gettext('Services'), gettext('DNS Resolver'), gettext('Edit host'));
 include("head.inc");
 
 ?>

src/www/shortcuts.inc

@@ -169,16 +169,6 @@ $shortcuts['gateway-groups']['main'] = "system_gateway_groups.php";
 $shortcuts['gateway-groups']['log'] = "diag_logs_gateways.php";
 $shortcuts['gateway-groups']['status'] = "status_gateway_groups.php";
 
-$shortcuts['forwarder'] = array();
-$shortcuts['forwarder']['main'] = "services_dnsmasq.php";
-$shortcuts['forwarder']['log'] = "diag_logs_resolver.php";
-$shortcuts['forwarder']['service'] = "dnsmasq";
-
-$shortcuts['resolver'] = array();
-$shortcuts['resolver']['main'] = "services_unbound.php";
-$shortcuts['resolver']['log'] = "diag_logs_resolver.php";
-$shortcuts['resolver']['service'] = "unbound";
-
 $shortcuts['ntp'] = array();
 $shortcuts['ntp']['service'] = "ntpd";	/* really, hook it all up through some weird hint? */
 
@@ -201,5 +191,4 @@ $shortcuts['aliases']['status'] = "diag_tables.php";
 $shortcuts['squid'] = array();
 $shortcuts['squid']['main'] = "ui/proxy/";
 $shortcuts['squid']['log'] = "diag_logs_proxy.php";
-//TODO: $shortcuts['squid']['status'] = "";
 $shortcuts['squid']['service'] = "squid";