www: another batch for #461

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

@@ -33,24 +33,22 @@
                 <Edit url="/system_routes_edit.php*"/>
             </All>
             <Status url="/diag_routes.php"/>
+            <Log VisibleName="Log File" url="/diag_logs_routing.php"/>
         </Routes>
         <Gateways order="30" cssClass="fa fa-location-arrow">
             <All url="/system_gateways.php">
                 <All url="/system_gateways.php*"/>
                 <Edit url="/system_gateways_edit.php*"/>
             </All>
-            <Groups url="/system_gateway_groups.php">
+            <AllStatus VisibleName="Status" url="/status_gateways.php"/>
+            <Group url="/system_gateway_groups.php">
                 <Edit url="/system_gateway_groups_edit.php*"/>
-            </Groups>
-            <Status url="/status_gateways.php">
-                <Groups url="/status_gateway_groups.php"/>
-            </Status>
+            </Group>
+            <GroupStatus VisibleName="Group Status" url="/status_gateway_groups.php"/>
+            <Log VisibleName="Log File" url="/diag_logs_gateways.php"/>
         </Gateways>
         <LogFiles order="160" VisibleName="Log Files" cssClass="fa fa-eye">
             <General url="/diag_logs.php"/>
-            <Gateways url="/diag_logs_gateways.php"/>
-            <Routing url="/diag_logs_routing.php"/>
-            <Wireless url="/diag_logs_wireless.php"/>
             <DNS url="/diag_logs_resolver.php"/>
             <DHCP url="/diag_logs_dhcp.php"/>
             <PPP url="/diag_logs_ppp.php"/>
@@ -66,7 +64,9 @@
             <Notifications order="500" url="/system_advanced_notifications.php"/>
             <LogFiles VisibleName="Logs/Reports" order="600" url="/diag_logs_settings.php"/>
             <Miscellaneous order="700" url="/system_advanced_misc.php"/>
-            <Tunables VisibleName="Tunables" order="800" url="/system_advanced_sysctl.php"/>
+            <Tunables VisibleName="Tunables" order="800" url="/system_advanced_sysctl.php">
+                <Edit url="/system_advanced_sysctl.php*"/>
+            </Tunables>
         </Settings>
         <Wizard order="140" url="/wizard.php" cssClass="fa fa-magic">
             <Step url="/wizard.php*"/>
@@ -98,7 +98,8 @@
         </Diagnostics>
     </System>
     <Interfaces order="2" cssClass="fa fa-sitemap">
-        <Assignments order="899" url="/interfaces_assign.php" cssClass="fa fa-pencil">
+        <Overview order="900" url="/status_interfaces.php" cssClass="glyphicon glyphicon-tasks"/>
+        <Assignments order="910" url="/interfaces_assign.php" cssClass="fa fa-pencil">
             <Bridge url="/interfaces_bridge.php"/>
             <BridgeEdit url="/interfaces_bridge_edit.php*"/>
             <GIF url="/interfaces_gif.php"/>
@@ -118,7 +119,11 @@
             <Wireless url="/interfaces_wireless.php"/>
             <WirelessEdit url="/interfaces_wireless_edit.php*"/>
         </Assignments>
-        <Diagnostics order="900" cssClass="fa fa-medkit">
+        <Wireless order="920" cssClass="fa fa-wifi">
+            <Log VisibleName="Log File" url="/diag_logs_wireless.php"/>
+            <Status url="/status_wireless.php"/>
+        </Wireless>
+        <Diagnostics order="940" cssClass="fa fa-medkit">
             <ARPTable VisibleName="ARP Table" url="/diag_arp.php"/>
             <DNSLookup VisibleName="DNS Lookup" url="/diag_dns.php"/>
             <NDPTable VisibleName="NDP Table" url="/diag_ndp.php"/>
@@ -126,11 +131,10 @@
             <Ping url="/diag_ping.php"/>
             <TestPort VisibleName="Test Port" url="/diag_testport.php"/>
             <Traceroute url="/diag_traceroute.php"/>
+            <Traffic VisibleName="Traffic Graph" url="/status_graph.php">
+                <Details url="/status_graph.php?*"/>
+            </Traffic>
         </Diagnostics>
-        <Summary order="901" url="/status_interfaces.php" cssClass="glyphicon glyphicon-tasks"/>
-        <TrafficGraph VisibleName="Traffic Graph" order="902" url="/status_graph.php" cssClass="fa fa-line-chart">
-            <Details url="/status_graph.php?*"/>
-        </TrafficGraph>
     </Interfaces>
     <Firewall order="3" cssClass="glyphicon glyphicon-fire">
         <Aliases order="10" cssClass="fa fa-list-alt">

src/www/diag_logs_gateways.php

@@ -51,7 +51,6 @@ if (isset($_POST['filtertext'])) {
 }
 
 $pgtitle = array(gettext('System'), gettext('Log Files'), gettext('Gateways'));
-$shortcut_section = "gateways";
 include("head.inc");
 
 ?>

src/www/shortcuts.inc

@@ -168,16 +168,8 @@ $shortcuts['routing']['log'] = "diag_logs_routing.php";
 $shortcuts['routing']['status'] = "diag_routes.php";
 
 $shortcuts['gateways'] = array();
-$shortcuts['gateways']['main'] = "system_gateways.php";
-$shortcuts['gateways']['log'] = "diag_logs_gateways.php";
-$shortcuts['gateways']['status'] = "status_gateways.php";
 $shortcuts['gateways']['service'] = "apinger";
 
-$shortcuts['gateway-groups'] = array();
-$shortcuts['gateway-groups']['main'] = "system_gateway_groups.php";
-$shortcuts['gateway-groups']['log'] = "diag_logs_gateways.php";
-$shortcuts['gateway-groups']['status'] = "status_gateway_groups.php";
-
 $shortcuts['pppoes'] = array();
 $shortcuts['pppoes']['main'] = "vpn_pppoe.php";
 $shortcuts['pppoes']['log'] = "diag_logs_vpn.php?vpntype=poes";

src/www/status_gateway_groups.php

 <?php
 
 /*
-  Copyright (C) 2014-2015 Deciso B.V.
-  Copyright (C) 2010 Seth Mos <seth.mos@dds.nl>.
-  All rights reserved.
+    Copyright (C) 2014-2015 Deciso B.V.
+    Copyright (C) 2010 Seth Mos <seth.mos@dds.nl>.
+    All rights reserved.
 
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
 
-  1. Redistributions of source code must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
+    1. Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
 
-  2. Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in the
-     documentation and/or other materials provided with the distribution.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
 
-  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-  INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-  AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-  AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-  OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-  POSSIBILITY OF SUCH DAMAGE.
+    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
 */
 
 require_once("guiconfig.inc");
 
 // request report data
 if (!isset($config['gateways']['gateway_group']) || !is_array($config['gateways']['gateway_group'])) {
-  $a_gateway_groups = array();
+    $a_gateway_groups = array();
 } else {
-  $a_gateway_groups = &$config['gateways']['gateway_group'];
+    $a_gateway_groups = &$config['gateways']['gateway_group'];
 }
 $gateways_status = return_gateways_status();
 $a_gateways = return_gateways_array();
@@ -41,7 +41,6 @@ $a_gateways = return_gateways_array();
 legacy_html_escape_form_data($a_gateways);
 legacy_html_escape_form_data($a_gateway_groups);
 $pgtitle = array(gettext('System'), gettext('Gateways'), gettext('Group Status'));
-$shortcut_section = "gateway-groups";
 include("head.inc");
 ?>
 
@@ -52,13 +51,6 @@ include("head.inc");
     <div class="container-fluid">
       <div class="row">
           <section class="col-xs-12">
-<?php
-          /* active tabs */
-          $tab_array = array();
-          $tab_array[] = array(gettext("Gateways"), false, "status_gateways.php");
-          $tab_array[] = array(gettext("Gateway Groups"), true, "status_gateway_groups.php");
-          display_top_tabs($tab_array);
-?>
             <div class="tab-content content-box col-xs-12">
               <div class="responsive-table">
                 <table class="table table-striped">

