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 d79058ffb..681b455eb 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml +++ b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml @@ -28,7 +28,7 @@ - + @@ -50,8 +50,8 @@ - + @@ -92,6 +92,9 @@ + + + @@ -212,18 +215,27 @@
- - - - - + + + + + + + + + + + + + + - + - + @@ -248,7 +260,7 @@ - + @@ -263,17 +275,14 @@ - - - - + - + diff --git a/src/opnsense/mvc/app/models/OPNsense/IDS/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/IDS/Menu/Menu.xml index 76972f417..49d15ea3f 100644 --- a/src/opnsense/mvc/app/models/OPNsense/IDS/Menu/Menu.xml +++ b/src/opnsense/mvc/app/models/OPNsense/IDS/Menu/Menu.xml @@ -1,6 +1,6 @@ - + diff --git a/src/www/diag_logs_resolver.php b/src/www/diag_logs_resolver.php index 07843f682..9f03b4675 100644 --- a/src/www/diag_logs_resolver.php +++ b/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"); ?> diff --git a/src/www/services_dnsmasq.php b/src/www/services_dnsmasq.php index 890623f5f..acebec638 100644 --- a/src/www/services_dnsmasq.php +++ b/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"); ?> diff --git a/src/www/services_dnsmasq_domainoverride_edit.php b/src/www/services_dnsmasq_domainoverride_edit.php index 7091641f5..8aeba6629 100644 --- a/src/www/services_dnsmasq_domainoverride_edit.php +++ b/src/www/services_dnsmasq_domainoverride_edit.php @@ -1,4 +1,5 @@ and Manuel Kasper . @@ -111,7 +112,6 @@ if ($_POST) { } $pgtitle = array(gettext("Services"),gettext("DNS forwarder"),gettext("Edit Domain Override")); -$shortcut_section = "resolver"; include("head.inc"); ?> diff --git a/src/www/services_dnsmasq_edit.php b/src/www/services_dnsmasq_edit.php index e4a075479..043692894 100644 --- a/src/www/services_dnsmasq_edit.php +++ b/src/www/services_dnsmasq_edit.php @@ -1,4 +1,5 @@ and Manuel Kasper . @@ -156,7 +157,6 @@ if ($_POST) { } $pgtitle = array(gettext("Services"),gettext("DNS forwarder"),gettext("Edit host")); -$shortcut_section = "resolver"; include("head.inc"); ?> diff --git a/src/www/services_unbound.php b/src/www/services_unbound.php index 22c648a45..19a7347c9 100644 --- a/src/www/services_unbound.php +++ b/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() {
- -
@@ -215,7 +206,7 @@ function show_advanced_dns() { - + diff --git a/src/www/services_unbound_acls.php b/src/www/services_unbound_acls.php index 93622ba78..554691973 100644 --- a/src/www/services_unbound_acls.php +++ b/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");
- -
diff --git a/src/www/services_unbound_advanced.php b/src/www/services_unbound_advanced.php index 0e3477b80..d8db90428 100644 --- a/src/www/services_unbound_advanced.php +++ b/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");
- -
-
@@ -156,7 +147,7 @@ include_once("head.inc"); - + @@ -412,9 +403,6 @@ include_once("head.inc");

- -   - diff --git a/src/www/services_unbound_domainoverride_edit.php b/src/www/services_unbound_domainoverride_edit.php index d91a7ab09..4c40a6fc7 100644 --- a/src/www/services_unbound_domainoverride_edit.php +++ b/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"); ?> diff --git a/src/www/services_unbound_host_edit.php b/src/www/services_unbound_host_edit.php index 5947fe44e..d2396fb99 100644 --- a/src/www/services_unbound_host_edit.php +++ b/src/www/services_unbound_host_edit.php @@ -1,7 +1,8 @@ Copyright (C) 2003-2004 Bob Zoller and Manuel Kasper . 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"); ?> diff --git a/src/www/shortcuts.inc b/src/www/shortcuts.inc index 85e2d1f3b..87b667003 100644 --- a/src/www/shortcuts.inc +++ b/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";