From e045be13d204dc72d86e39a2f447f66158908113 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 2 Apr 2018 17:29:38 +0000
Subject: [PATCH] system: merge activity and services

Leaves "Services" point for actual services.
---
 src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml   | 8 +++++---
 .../mvc/app/models/OPNsense/Diagnostics/Menu/Menu.xml     | 4 +++-
 2 files changed, 8 insertions(+), 4 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 049762888..fd83a7a0d 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
@@ -95,6 +95,11 @@
             <Configd order="150" VisibleName="Configd" url="/configd_logs.php"/>
             <WebGUI order="200" VisibleName="Web GUI" url="/httpd_logs.php"/>
         </LogFiles>
+        <Diagnostics order="160" cssClass="fa fa-medkit fa-fw">
+            <Services url="/status_services.php">
+                <All url="/status_services.php?*" visibility="hidden"/>
+            </Services>
+        </Diagnostics>
     </System>
     <Interfaces order="30" cssClass="fa fa-sitemap">
         <Assignments order="900" url="/interfaces_assign.php" cssClass="fa fa-pencil fa-fw"/>
@@ -215,9 +220,6 @@
         </DHCPv6>
         <OpenDNS VisibleName="OpenDNS" url="/services_opendns.php" cssClass="fa fa-tags fa-fw"/>
         <RouterAdv VisibleName="Router Advertisements" cssClass="fa fa-bullseye fa-fw" />
-        <Diagnostics order="900" cssClass="fa fa-medkit fa-fw" url="/status_services.php">
-          <All url="/status_services.php?*" visibility="hidden"/>
-        </Diagnostics>
     </Services>
     <VPN order="50" cssClass="fa fa-globe">
         <IPsec cssClass="fa fa-lock fa-fw" order="10">
diff --git a/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Menu/Menu.xml
index 35868ccc4..bc258fdad 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Menu/Menu.xml
@@ -5,7 +5,9 @@
         <NetFlow url="/ui/diagnostics/netflow/" cssClass="fa fa-rss fa-fw"/>
     </Reporting>
     <System>
-        <Activity order="160" url="/ui/diagnostics/activity/" cssClass="fa fa-medkit fa-fw"/>
+        <Diagnostics>
+            <Activity url="/ui/diagnostics/activity/" cssClass="fa fa-medkit fa-fw"/>
+        </Diagnostics>
         <Routes>
             <Status order="20" url="/ui/diagnostics/interface/routes/"/>
         </Routes>