interfaces: some settings are not in advanced; closes #1735

Maybe the dhcpv6 opts should be, but currently are not.  At least
now the GUI makes this very clear.
This commit is contained in:
Franco Fichtner 2017-08-06 12:42:28 +02:00
parent c0cf0740ef
commit bd6c566f2d

View File

@ -1455,7 +1455,6 @@ include("head.inc");
$(".dhcp_basic").removeClass("hidden");
break;
case "advanced":
$(".dhcp_basic").removeClass("hidden");
$(".dhcp_advanced").removeClass("hidden");
break;
case "file":
@ -1477,7 +1476,6 @@ include("head.inc");
$(".dhcpv6_basic").removeClass("hidden");
break;
case "advanced":
$(".dhcpv6_basic").removeClass("hidden");
$(".dhcpv6_advanced").removeClass("hidden");
break;
case "file":
@ -1928,17 +1926,6 @@ include("head.inc");
</div>
</td>
</tr>
<tr class="dhcp_basic">
<td><a id="help_for_dhcphostname" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Hostname"); ?></td>
<td>
<input name="dhcphostname" type="text" id="dhcphostname" value="<?=$pconfig['dhcphostname'];?>" />
<div class="hidden" for="help_for_dhcphostname">
<?=gettext("The value in this field is sent as the DHCP client identifier " .
"and hostname when requesting a DHCP lease. Some ISPs may require " .
"this (for client identification)."); ?>
</div>
</td>
</tr>
<tr class="dhcp_basic">
<td><a id="help_for_alias_address" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Alias IPv4 address"); ?></td>
<td>
@ -1976,6 +1963,17 @@ include("head.inc");
</div>
</td>
</tr>
<tr class="dhcp_basic dhcp_advanced">
<td><a id="help_for_dhcphostname" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Hostname"); ?></td>
<td>
<input name="dhcphostname" type="text" id="dhcphostname" value="<?=$pconfig['dhcphostname'];?>" />
<div class="hidden" for="help_for_dhcphostname">
<?=gettext("The value in this field is sent as the DHCP client identifier " .
"and hostname when requesting a DHCP lease. Some ISPs may require " .
"this (for client identification)."); ?>
</div>
</td>
</tr>
<tr class="dhcp_advanced">
<td><a id="help_for_dhcpprotocol_timing" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Protocol Timing"); ?></td>
<td>
@ -2445,24 +2443,6 @@ include("head.inc");
</div>
</td>
</tr>
<tr class="dhcpv6_advanced dhcpv6_file_override">
<td><a id="help_for_dhcp6_debug" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Enable debug"); ?></td>
<td>
<input name="adv_dhcp6_debug" type="checkbox" id="adv_dhcp6_debug" value="yes" <?=!empty($pconfig['adv_dhcp6_debug']) ? "checked=\"checked\"" : ""; ?> />
<div class="hidden" for="help_for_dhcp6_debug">
<?=gettext("Enable debug mode for DHCPv6 client"); ?>
</div>
</td>
</tr>
<tr class="dhcpv6_basic">
<td><a id="help_for_dhcp6usev4iface" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Use IPv4 connectivity"); ?></td>
<td>
<input name="dhcp6usev4iface" type="checkbox" id="dhcp6usev4iface" value="yes" <?=!empty($pconfig['dhcp6usev4iface']) ? "checked=\"checked\"" : ""; ?> />
<div class="hidden" for="help_for_dhcp6usev4iface">
<?=gettext("Request a IPv6 prefix/information through the IPv4 connectivity link"); ?>
</div>
</td>
</tr>
<tr class="dhcpv6_basic">
<td><a id="help_for_dhcp6prefixonly" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Request only a IPv6 prefix"); ?></td>
<td>
@ -2472,15 +2452,6 @@ include("head.inc");
</div>
</td>
</tr>
<tr class="dhcpv6_basic">
<td><a id="help_for_dhcp6sendsolicit" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext('Directly send SOLICIT'); ?></td>
<td>
<input name="dhcp6sendsolicit" type="checkbox" id="dhcp6sendsolicit" value="yes" <?= !empty($pconfig['dhcp6sendsolicit']) ? 'checked="checked"' : '' ?>/>
<div class="hidden" for="help_for_dhcp6sendsolicit">
<?= gettext('In case the ISP requires a SOLICIT message for authentication, select this option to prevent indefinite waiting for a router advertisement.') ?>
</div>
</td>
</tr>
<tr class="dhcpv6_basic">
<td><a id="help_for_dhcp6-ia-pd-len" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("DHCPv6 Prefix Delegation size"); ?></td>
<td>
@ -2507,6 +2478,33 @@ include("head.inc");
</div>
</td>
</tr>
<tr>
<td><a id="help_for_dhcp6sendsolicit" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext('Directly send SOLICIT'); ?></td>
<td>
<input name="dhcp6sendsolicit" type="checkbox" id="dhcp6sendsolicit" value="yes" <?= !empty($pconfig['dhcp6sendsolicit']) ? 'checked="checked"' : '' ?>/>
<div class="hidden" for="help_for_dhcp6sendsolicit">
<?= gettext('In case the ISP requires a SOLICIT message for authentication, select this option to prevent indefinite waiting for a router advertisement.') ?>
</div>
</td>
</tr>
<tr>
<td><a id="help_for_dhcp6usev4iface" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Use IPv4 connectivity"); ?></td>
<td>
<input name="dhcp6usev4iface" type="checkbox" id="dhcp6usev4iface" value="yes" <?=!empty($pconfig['dhcp6usev4iface']) ? "checked=\"checked\"" : ""; ?> />
<div class="hidden" for="help_for_dhcp6usev4iface">
<?=gettext("Request a IPv6 prefix/information through the IPv4 connectivity link"); ?>
</div>
</td>
</tr>
<tr>
<td><a id="help_for_dhcp6_debug" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Enable debug"); ?></td>
<td>
<input name="adv_dhcp6_debug" type="checkbox" id="adv_dhcp6_debug" value="yes" <?=!empty($pconfig['adv_dhcp6_debug']) ? "checked=\"checked\"" : ""; ?> />
<div class="hidden" for="help_for_dhcp6_debug">
<?=gettext("Enable debug mode for DHCPv6 client"); ?>
</div>
</td>
</tr>
<tr class="dhcpv6_advanced">
<td><a id="help_for_dhcp6_intf_stmt" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Interface Statement");?></td>
<td>