lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-14 16:44:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

system/routes: convert to submenu

Browse Source 
Thin out "Status" and "Diagnostics" white at it, although the
overall static page conception isn't consistent at all.  Not
liking this, but something has got to be done.  Won't be the
last commit I think.  :)
This commit is contained in:
Franco Fichtner 2015-09-21 14:27:11 +02:00
parent 1311f7a851
commit d11e97562b
11 changed files with 33 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
View File

@ -28,12 +28,23 @@
<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*"/>
<GatewayGroups url="/system_gateway_groups.php"/>
<GatewayGroupsEdit url="/system_gateway_groups_edit.php*"/>
</Routing>
<Routes cssClass="fa fa-wrench">
<All url="/system_routes.php">
<Edit url="/system_routes_edit.php*"/>
</All>
<Status url="/diag_routes.php"/>
</Routes>
<Gateways cssClass="fa fa-location-arrow">
<All url="/system_gateways.php">
<Edit url="/system_gateways_edit.php*"/>
</All>
<Groups 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>
</Gateways>
<Settings url="/system_general.php">
<General VisibleName="General" url="/system_general.php"/>
<Admin_Access VisibleName="Admin Access" url="/system_advanced_admin.php"/>
@ -216,9 +227,6 @@
<DHCPv6LeasesDetails url="/status_dhcpv6_leases.php?*"/>
</DHCPv6Leases>
<FilterReload VisibleName="Filter Reload" url="/status_filter_reload.php"/>
<Gateways url="/status_gateways.php">
<GatewayGroups url="/status_gateway_groups.php"/>
</Gateways>
<Interfaces url="/status_interfaces.php"/>
<IPsec url="/diag_ipsec.php">
<IPsecACT url="/diag_ipsec.php?*"/>
@ -277,7 +285,6 @@
<PacketCapture VisibleName="Packet Capture" url="/diag_packet_capture.php"/>
<Ping url="/diag_ping.php"/>
<Reboot url="/diag_reboot.php"/>
<Routes url="/diag_routes.php"/>
<SmartStatus VisibleName="SMART Status" url="/diag_smart.php"/>
<Sockets url="/diag_sockets.php">
<SocketsDetails url="/diag_sockets.php?*"/>

3
src/www/diag_routes.php
View File

