high availability: tigher navigation with submenu, no more shortcuts

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

@@ -16,7 +16,7 @@
                 <workAround url="/system_crlmanager.php*"/>
             </Revocation>
         </CertificateManager>
-        <ConfigManager VisibleName="Config Manager" cssClass="fa fa-history">
+        <ConfigManager VisibleName="Config Manager" cssClass="fa fa-book">
             <History url="/diag_confbak.php">
                 <none url="/diag_confbak.php*"/>
             </History>
@@ -24,7 +24,10 @@
         </ConfigManager>
         <CrashReporter VisibleName="Crash Reporter" url="/crash_reporter.php"/>
         <Firmware url="/ui/core/firmware/"/>
-        <HighAvailSync VisibleName="High Availability" url="/system_hasync.php"/>
+        <HighAvailability VisibleName="High Availability" cssClass="fa fa-refresh">
+            <Synchronization url="/system_hasync.php"/>
+            <CARPStatus order="100" visibleName="CARP Status" url="/carp_status.php"/>
+        </HighAvailability>
         <Routing url="/system_gateways.php">
             <Routes url="/system_routes.php"/>
             <RoutesEdit url="/system_routes_edit.php*"/>
@@ -206,7 +209,6 @@
         <CaptivePortal VisibleName="Captive Portal" url="/status_captiveportal.php">
             <CaptivePortalDetails url="/status_captiveportal.php?*"/>
         </CaptivePortal>
-        <CARP url="/carp_status.php"/>
         <DHCPLeases VisibleName="DHCP IPv4 Leases" url="/status_dhcp_leases.php">
             <DHCPLeasesDetails url="/status_dhcp_leases.php?*"/>
         </DHCPLeases>

src/www/carp_status.php

@@ -96,8 +96,7 @@ $status = get_carp_status();
 
 $carp_detected_problems = (array_pop(get_sysctl("net.inet.carp.demotion")) > 0);
 
-$pgtitle = array(gettext("Status"),gettext("CARP"));
-$shortcut_section = "carp";
+$pgtitle = array(gettext('System'), gettext('High Availability'), gettext('CARP Status'));
 include("head.inc");
 
 ?>
@@ -200,19 +199,12 @@ include("head.inc");
                     </div>
 
                     <div class="col-xs-12">
-						<p class="vexpl">
-							<span class="red"><strong><?=gettext("Note"); ?>:</strong></span>
-							<br />
-							<?=gettext("You can configure high availability settings");
-?> <a href="system_hasync.php"><?=gettext("here"); ?></a>.
-						</p>
-
-						<?php
+<?php
                             echo "<br />" . gettext("pfSync nodes") . ":<br />";
                             echo "<pre>";
                             system("/sbin/pfctl -vvss | /usr/bin/grep creator | /usr/bin/cut -d\" \" -f7 | /usr/bin/sort -u");
                             echo "</pre>";
-                        ?>
+?>
                     </div>
 
 				</div>

src/www/shortcuts.inc

@@ -248,10 +248,6 @@ $shortcuts['l2tps'] = array();
 $shortcuts['l2tps']['main'] = "vpn_l2tp.php";
 $shortcuts['l2tps']['log'] = "diag_logs_vpn.php?vpntype=l2tp";
 
-$shortcuts['carp'] = array();
-$shortcuts['carp']['main'] = "system_hasync.php";
-$shortcuts['carp']['status'] = "carp_status.php";
-
 $shortcuts['snmp'] = array();
 $shortcuts['snmp']['main'] = "services_snmp.php";
 $shortcuts['snmp']['service'] = "bsnmpd";

src/www/system_hasync.php

@@ -94,8 +94,7 @@ foreach (array('pfsyncpeerip','pfsyncinterface','synchronizetoip','username','pa
 $ifaces = get_configured_interface_with_descr();
 $ifaces["lo0"] = "loopback";
 
-$pgtitle = array(gettext("System"),gettext("High Availability"));
-$shortcut_section = "carp";
+$pgtitle = array(gettext('System'), gettext('High Availability'), gettext('Synchronization'));
 include("head.inc");
 ?>