Skip to content

O
OpnSense
Commit 0d2272ff authored by Franco Fichtner's avatar Franco Fichtner
Browse files
Options

www: interface and dns tools tabs gone for #461 

Starting to get a life of its own...
parent 166c571b
Show whitespace changes
Inline Side-by-side
Showing with 47 additions and 227 deletions
src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
View file @ 0d2272ff
...@@ -99,27 +99,37 @@ ...@@ -99,27 +99,37 @@
</System> </System>
<Interfaces order="2" cssClass="fa fa-sitemap"> <Interfaces order="2" cssClass="fa fa-sitemap">
<Overview order="900" url="/status_interfaces.php" cssClass="glyphicon glyphicon-tasks"/> <Overview order="900" url="/status_interfaces.php" cssClass="glyphicon glyphicon-tasks"/>
<Assignments order="910" url="/interfaces_assign.php" cssClass="fa fa-pencil"> <Assignments order="910" url="/interfaces_assign.php" cssClass="fa fa-pencil"/>
<Bridge url="/interfaces_bridge.php"/> <Types order="920" cssClass="fa fa-cog">
<BridgeEdit url="/interfaces_bridge_edit.php*"/> <Bridge url="/interfaces_bridge.php">
<GIF url="/interfaces_gif.php"/> <Edit url="/interfaces_bridge_edit.php*"/>
<GIFEdit url="/interfaces_gif_edit.php*"/> </Bridge>
<GRE url="/interfaces_gre.php"/> <GIF url="/interfaces_gif.php">
<GREEdit url="/interfaces_gre_edit.php*"/> <Edit url="/interfaces_gif_edit.php*"/>
<Groups url="/interfaces_groups.php"/> </GIF>
<GroupsEdit url="/interfaces_groups_edit.php*"/> <GRE url="/interfaces_gre.php">
<LAGG url="/interfaces_lagg.php"/> <Edit url="/interfaces_gre_edit.php*"/>
<LAGGEdit url="/interfaces_lagg_edit.php*"/> </GRE>
<PPP url="/interfaces_ppps.php"/> <Group url="/interfaces_groups.php">
<PPPEdit url="/interfaces_ppps_edit.php*"/> <Edit url="/interfaces_groups_edit.php*"/>
<QinQ url="/interfaces_qinq.php"/> </Group>
<QinQEdit url="/interfaces_qinq_edit.php*"/> <LAGG url="/interfaces_lagg.php">
<VLAN url="/interfaces_vlan.php"/> <Edit url="/interfaces_lagg_edit.php*"/>
<VLANEdit url="/interfaces_vlan_edit.php*"/> </LAGG>
<Wireless url="/interfaces_wireless.php"/> <PPP url="/interfaces_ppps.php">
<WirelessEdit url="/interfaces_wireless_edit.php*"/> <Edit url="/interfaces_ppps_edit.php*"/>
</Assignments> </PPP>
<Wireless order="920" cssClass="fa fa-wifi"> <QinQ url="/interfaces_qinq.php">
<Edit url="/interfaces_qinq_edit.php*"/>
</QinQ>
<VLAN url="/interfaces_vlan.php">
<Edit url="/interfaces_vlan_edit.php*"/>
</VLAN>
<Wireless url="/interfaces_wireless.php">
<Edit url="/interfaces_wireless_edit.php*"/>
</Wireless>
</Types>
<Wireless order="925" cssClass="fa fa-wifi">
<Log VisibleName="Log File" url="/diag_logs_wireless.php"/> <Log VisibleName="Log File" url="/diag_logs_wireless.php"/>
<Status url="/status_wireless.php"/> <Status url="/status_wireless.php"/>
</Wireless> </Wireless>
...@@ -219,7 +229,6 @@ ...@@ -219,7 +229,6 @@
<Details url="/status_dhcpv6_leases.php?*"/> <Details url="/status_dhcpv6_leases.php?*"/>
</Leases> </Leases>
</DHCPv6> </DHCPv6>
<DNSFilter VisibleName="DNS Filter" url="/services_opendns.php" cssClass="fa fa-tags"/>
<DNSForwarder VisibleName="DNS Forwarder" url="/services_dnsmasq.php" cssClass="fa fa-tags"> <DNSForwarder VisibleName="DNS Forwarder" url="/services_dnsmasq.php" cssClass="fa fa-tags">
<Hosts url="/services_dnsmasq_edit.php*"/> <Hosts url="/services_dnsmasq_edit.php*"/>
<Domains url="/services_dnsmasq_domainoverride_edit.php*"/> <Domains url="/services_dnsmasq_domainoverride_edit.php*"/>
...@@ -234,11 +243,15 @@ ...@@ -234,11 +243,15 @@
<All url="/services_unbound_acls.php*"/> <All url="/services_unbound_acls.php*"/>
</ACL> </ACL>
</DNSResolver> </DNSResolver>
<DynamicDNS VisibleName="Dynamic DNS" url="/services_dyndns.php" cssClass="fa fa-tags"> <DNSTools VisibleName="DNS Tools" cssClass="fa fa-tags">
<DynamicDNSRFC2136Clients url="/services_rfc2136.php"/> <DynDNS url="/services_dyndns.php">
<DynamicDNSRFC2136ClientsEdit url="/services_rfc2136_edit.php"/> <Edit url="/services_dyndns_edit.php*"/>
<DynamicDNSEdit url="/services_dyndns_edit.php"/> </DynDNS>
</DynamicDNS> <Filter url="/services_opendns.php"/>
<RFC2136 VisibleName="RFC 2136" url="/services_rfc2136.php">
<Edit url="/services_rfc2136_edit.php*"/>
</RFC2136>
</DNSTools>
<IGMPProxy VisibleName="IGMP Proxy" url="/services_igmpproxy.php" cssClass="fa fa-map-signs"> <IGMPProxy VisibleName="IGMP Proxy" url="/services_igmpproxy.php" cssClass="fa fa-map-signs">
<IGMPProxyEdit url="/services_igmpproxy_edit.php"/> <IGMPProxyEdit url="/services_igmpproxy_edit.php"/>
</IGMPProxy> </IGMPProxy>
......
src/www/interfaces_assign.php
View file @ 0d2272ff
...@@ -448,23 +448,6 @@ include("head.inc"); ...@@ -448,23 +448,6 @@ include("head.inc");
<section class="col-xs-12"> <section class="col-xs-12">
<?php
$tab_array = array();
$tab_array[0] = array(gettext("Interface assignments"), true, "interfaces_assign.php");
$tab_array[1] = array(gettext("Interface Groups"), false, "interfaces_groups.php");
$tab_array[2] = array(gettext("Wireless"), false, "interfaces_wireless.php");
$tab_array[3] = array(gettext("VLANs"), false, "interfaces_vlan.php");
$tab_array[4] = array(gettext("QinQs"), false, "interfaces_qinq.php");
$tab_array[5] = array(gettext("PPPs"), false, "interfaces_ppps.php");
$tab_array[7] = array(gettext("GRE"), false, "interfaces_gre.php");
$tab_array[8] = array(gettext("GIF"), false, "interfaces_gif.php");
$tab_array[9] = array(gettext("Bridges"), false, "interfaces_bridge.php");
$tab_array[10] = array(gettext("LAGG"), false, "interfaces_lagg.php");
display_top_tabs($tab_array);
?>
<div class="tab-content content-box col-xs-12"> <div class="tab-content content-box col-xs-12">
<form action="interfaces_assign.php" method="post" name="iform" id="iform"> <form action="interfaces_assign.php" method="post" name="iform" id="iform">
...@@ -474,8 +457,9 @@ include("head.inc"); ...@@ -474,8 +457,9 @@ include("head.inc");
<thead> <thead>
<tr> <tr>
<th colspan="2" class="listtopic"><?=gettext("Interface"); ?></th> <th class="listtopic"><?=gettext("Interface"); ?></th>
<th colspan="2" class="listtopic"><?=gettext("Network port"); ?></th> <th class="listtopic"><?=gettext("Network port"); ?></th>
<th colspan="2" class="listtopic"></th>
</tr> </tr>
</thead> </thead>
...@@ -529,24 +513,19 @@ include("head.inc"); ...@@ -529,24 +513,19 @@ include("head.inc");
</td> </td>
<td class="list"> <td class="list">
<select name="if_add" id="if_add"> <select name="if_add" id="if_add">
<?php <?php foreach ($unused_portlist as $portname => $portinfo): ?>
foreach ($unused_portlist as $portname => $portinfo):
?>
<option value="<?=$portname;?>" <?php if ($portname == $iface['if']) echo " selected=\"selected\"";?>> <option value="<?=$portname;?>" <?php if ($portname == $iface['if']) echo " selected=\"selected\"";?>>
<?=interface_assign_description($portinfo, $portname);?> <?=interface_assign_description($portinfo, $portname);?>
</option> </option>
<?php <?php endforeach; ?>
endforeach;
?>
</select> </select>
</td> </td>
<td class="list"> <td class="list">
<button name="add_x" type="submit" value="<?=$portname;?>" class="btn btn-primary" title="<?=gettext("add selected interface");?>"><span class="glyphicon glyphicon-plus"></span></button> <button name="add_x" type="submit" value="<?=$portname;?>" class="btn btn-primary" title="<?=gettext("add selected interface");?>"><span class="glyphicon glyphicon-plus"></span></button>
</td> </td>
</tr> </tr>
<?php <tr><td colspan="2"><?= gettext('Interfaces that are configured as members of a LAGG interface will not be shown.') ?></td></tr>
endif; <?php endif; ?>
?>
</tbody> </tbody>
</table> </table>
</div> </div>
...@@ -555,9 +534,6 @@ include("head.inc"); ...@@ -555,9 +534,6 @@ include("head.inc");
<div id='savediv' style='display:none'> <div id='savediv' style='display:none'>
<input name="Submit" type="submit" class="btn btn-primary" value="<?=gettext("Save"); ?>" /><br /><br /> <input name="Submit" type="submit" class="btn btn-primary" value="<?=gettext("Save"); ?>" /><br /><br />
</div> </div>
<ul>
<li><span class="vexpl"><?=gettext("Interfaces that are configured as members of a lagg(4) interface will not be shown."); ?></span></li>
</ul>
</div> </div>
</form> </form>
......
src/www/interfaces_bridge.php
View file @ 0d2272ff
...@@ -97,23 +97,6 @@ $main_buttons = array( ...@@ -97,23 +97,6 @@ $main_buttons = array(
<section class="col-xs-12"> <section class="col-xs-12">
<?php
$tab_array = array();
$tab_array[0] = array(gettext("Interface assignments"), false, "interfaces_assign.php");
$tab_array[1] = array(gettext("Interface Groups"), false, "interfaces_groups.php");
$tab_array[2] = array(gettext("Wireless"), false, "interfaces_wireless.php");
$tab_array[3] = array(gettext("VLANs"), false, "interfaces_vlan.php");
$tab_array[4] = array(gettext("QinQs"), false, "interfaces_qinq.php");
$tab_array[5] = array(gettext("PPPs"), false, "interfaces_ppps.php");
$tab_array[6] = array(gettext("GRE"), false, "interfaces_gre.php");
$tab_array[7] = array(gettext("GIF"), false, "interfaces_gif.php");
$tab_array[8] = array(gettext("Bridges"), true, "interfaces_bridge.php");
$tab_array[9] = array(gettext("LAGG"), false, "interfaces_lagg.php");
display_top_tabs($tab_array);
?>
<div class="tab-content content-box col-xs-12"> <div class="tab-content content-box col-xs-12">
<form action="interfaces_bridge.php" method="post" name="iform" id="iform"> <form action="interfaces_bridge.php" method="post" name="iform" id="iform">
......
src/www/interfaces_gif.php
View file @ 0d2272ff
...@@ -88,23 +88,6 @@ $main_buttons = array( ...@@ -88,23 +88,6 @@ $main_buttons = array(
<section class="col-xs-12"> <section class="col-xs-12">
<?php
$tab_array = array();
$tab_array[0] = array(gettext("Interface assignments"), false, "interfaces_assign.php");
$tab_array[1] = array(gettext("Interface Groups"), false, "interfaces_groups.php");
$tab_array[2] = array(gettext("Wireless"), false, "interfaces_wireless.php");
$tab_array[3] = array(gettext("VLANs"), false, "interfaces_vlan.php");
$tab_array[4] = array(gettext("QinQs"), false, "interfaces_qinq.php");
$tab_array[5] = array(gettext("PPPs"), false, "interfaces_ppps.php");
$tab_array[6] = array(gettext("GRE"), false, "interfaces_gre.php");
$tab_array[7] = array(gettext("GIF"), true, "interfaces_gif.php");
$tab_array[8] = array(gettext("Bridges"), false, "interfaces_bridge.php");
$tab_array[9] = array(gettext("LAGG"), false, "interfaces_lagg.php");
display_top_tabs($tab_array);
?>
<div class="tab-content content-box col-xs-12"> <div class="tab-content content-box col-xs-12">
<form action="interfaces_assign.php" method="post" name="iform" id="iform"> <form action="interfaces_assign.php" method="post" name="iform" id="iform">
......
src/www/interfaces_gre.php
View file @ 0d2272ff
...@@ -88,23 +88,6 @@ $main_buttons = array( ...@@ -88,23 +88,6 @@ $main_buttons = array(
<section class="col-xs-12"> <section class="col-xs-12">
<?php
$tab_array = array();
$tab_array[0] = array(gettext("Interface assignments"), false, "interfaces_assign.php");
$tab_array[1] = array(gettext("Interface Groups"), false, "interfaces_groups.php");
$tab_array[2] = array(gettext("Wireless"), false, "interfaces_wireless.php");
$tab_array[3] = array(gettext("VLANs"), false, "interfaces_vlan.php");
$tab_array[4] = array(gettext("QinQs"), false, "interfaces_qinq.php");
$tab_array[5] = array(gettext("PPPs"), false, "interfaces_ppps.php");
$tab_array[6] = array(gettext("GRE"), true, "interfaces_gre.php");
$tab_array[7] = array(gettext("GIF"), false, "interfaces_gif.php");
$tab_array[8] = array(gettext("Bridges"), false, "interfaces_bridge.php");
$tab_array[9] = array(gettext("LAGG"), false, "interfaces_lagg.php");
display_top_tabs($tab_array);
?>
<div class="tab-content content-box col-xs-12"> <div class="tab-content content-box col-xs-12">
<form action="interfaces_assign.php" method="post" name="iform" id="iform"> <form action="interfaces_assign.php" method="post" name="iform" id="iform">
......
src/www/interfaces_groups.php
View file @ 0d2272ff
...@@ -73,23 +73,6 @@ $main_buttons = array( ...@@ -73,23 +73,6 @@ $main_buttons = array(
<section class="col-xs-12"> <section class="col-xs-12">
<?php
$tab_array = array();
$tab_array[0] = array(gettext("Interface assignments"), false, "interfaces_assign.php");
$tab_array[1] = array(gettext("Interface Groups"), true, "interfaces_groups.php");
$tab_array[2] = array(gettext("Wireless"), false, "interfaces_wireless.php");
$tab_array[3] = array(gettext("VLANs"), false, "interfaces_vlan.php");
$tab_array[4] = array(gettext("QinQs"), false, "interfaces_qinq.php");
$tab_array[5] = array(gettext("PPPs"), false, "interfaces_ppps.php");
$tab_array[6] = array(gettext("GRE"), false, "interfaces_gre.php");
$tab_array[7] = array(gettext("GIF"), false, "interfaces_gif.php");
$tab_array[8] = array(gettext("Bridges"), false, "interfaces_bridge.php");
$tab_array[9] = array(gettext("LAGG"), false, "interfaces_lagg.php");
display_top_tabs($tab_array);
?>
<div class="tab-content content-box col-xs-12"> <div class="tab-content content-box col-xs-12">
......
src/www/interfaces_lagg.php
View file @ 0d2272ff
...@@ -93,23 +93,6 @@ $main_buttons = array( ...@@ -93,23 +93,6 @@ $main_buttons = array(
<section class="col-xs-12"> <section class="col-xs-12">
<?php
$tab_array = array();
$tab_array[0] = array(gettext("Interface assignments"), false, "interfaces_assign.php");
$tab_array[1] = array(gettext("Interface Groups"), false, "interfaces_groups.php");
$tab_array[2] = array(gettext("Wireless"), false, "interfaces_wireless.php");
$tab_array[3] = array(gettext("VLANs"), false, "interfaces_vlan.php");
$tab_array[4] = array(gettext("QinQs"), false, "interfaces_qinq.php");
$tab_array[5] = array(gettext("PPPs"), false, "interfaces_ppps.php");
$tab_array[6] = array(gettext("GRE"), false, "interfaces_gre.php");
$tab_array[7] = array(gettext("GIF"), false, "interfaces_gif.php");
$tab_array[8] = array(gettext("Bridges"), false, "interfaces_bridge.php");
$tab_array[9] = array(gettext("LAGG"), true, "interfaces_lagg.php");
display_top_tabs($tab_array);
?>
<div class="tab-content content-box col-xs-12"> <div class="tab-content content-box col-xs-12">
......
src/www/interfaces_ppps.php
View file @ 0d2272ff
...@@ -89,23 +89,6 @@ $main_buttons = array( ...@@ -89,23 +89,6 @@ $main_buttons = array(
<section class="col-xs-12"> <section class="col-xs-12">
<?php
$tab_array = array();
$tab_array[0] = array(gettext("Interface assignments"), false, "interfaces_assign.php");
$tab_array[1] = array(gettext("Interface Groups"), false, "interfaces_groups.php");
$tab_array[2] = array(gettext("Wireless"), false, "interfaces_wireless.php");
$tab_array[3] = array(gettext("VLANs"), false, "interfaces_vlan.php");
$tab_array[4] = array(gettext("QinQs"), false, "interfaces_qinq.php");
$tab_array[5] = array(gettext("PPPs"), true, "interfaces_ppps.php");
$tab_array[6] = array(gettext("GRE"), false, "interfaces_gre.php");
$tab_array[7] = array(gettext("GIF"), false, "interfaces_gif.php");
$tab_array[8] = array(gettext("Bridges"), false, "interfaces_bridge.php");
$tab_array[9] = array(gettext("LAGG"), false, "interfaces_lagg.php");
display_top_tabs($tab_array);
?>
<div class="tab-content content-box col-xs-12"> <div class="tab-content content-box col-xs-12">
<form action="interfaces_assign.php" method="post" name="iform" id="iform"> <form action="interfaces_assign.php" method="post" name="iform" id="iform">
......
src/www/interfaces_qinq.php
View file @ 0d2272ff
...@@ -96,23 +96,6 @@ $main_buttons = array( ...@@ -96,23 +96,6 @@ $main_buttons = array(
<section class="col-xs-12"> <section class="col-xs-12">
<?php
$tab_array = array();
$tab_array[0] = array(gettext("Interface assignments"), false, "interfaces_assign.php");
$tab_array[1] = array(gettext("Interface Groups"), false, "interfaces_groups.php");
$tab_array[2] = array(gettext("Wireless"), false, "interfaces_wireless.php");
$tab_array[3] = array(gettext("VLANs"), false, "interfaces_vlan.php");
$tab_array[4] = array(gettext("QinQs"), true, "interfaces_qinq.php");
$tab_array[5] = array(gettext("PPPs"), false, "interfaces_ppps.php");
$tab_array[6] = array(gettext("GRE"), false, "interfaces_gre.php");
$tab_array[7] = array(gettext("GIF"), false, "interfaces_gif.php");
$tab_array[8] = array(gettext("Bridges"), false, "interfaces_bridge.php");
$tab_array[9] = array(gettext("LAGG"), false, "interfaces_lagg.php");
display_top_tabs($tab_array);
?>
<div class="tab-content content-box col-xs-12"> <div class="tab-content content-box col-xs-12">
......
src/www/interfaces_vlan.php
View file @ 0d2272ff
...@@ -95,23 +95,6 @@ $main_buttons = array( ...@@ -95,23 +95,6 @@ $main_buttons = array(
<section class="col-xs-12"> <section class="col-xs-12">
<?php
$tab_array = array();
$tab_array[0] = array(gettext("Interface assignments"), false, "interfaces_assign.php");
$tab_array[1] = array(gettext("Interface Groups"), false, "interfaces_groups.php");
$tab_array[2] = array(gettext("Wireless"), false, "interfaces_wireless.php");
$tab_array[3] = array(gettext("VLANs"), true, "interfaces_vlan.php");
$tab_array[4] = array(gettext("QinQs"), false, "interfaces_qinq.php");
$tab_array[5] = array(gettext("PPPs"), false, "interfaces_ppps.php");
$tab_array[6] = array(gettext("GRE"), false, "interfaces_gre.php");
$tab_array[7] = array(gettext("GIF"), false, "interfaces_gif.php");
$tab_array[8] = array(gettext("Bridges"), false, "interfaces_bridge.php");
$tab_array[9] = array(gettext("LAGG"), false, "interfaces_lagg.php");
display_top_tabs($tab_array);
?>
<div class="tab-content content-box col-xs-12"> <div class="tab-content content-box col-xs-12">
<form action="interfaces_assign.php" method="post" name="iform" id="iform"> <form action="interfaces_assign.php" method="post" name="iform" id="iform">
......
src/www/interfaces_wireless.php
View file @ 0d2272ff
...@@ -85,23 +85,6 @@ $main_buttons = array( ...@@ -85,23 +85,6 @@ $main_buttons = array(
<section class="col-xs-12"> <section class="col-xs-12">
<?php
$tab_array = array();
$tab_array[0] = array(gettext("Interface assignments"), false, "interfaces_assign.php");
$tab_array[1] = array(gettext("Interface Groups"), false, "interfaces_groups.php");
$tab_array[2] = array(gettext("Wireless"), true, "interfaces_wireless.php");
$tab_array[3] = array(gettext("VLANs"), false, "interfaces_vlan.php");
$tab_array[4] = array(gettext("QinQs"), false, "interfaces_qinq.php");
$tab_array[5] = array(gettext("PPPs"), false, "interfaces_ppps.php");
$tab_array[6] = array(gettext("GRE"), false, "interfaces_gre.php");
$tab_array[7] = array(gettext("GIF"), false, "interfaces_gif.php");
$tab_array[8] = array(gettext("Bridges"), false, "interfaces_bridge.php");
$tab_array[9] = array(gettext("LAGG"), false, "interfaces_lagg.php");
display_top_tabs($tab_array);
?>
<div class="tab-content content-box col-xs-12"> <div class="tab-content content-box col-xs-12">
<form action="interfaces_assign.php" method="post" name="iform" id="iform"> <form action="interfaces_assign.php" method="post" name="iform" id="iform">
......
src/www/services_dyndns.php
View file @ 0d2272ff
...@@ -73,16 +73,8 @@ $main_buttons = array( ...@@ -73,16 +73,8 @@ $main_buttons = array(
<section class="col-xs-12"> <section class="col-xs-12">
<?php
$tab_array = array();
$tab_array[] = array(gettext("DynDns"), true, "services_dyndns.php");
$tab_array[] = array(gettext("RFC 2136"), false, "services_rfc2136.php");
display_top_tabs($tab_array);
?>
<div class="tab-content content-box col-xs-12"> <div class="tab-content content-box col-xs-12">
<form action="services_dyndns.php" method="post" name="iform" id="iform"> <form action="services_dyndns.php" method="post" name="iform" id="iform">
<div class="table-responsive"> <div class="table-responsive">
......
src/www/services_rfc2136.php
View file @ 0d2272ff
...@@ -66,16 +66,8 @@ $main_buttons = array( ...@@ -66,16 +66,8 @@ $main_buttons = array(
<section class="col-xs-12"> <section class="col-xs-12">
<?php
$tab_array = array();
$tab_array[] = array(gettext("DynDns"), false, "services_dyndns.php");
$tab_array[] = array(gettext("RFC 2136"), true, "services_rfc2136.php");
display_top_tabs($tab_array);
?>
<div class="tab-content content-box col-xs-12"> <div class="tab-content content-box col-xs-12">
<form action="services_rfc2136.php" method="post" name="iform" id="iform"> <form action="services_rfc2136.php" method="post" name="iform" id="iform">
<div class="table-responsive"> <div class="table-responsive">
......
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

Technounit-GROUP 2023