From 7552aa99bf41aeaf5c609d115c04e03c346bd8a0 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 14 Oct 2015 00:10:12 +0200
Subject: [PATCH] ntp: cluster service pages

---
 .../app/models/OPNsense/Base/Menu/Menu.xml    |  9 ++++----
 src/www/diag_logs_tabs.inc                    |  1 -
 src/www/services_ntpd.php                     | 21 +++++++------------
 src/www/services_ntpd_gps.php                 |  9 +-------
 src/www/services_ntpd_pps.php                 |  9 +-------
 src/www/shortcuts.inc                         |  5 +----
 6 files changed, 16 insertions(+), 38 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 109da307b..6935b2893 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
@@ -150,6 +150,7 @@
         </VirtualIPs>
         <Diagnostics order="900" cssClass="fa fa-medkit">
             <LimiterInfo VisibleName="Limiter Info" url="/diag_limiter_info.php"/>
+            <FilterReload VisibleName="Filter Reload" url="/status_filter_reload.php"/>
             <pfInfo url="/diag_pf_info.php" VisibleName="pfInfo"/>
             <pfTop url="/diag_system_pftop.php" VisibleName="pfTop"/>
             <pfTables url="/diag_tables.php">
@@ -207,9 +208,12 @@
             <Monitors url="/load_balancer_monitor.php"/>
             <Settings url="/load_balancer_setting.php"/>
         </LoadBalancer>
-        <NTP VisibleName="Network Time Protocol" url="/services_ntpd.php">
+        <NTP VisibleName="Network Time Protocol" cssClass="fa fa-clock-o">
+            <General url="/services_ntpd.php"/>
             <GPS url="/services_ntpd_gps.php"/>
             <PPS url="/services_ntpd_pps.php"/>
+            <Status url="/status_ntpd.php"/>
+            <Log url="/diag_logs_ntpd.php"/>
         </NTP>
         <PPPoEServer VisibleName="PPPoE Server" url="/vpn_pppoe.php">
             <PPPoeServerEdit url="/vpn_pppoe_edit.php"/>
@@ -281,11 +285,9 @@
         <DHCPv6Leases VisibleName="DHCP IPv6 Leases" url="/status_dhcpv6_leases.php">
             <DHCPv6LeasesDetails url="/status_dhcpv6_leases.php?*"/>
         </DHCPv6Leases>
-        <FilterReload VisibleName="Filter Reload" url="/status_filter_reload.php"/>
         <LoadBalancer VisibleName="Load Balancer" url="/status_lb_pool.php">
             <VirtualServers url="/status_lb_vs.php"/>
         </LoadBalancer>
-        <NTP url="/status_ntpd.php"/>
         <Services url="/status_services.php">
             <ServicesActions url="/status_services.php?*"/>
         </Services>
@@ -306,7 +308,6 @@
             <VPN url="/diag_logs_vpn.php*"/>
             <LoadBalancer url="/diag_logs_relayd.php"/>
             <OpenVPN url="/diag_logs_openvpn.php"/>
-            <NTP url="/diag_logs_ntpd.php"/>
             <Proxy url="/diag_logs_proxy.php">
                 <ProxyActions url="/diag_logs_proxy.php?*"/>
             </Proxy>
