menu/dashboard: tweak traffic graph visibility and translations

(cherry picked from commit 57f35d74)

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

@@ -7,7 +7,9 @@
         <Password order="2" url="/system_usermanager_passwordmg.php" cssClass="fa fa-key fa-fw"/>
         <Logout order="3" url="/index.php?logout" cssClass="fa fa-sign-out fa-fw"/>
     </Lobby>
-    <Reporting order="15" cssClass="fa fa-area-chart"/>
+    <Reporting order="15" cssClass="fa fa-area-chart">
+        <Traffic order="100" VisibleName="Traffic Graph" url="/status_graph.php" cssClass="fa fa-line-chart fa-fw"/>
+    </Reporting>
     <System order="20" cssClass="fa fa-server">
         <Trust order="120" cssClass="fa fa-certificate fa-fw">
             <Certificates url="/system_certmanager.php">
@@ -84,9 +86,24 @@
         </Access>
     </System>
     <Interfaces order="30" cssClass="fa fa-sitemap">
-        <Overview order="900" url="/status_interfaces.php" cssClass="fa fa-tasks fa-fw"/>
-        <Assignments order="910" url="/interfaces_assign.php" cssClass="fa fa-pencil fa-fw"/>
+        <Assignments order="900" url="/interfaces_assign.php" cssClass="fa fa-pencil fa-fw"/>
+        <Overview order="910" url="/status_interfaces.php" cssClass="fa fa-tasks fa-fw"/>
         <Settings order="920" url="/system_advanced_network.php" cssClass="fa fa-cogs fa-fw"/>
+        <Wireless order="930" cssClass="fa fa-wifi fa-fw">
+            <Devices url="/interfaces_wireless.php">
+                <Edit url="/interfaces_wireless_edit.php*" visibility="hidden"/>
+            </Devices>
+            <Log VisibleName="Log File" url="/diag_logs_wireless.php"/>
+            <Status url="/status_wireless.php">
+                <Status url="/status_wireless.php*" visibility="hidden"/>
+            </Status>
+        </Wireless>
+        <PPP order="940" VisibleName="Point-to-Point" cssClass="fa fa-tty fa-fw">
+            <Devices url="/interfaces_ppps.php">
+                <Edit url="/interfaces_ppps_edit.php*" visibility="hidden"/>
+            </Devices>
+            <LogFile VisibleName="Log File" url="/diag_logs_ppp.php"/>
+        </PPP>
         <Types VisibleName="Other Types" order="950" cssClass="fa fa-archive fa-fw">
             <Bridge url="/interfaces_bridge.php">
                 <Edit url="/interfaces_bridge_edit.php*" visibility="hidden"/>
@@ -110,29 +127,11 @@
                 <Edit url="/interfaces_vlan_edit.php*" visibility="hidden"/>
             </VLAN>
         </Types>
-        <PPP order="940" VisibleName="Point-to-Point" cssClass="fa fa-tty fa-fw">
-            <Devices url="/interfaces_ppps.php">
-                <Edit url="/interfaces_ppps_edit.php*" visibility="hidden"/>
-            </Devices>
-            <LogFile VisibleName="Log File" url="/diag_logs_ppp.php"/>
-        </PPP>
-        <Wireless order="930" cssClass="fa fa-wifi fa-fw">
-            <Devices url="/interfaces_wireless.php">
-                <Edit url="/interfaces_wireless_edit.php*" visibility="hidden"/>
-            </Devices>
-            <Log VisibleName="Log File" url="/diag_logs_wireless.php"/>
-            <Status url="/status_wireless.php">
-                <Status url="/status_wireless.php*" visibility="hidden"/>
-            </Status>
-        </Wireless>
         <Diagnostics order="960" cssClass="fa fa-medkit fa-fw">
             <PacketCapture order="40" VisibleName="Packet Capture" url="/diag_packet_capture.php"/>
             <Ping order="50" url="/diag_ping.php"/>
             <TestPort order="60" VisibleName="Test Port" url="/diag_testport.php"/>
             <Traceroute order="70" url="/diag_traceroute.php"/>
-            <Traffic order="80" VisibleName="Traffic Graph" url="/status_graph.php">
-                <Details url="/status_graph.php?*" visibility="hidden"/>
-            </Traffic>
         </Diagnostics>
     </Interfaces>
     <Firewall order="40" cssClass="glyphicon glyphicon-fire">

