Commit 55aea0a6 authored by Franco Fichtner's avatar Franco Fichtner

menu: move firewall, admin and interface settings for #832

Partial progress with disbanding the System Settings for 16.7.

TODO:
* Access: Administration + Settings should be merged
* Interfaces: Settings IPv6 blocking is a FIREWALL feature
* Firewall: Bogons settting is INTERFACES feature
parent b32d93da
...@@ -51,9 +51,6 @@ ...@@ -51,9 +51,6 @@
</Gateways> </Gateways>
<Settings order="20" cssClass="fa fa-cogs fa-fw"> <Settings order="20" cssClass="fa fa-cogs fa-fw">
<General order="100" url="/system_general.php"/> <General order="100" url="/system_general.php"/>
<AdminAccess VisibleName="Admin Access" order="200" url="/system_advanced_admin.php"/>
<Networking order="300" url="/system_advanced_network.php"/>
<FirewallNAT VisibleName="Firewall/NAT" order="400" url="/system_advanced_firewall.php"/>
<Notifications order="500" url="/system_advanced_notifications.php"/> <Notifications order="500" url="/system_advanced_notifications.php"/>
<LogFiles VisibleName="Logs/Reports" order="600" url="/diag_logs_settings.php"/> <LogFiles VisibleName="Logs/Reports" order="600" url="/diag_logs_settings.php"/>
<Miscellaneous order="700" url="/system_advanced_misc.php"/> <Miscellaneous order="700" url="/system_advanced_misc.php"/>
...@@ -66,6 +63,7 @@ ...@@ -66,6 +63,7 @@
<Step url="/wizard.php*" visibility="hidden"/> <Step url="/wizard.php*" visibility="hidden"/>
</Wizard> </Wizard>
<Access order="10" cssClass="fa fa-users fa-fw"> <Access order="10" cssClass="fa fa-users fa-fw">
<Administration order="0" url="/system_advanced_admin.php"/>
<Users order="10" url="/system_usermanager.php"> <Users order="10" url="/system_usermanager.php">
<All url="/system_usermanager.php*" visibility="hidden"/> <All url="/system_usermanager.php*" visibility="hidden"/>
<Privileges url="/system_usermanager_addprivs.php*" visibility="hidden"/> <Privileges url="/system_usermanager_addprivs.php*" visibility="hidden"/>
...@@ -90,7 +88,7 @@ ...@@ -90,7 +88,7 @@
<Interfaces order="2" cssClass="fa fa-sitemap"> <Interfaces order="2" cssClass="fa fa-sitemap">
<Overview order="900" url="/status_interfaces.php" cssClass="fa fa-tasks fa-fw"/> <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="910" url="/interfaces_assign.php" cssClass="fa fa-pencil fa-fw"/>
<Types VisibleName="Other Types" order="929" cssClass="fa fa-cog fa-fw"> <Types VisibleName="Other Types" order="929" cssClass="fa fa-archive fa-fw">
<Bridge url="/interfaces_bridge.php"> <Bridge url="/interfaces_bridge.php">
<Edit url="/interfaces_bridge_edit.php*" visibility="hidden"/> <Edit url="/interfaces_bridge_edit.php*" visibility="hidden"/>
</Bridge> </Bridge>
...@@ -128,6 +126,7 @@ ...@@ -128,6 +126,7 @@
<Status url="/status_wireless.php*" visibility="hidden"/> <Status url="/status_wireless.php*" visibility="hidden"/>
</Status> </Status>
</Wireless> </Wireless>
<Settings order="930" url="/system_advanced_network.php" cssClass="fa fa-cogs fa-fw"/>
<Diagnostics order="940" cssClass="fa fa-medkit fa-fw"> <Diagnostics order="940" cssClass="fa fa-medkit fa-fw">
<DNSLookup order="20" VisibleName="DNS Lookup" url="/diag_dns.php"/> <DNSLookup order="20" VisibleName="DNS Lookup" url="/diag_dns.php"/>
<PacketCapture order="40" VisibleName="Packet Capture" url="/diag_packet_capture.php"/> <PacketCapture order="40" VisibleName="Packet Capture" url="/diag_packet_capture.php"/>
...@@ -183,6 +182,7 @@ ...@@ -183,6 +182,7 @@
<Schedules order="100" url="/firewall_schedule.php" cssClass="fa fa-calendar fa-fw"> <Schedules order="100" url="/firewall_schedule.php" cssClass="fa fa-calendar fa-fw">
<SchedulesEdit url="/firewall_schedule_edit.php*" visibility="hidden"/> <SchedulesEdit url="/firewall_schedule_edit.php*" visibility="hidden"/>
</Schedules> </Schedules>
<Settings order="200" url="/system_advanced_firewall.php" cssClass="fa fa-cogs fa-fw"/>
<Diagnostics order="500" cssClass="fa fa-medkit fa-fw"> <Diagnostics order="500" cssClass="fa fa-medkit fa-fw">
<FilterReload order="20" VisibleName="Filter Reload" url="/status_filter_reload.php"/> <FilterReload order="20" VisibleName="Filter Reload" url="/status_filter_reload.php"/>
<pfInfo order="30" url="/diag_pf_info.php" VisibleName="pfInfo"/> <pfInfo order="30" url="/diag_pf_info.php" VisibleName="pfInfo"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment