menu: tweak order (VPN before Services); rename "Network Time"

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

@@ -190,7 +190,7 @@
             </StatesTrackSource>
         </Diagnostics>
     </Firewall>
-    <Services order="4" cssClass="glyphicon glyphicon-cog">
+    <Services order="5" cssClass="glyphicon glyphicon-cog">
         <DHCP cssClass="fa fa-bullseye">
             <Server order="100" url="/services_dhcp.php">
                 <Tab url="/services_dhcp.php?if=*"/>
@@ -240,7 +240,7 @@
             </VirtualServer>
             <VirtualServerStatus VisibleName="Virtual Server Status" url="/status_lb_vs.php"/>
         </LoadBalancer>
-        <NTP VisibleName="Network Time Protocol" cssClass="fa fa-clock-o">
+        <NTP VisibleName="Network Time" cssClass="fa fa-clock-o">
             <General url="/services_ntpd.php"/>
             <GPS url="/services_ntpd_gps.php"/>
             <PPS url="/services_ntpd_pps.php"/>
@@ -270,7 +270,7 @@
             <WoLEdit url="/services_wol_edit.php*"/>
         </WoL>
     </Services>
-    <VPN order="5" cssClass="glyphicon glyphicon-lock">
+    <VPN order="4" cssClass="glyphicon glyphicon-lock">
         <IPsec cssClass="fa fa-road">
             <Tunnels VisibleName="Tunnel Settings" url="/vpn_ipsec.php">
                 <Phase1 url="/vpn_ipsec_phase1.php*"/>
@@ -319,7 +319,7 @@
             </Users>
         </PPTP>
     </VPN>
-    <Help order="8" cssClass="glyphicon glyphicon-question-sign">
+    <Help order="6" cssClass="glyphicon glyphicon-question-sign">
         <AboutThisPage VisibleName="About this Page" url="/help.php" IsExternal="Y"/>
         <DevelopersWiki VisibleName="Developers Wiki" url="https://wiki.opnsense.org/index.php/developers"
                         IsExternal="Y"/>

src/www/services_ntpd.php

@@ -163,7 +163,7 @@ if (empty($pconfig['interface'])) {
 }
 
 $shortcut_section = 'ntp';
-$pgtitle = array(gettext('Services'), gettext('Network Time Protocol'));
+$pgtitle = array(gettext('Services'), gettext('Network Time'));
 
 include("head.inc");
 

src/www/services_ntpd_gps.php

@@ -149,7 +149,7 @@ if ($_POST) {
 }
 $closehead = false;
 $pconfig = &$config['ntpd']['gps'];
-$pgtitle = array(gettext("Services"),gettext("NTP GPS"));
+$pgtitle = array(gettext('Services'), gettext('Network Time'), gettext('GPS'));
 $shortcut_section = "ntp";
 include("head.inc");
 ?>

src/www/services_ntpd_pps.php

@@ -89,7 +89,7 @@ if ($_POST) {
 }
 $pconfig = &$config['ntpd']['pps'];
 
-$pgtitle = array(gettext("Services"),gettext("NTP PPS"));
+$pgtitle = array(gettext('Services'), gettext('Network Time'), gettext('PPS'));
 $shortcut_section = "ntp";
 include("head.inc");
 ?>

src/www/status_ntpd.php

@@ -144,7 +144,7 @@ if (isset($config['ntpd']['gps']['type']) && ($config['ntpd']['gps']['type'] ==
 	}
 }
 
-$pgtitle = array(gettext("Status"),gettext("NTP"));
+$pgtitle = array(gettext('Services'), gettext('Network Time'), gettext('Status'));
 $shortcut_section = "ntp";
 include("head.inc");
 ?>