src/www/widgets/include/carp_status.inc

 <?php
 
-//set variable for custom title
-$carp_status_title = "Carp Status";
-$carp_status_title_link = "carp_status.php";
+$carp_status_title = gettext('CARP');
+$carp_status_title_link = 'carp_status.php';

src/www/widgets/include/dyn_dns_status.inc

 <?php
 
-//set variable for custom title
-$dyn_dns_status_title = "Dyn DNS Status";
-$dyn_dns_status_title_link = "services_dyndns.php";
+$dyn_dns_status_title = gettext('DynDNS');
+$dyn_dns_status_title_link = 'services_dyndns.php';

src/www/widgets/include/gateways.inc

 <?php
-//set variable for custom title
-$gateways_title = "Gateways";
-$gateways_title_link = "status_gateways.php";
+
+$gateways_title = gettext('Gateways');
+$gateways_title_link = 'status_gateways.php';

src/www/widgets/include/interface_statistics.inc

 <?php
-//set variable for custom title
-$interface_statistics_title = "Interface Statistics";
-$interface_statistics_title_link = "status_interfaces.php";
+
+$interface_statistics_title = gettext('Interface Statistics');
+$interface_statistics_title_link = 'status_interfaces.php';

src/www/widgets/include/interfaces.inc

 <?php
-//set variable for custom title
-$interfaces_title = "Interfaces";
-$interfaces_title_link = "status_interfaces.php";
+
+$interfaces_title = gettext('Interfaces');
+$interfaces_title_link = 'status_interfaces.php';

src/www/widgets/include/ipsec.inc

 <?php
-$ipsec_title = "IPsec";
-$ipsec_title_link = "diag_ipsec.php";
+
+$ipsec_title = gettext('IPsec');
+$ipsec_title_link = 'diag_ipsec.php';

src/www/widgets/include/load_balancer.inc

 <?php
-$load_balancer_status_title = "Load Balancer Status";
-$load_balancer_status_title_link = "status_lb_pool.php";
+
+$load_balancer_status_title = gettext('Load Balancer');
+$load_balancer_status_title_link = 'status_lb_pool.php';

src/www/widgets/include/log.inc

 <?php
-//set variable for custom title
-$log_title = "Firewall Logs";
-$log_title_link = "diag_logs_filter.php";
+
+$log_title = gettext('Firewall Logs');
+$log_title_link = 'diag_logs_filter.php';

src/www/widgets/include/ntp_status.inc

 <?php
-//set variable for custom title
-$ntp_status_title = "NTP Status";
-$ntp_status_title_link = "status_ntpd.php";
+
+$ntp_status_title = gettext('Network Time');
+$ntp_status_title_link = 'status_ntpd.php';

src/www/widgets/include/openvpn.inc

 <?php
-$openvpn_title = "OpenVPN";
-$openvpn_title_link = "status_openvpn.php";
+
+$openvpn_title = gettext('OpenVPN');
+$openvpn_title_link = 'status_openvpn.php';

src/www/widgets/include/services_status.inc

 <?php
 
-//set variable for custom title
-$services_status_title = "Services Status";
-$services_status_title_link = "status_services.php";
+$services_status_title = gettext('Services');
+$services_status_title_link = 'status_services.php';

src/www/widgets/include/system_log.inc

 <?php
-//set variable for custom title
-$system_log_title = "System Log";
-$system_log_title_link = "diag_logs.php";
+
+$system_log_title = gettext('System Log');
+$system_log_title_link = 'diag_logs.php';

src/www/widgets/include/thermal_sensors.inc

 <?php
-//set variable for custom title
-$thermal_sensors_widget_title = "Thermal Sensors";
+
+$thermal_sensors_title = gettext('Thermal Sensors');
+$thermal_sensors_title_link = 'system_advanced_misc.php';

src/www/widgets/include/traffic_graph.inc

 <?php
-$traffic_graphs_title = "Traffic Graphs";
-$traffic_graphs_title_link = "status_graph.php";
+
+$traffic_graphs_title = gettext('Traffic Graph');
+$traffic_graphs_title_link = 'status_graph.php';

src/www/widgets/include/wake_on_lan.inc

 <?php
 
-//set variable for custom title
-$wake_on_lan_title = "Wake On Lan";
-$wake_on_lan_title_link = "services_wol.php";
+$wake_on_lan_title = gettext('Wake On Lan');
+$wake_on_lan_title_link = 'services_wol.php';