@ -1,4 +1,5 @@
<?php
/*
Copyright (C) 2014 Deciso B.V.
Copyright (C) 2006 Fernando Lamos
@ -54,7 +55,7 @@ if (isset($_REQUEST['isAjax'])) {
exit;
}
$pgtitle = array(gettext("Diagnostics"),gettext("Routing tables"));
$pgtitle = array(gettext('System'), gettext('Routes'), gettext('Status'));
$shortcut_section = "routing";
include('head.inc');

2
src/www/status_gateway_groups.php
View File

@ -57,7 +57,7 @@ $changedesc = gettext("Gateway Groups") . ": ";
$gateways_status = return_gateways_status();
$pgtitle = array(gettext("Status"),gettext("Gateway Groups"));
$pgtitle = array(gettext('System'), gettext('Gateways'), gettext('Group Status'));
$shortcut_section = "gateway-groups";
include("head.inc");

3
src/www/status_gateways.php
View File

@ -1,4 +1,5 @@
<?php
/*
Copyright (C) 2014-2015 Deciso B.V.
Copyright (C) 2010 Seth Mos <seth.mos@dds.nl>.
@ -37,7 +38,7 @@ $gateways_status = return_gateways_status(true);
$now = time();
$year = date("Y");
$pgtitle = array(gettext("Status"),gettext("Gateways"));
$pgtitle = array(gettext('System'), gettext('Gateways'), gettext('Status'));
$shortcut_section = "gateways";
include("head.inc");

6
src/www/system_gateway_groups.php
View File

@ -126,13 +126,13 @@ if ($_GET['act'] == "del") {
}
}
$pgtitle = array(gettext("System"),gettext("Gateway Groups"));
$pgtitle = array(gettext('System'), gettext('Gateways'), gettext('Groups'));
$shortcut_section = "gateway-groups";
include("head.inc");
$main_buttons = array(
array('label'=>'Add group', 'href'=>'system_gateway_groups_edit.php'),
array('label'=> gettext('Add group'), 'href'=>'system_gateway_groups_edit.php'),
);
?>
@ -156,8 +156,6 @@ endif; ?>
<section class="col-xs-12">
<? include('system_gateways_tabs.inc'); ?>
<div class="tab-content content-box col-xs-12">
<div class="container-fluid">

3
src/www/system_gateway_groups_edit.php
View File

@ -1,4 +1,5 @@
<?php
/*
Copyright (C) 2014-2015 Deciso B.V.
Copyright (C) 2010 Seth Mos <seth.mos@dds.nl>.
@ -148,7 +149,7 @@ if ($_POST) {
}
}
$pgtitle = array(gettext("System"),gettext("Gateways"),gettext("Edit gateway group"));
$pgtitle = array(gettext('System'),gettext('Gateways'), gettext('Edit Group'));
$shortcut_section = "gateway-groups";
function build_gateway_protocol_map (&$a_gateways)

5
src/www/system_gateways.php
View File

@ -185,13 +185,13 @@ if (isset($_POST['del_x'])) {
exit;
}
$pgtitle = array(gettext("System"),gettext("Gateways"));
$pgtitle = array(gettext('System'), gettext('Gateways'));
$shortcut_section = "gateways";
include("head.inc");
$main_buttons = array(
array('label'=>'Add Gateway', 'href'=>'system_gateways_edit.php'),
array('label'=> gettext('Add gateway'), 'href'=>'system_gateways_edit.php'),
);
?>
@ -220,7 +220,6 @@ $main_buttons = array(
?>
<section class="col-xs-12">
<? include('system_gateways_tabs.inc'); ?>
<div class="content-box">

4
src/www/system_gateways_edit.php
View File

@ -1,4 +1,5 @@
<?php
/*
Copyright (C) 2014-2015 Deciso B.V.
Copyright (C) 2010 Seth Mos <seth.mos@dds.nl>.
@ -546,8 +547,7 @@ if ($_POST) {
}
}
$pgtitle = array(gettext("System"),gettext("Gateways"),gettext("Edit gateway"));
$pgtitle = array(gettext('System'), gettext('Gateway'), gettext('Edit'));
$shortcut_section = "gateways";
include("head.inc");

10
src/www/system_gateways_tabs.inc
View File

@ -1,10 +0,0 @@
<?php
$active_tab = isset($active_tab) ? $active_tab : $_SERVER['PHP_SELF'];
$tab_array = array();
$tab_array[0] = array(gettext("Gateways"), $active_tab == "/system_gateways.php", "system_gateways.php");
$tab_array[1] = array(gettext("Routes"), $active_tab == "/system_routes.php", "system_routes.php");
$tab_array[2] = array(gettext("Groups"), $active_tab == "/system_gateway_groups.php", "system_gateway_groups.php");
display_top_tabs($tab_array);

6
src/www/system_routes.php
View File

@ -201,13 +201,13 @@ if (isset($_POST['del_x'])) {
}
}
$pgtitle = array(gettext("System"),gettext("Static Routes"));
$pgtitle = array(gettext('System'), gettext('Routes'));
$shortcut_section = "routing";
include("head.inc");
$main_buttons = array(
array('label'=>'Add', 'href'=>'system_routes_edit.php'),
array('label'=> gettext('Add route'), 'href'=>'system_routes_edit.php'),
);
@ -233,8 +233,6 @@ endif; ?>
<section class="col-xs-12">
<? include('system_gateways_tabs.inc'); ?>
<div class="tab-content content-box col-xs-12">
<div class="container-fluid">

2
src/www/system_routes_edit.php
View File

@ -220,7 +220,7 @@ if ($_POST) {
}
}
$pgtitle = array(gettext("System"),gettext("Static Routes"),gettext("Edit route"));
$pgtitle = array(gettext('System'), gettext('Routes'), gettext('Edit'));
$shortcut_section = "routing";
include("head.inc");
?>