src/www/status_gateways.php

 <?php
 
 /*
-  Copyright (C) 2014-2015 Deciso B.V.
-  Copyright (C) 2010 Seth Mos <seth.mos@dds.nl>.
-  All rights reserved.
+    Copyright (C) 2014-2015 Deciso B.V.
+    Copyright (C) 2010 Seth Mos <seth.mos@dds.nl>.
+    All rights reserved.
 
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
 
-  1. Redistributions of source code must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
+    1. Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
 
-  2. Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in the
-     documentation and/or other materials provided with the distribution.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
 
-  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-  INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-  AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-  AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-  OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-  POSSIBILITY OF SUCH DAMAGE.
+    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
 */
 
 require_once("guiconfig.inc");
@@ -36,7 +36,6 @@ $gateways_status = return_gateways_status(true);
 legacy_html_escape_form_data($a_gateways);
 
 $pgtitle = array(gettext('System'), gettext('Gateways'), gettext('Status'));
-$shortcut_section = "gateways";
 include("head.inc");
 ?>
 <body>
@@ -45,13 +44,6 @@ include("head.inc");
     <div class="container-fluid">
       <div class="row">
         <section class="col-xs-12">
-<?php
-        /* active tabs */
-        $tab_array = array();
-        $tab_array[] = array(gettext("Gateways"), true, "status_gateways.php");
-        $tab_array[] = array(gettext("Gateway Groups"), false, "status_gateway_groups.php");
-        display_top_tabs($tab_array);
-?>
           <div class="tab-content content-box col-xs-12">
             <div class="responsive-table">
               <table class="table table-striped">

src/www/status_interfaces.php

@@ -48,7 +48,7 @@ if ($_POST['if'] && $_POST['submit']) {
 	exit;
 }
 
-$pgtitle = array(gettext('Interfaces'), gettext('Summary'));
+$pgtitle = array(gettext('Interfaces'), gettext('Overview'));
 include("head.inc");
 
 ?>

src/www/system_advanced_sysctl.php

@@ -106,6 +106,11 @@ if ($_POST) {
 }
 
 $pgtitle = array(gettext('System'), gettext('Settings'), gettext('Tunables'));
+if ($act != 'edit') {
+	$main_buttons = array(
+		array('href' => 'system_advanced_sysctl.php?act=edit', 'label' => gettext('Add a new tunable')),
+	);
+}
 include("head.inc");
 
 ?>
@@ -182,22 +187,10 @@ include("head.inc");
 									</table>
 								</td>
 							</tr>
-							<?php $i++;
-
-endforeach; ?>
-							<tr>
-								<td colspan="4">
-									<a href="system_advanced_sysctl.php?act=edit" class="btn btn-primary pull-right">
-											<span class="glyphicon glyphicon-plus"></span>
-											</a>
-								</td>
-							</tr>
-
+							<?php $i++; endforeach; ?>
 							</tbody>
 						</table>
-			        <?php
-else :
-?>
+			        <?php else : ?>
 						<form action="system_advanced_sysctl.php" method="post" name="iform" id="iform">
 							<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="edit system tunable" class="table table-striped">
 								<thead>

src/www/system_gateway_groups.php

@@ -112,7 +112,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
 
 
 $pgtitle = array(gettext('System'), gettext('Gateways'), gettext('Groups'));
-$shortcut_section = "gateway-groups";
 legacy_html_escape_form_data($a_gateway_groups);
 include("head.inc");
 

src/www/system_gateway_groups_edit.php

@@ -141,7 +141,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
 }
 
 $pgtitle = array(gettext('System'),gettext('Gateways'), gettext('Edit Group'));
-$shortcut_section = "gateway-groups";
 
 legacy_html_escape_form_data($a_gateways);
 legacy_html_escape_form_data($pconfig);

src/www/system_gateways.php

@@ -206,7 +206,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
 
 legacy_html_escape_form_data($a_gateways);
 $pgtitle = array(gettext('System'), gettext('Gateways'));
-$shortcut_section = "gateways";
 include("head.inc");
 
 $main_buttons = array(

src/www/system_gateways_edit.php

@@ -478,7 +478,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
 legacy_html_escape_form_data($a_gateways);
 legacy_html_escape_form_data($pconfig);
 $pgtitle = array(gettext('System'), gettext('Gateway'), gettext('Edit'));
-$shortcut_section = "gateways";
 
 include("head.inc");