diff --git a/src/www/diag_logs_tabs.inc b/src/www/diag_logs_tabs.inc
index 14d241854..89dacefd7 100644
--- a/src/www/diag_logs_tabs.inc
+++ b/src/www/diag_logs_tabs.inc
@@ -36,7 +36,6 @@ $tab_array[] = array(gettext("PPP"), $active_tab == "/diag_logs_ppp.php", "diag_
 $tab_array[] = array(gettext("VPN"), $active_tab == "/diag_logs_vpn.php", "diag_logs_vpn.php");
 $tab_array[] = array(gettext("Load Balancer"), $active_tab == "/diag_logs_relayd.php", "diag_logs_relayd.php");
 $tab_array[] = array(gettext("OpenVPN"), $active_tab == "/diag_logs_openvpn.php", "diag_logs_openvpn.php");
-$tab_array[] = array(gettext("NTP"), $active_tab == "/diag_logs_ntpd.php", "diag_logs_ntpd.php");
 $tab_array[] = array(gettext("Proxy"), $active_tab == "/diag_logs_proxy.php", "diag_logs_proxy.php?type=cache");
 $tab_array[] = array(gettext("Settings"), $active_tab == "/diag_logs_settings.php", "diag_logs_settings.php");
 display_top_tabs($tab_array);
diff --git a/src/www/services_ntpd.php b/src/www/services_ntpd.php
index 18754af1f..86f332dec 100644
--- a/src/www/services_ntpd.php
+++ b/src/www/services_ntpd.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
 	Copyright (C) 2014-2015 Deciso B.V.
 	Copyright (C) 2013	Dagorlad
@@ -155,12 +156,15 @@ if ($_POST) {
 }
 $closehead = false;
 $pconfig = &$config['ntpd'];
-if (empty($pconfig['interface']))
+if (empty($pconfig['interface'])) {
 	$pconfig['interface'] = array();
-else
+} else {
 	$pconfig['interface'] = explode(",", $pconfig['interface']);
-$pgtitle = array(gettext("Services"),gettext("NTP"));
-$shortcut_section = "ntp";
+}
+
+$shortcut_section = 'ntp';
+$pgtitle = array(gettext('Services'), gettext('Network Time Protocol'));
+
 include("head.inc");
 
 ?>
@@ -217,17 +221,8 @@ include("head.inc");
 
 			    <section class="col-xs-12">
 
-				<?php
-						$tab_array = array();
-						$tab_array[] = array(gettext("NTP"), true, "services_ntpd.php");
-						$tab_array[] = array(gettext("Serial GPS"), false, "services_ntpd_gps.php");
-						$tab_array[] = array(gettext("PPS"), false, "services_ntpd_pps.php");
-						display_top_tabs($tab_array);
-					?>
-
 					<div class="tab-content content-box col-xs-12">
 
-
 					   <form action="services_ntpd.php" method="post" name="iform" id="iform" enctype="multipart/form-data" accept-charset="utf-8">
 
 								<div class="table-responsive">
diff --git a/src/www/services_ntpd_gps.php b/src/www/services_ntpd_gps.php
index 8d3d2d115..bbe60fa36 100644
--- a/src/www/services_ntpd_gps.php
+++ b/src/www/services_ntpd_gps.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
 	Copyright (C) 2014-2015 Deciso B.V.
 	Copyright (C) 2013	Dagorlad
@@ -357,14 +358,6 @@ SureGPS =		#Sure Electronics SKG16B
 
 			    <section class="col-xs-12">
 
-				<?php
-						$tab_array = array();
-						$tab_array[] = array(gettext("NTP"), false, "services_ntpd.php");
-						$tab_array[] = array(gettext("Serial GPS"), true, "services_ntpd_gps.php");
-						$tab_array[] = array(gettext("PPS"), false, "services_ntpd_pps.php");
-						display_top_tabs($tab_array);
-					?>
-
 					<div class="tab-content content-box col-xs-12">
 
 					  <form action="services_ntpd_gps.php" method="post" name="iform" id="iform" accept-charset="utf-8">
diff --git a/src/www/services_ntpd_pps.php b/src/www/services_ntpd_pps.php
index c5a47a5fa..83f8b26fe 100644
--- a/src/www/services_ntpd_pps.php
+++ b/src/www/services_ntpd_pps.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
 	Copyright (C) 2014-2015 Deciso B.V.
 	Copyright (C) 2013	Dagorlad
@@ -105,14 +106,6 @@ include("head.inc");
 
 			    <section class="col-xs-12">
 
-				<?php
-						$tab_array = array();
-						$tab_array[] = array(gettext("NTP"), false, "services_ntpd.php");
-						$tab_array[] = array(gettext("Serial GPS"), false, "services_ntpd_gps.php");
-						$tab_array[] = array(gettext("PPS"), true, "services_ntpd_pps.php");
-						display_top_tabs($tab_array);
-					?>
-
 					<div class="tab-content content-box col-xs-12">
 
 					  <form action="services_ntpd_pps.php" method="post" name="iform" id="iform">
diff --git a/src/www/shortcuts.inc b/src/www/shortcuts.inc
index 0991fc97b..ed2c6e7bc 100644
--- a/src/www/shortcuts.inc
+++ b/src/www/shortcuts.inc
@@ -212,10 +212,7 @@ $shortcuts['wireless']['log'] = "diag_logs_wireless.php";
 $shortcuts['wireless']['status'] = "status_wireless.php";
 
 $shortcuts['ntp'] = array();
-$shortcuts['ntp']['main'] = "services_ntpd.php";
-$shortcuts['ntp']['log'] = "diag_logs_ntpd.php";
-$shortcuts['ntp']['status'] = "status_ntpd.php";
-$shortcuts['ntp']['service'] = "ntpd";
+$shortcuts['ntp']['service'] = "ntpd";	/* really, hook it all up through some weird hint? */
 
 $shortcuts['pppoes'] = array();
 $shortcuts['pppoes']['main'] = "vpn_pppoe.php";