interfaces: small selected bug, reorder settings for clarity

This commit is contained in:
Franco Fichtner 2017-12-31 13:43:25 +01:00
parent ba725881f8
commit 617dcaee88

View file

@ -2523,15 +2523,6 @@ include("head.inc");
</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_dhcp6norelease" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Prevent release"); ?></td>
<td>
@ -2541,22 +2532,6 @@ include("head.inc");
</div>
</td>
</tr>
<tr>
<td><a id="help_for_dhcp6vlanprio" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?= gettext('Use VLAN priority') ?></td>
<td>
<select name="dhcp6vlanprio">
<option value="" <?= "{$pconfig['dhcp6vlanprio']}" === '' ? 'selected="selected"' : '' ?>><?= gettext('Disabled') ?></option>
<?php
foreach (interfaces_vlan_priorities() as $pcp => $priority): ?>
<option value="<?= html_safe($pcp) ?>" <?= "{$pconfig['dhcp6vlanprio']}" === "$priority" ? 'selected="selected"' : '' ?>><?= htmlspecialchars($priority) ?></option>
<?php
endforeach ?>
</select>
<div class="hidden" for="help_for_dhcp6vlanprio">
<?= gettext('Certain ISPs may require that DHCP6 requests are sent with a specific VLAN priority.') ?>
</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>
@ -2566,6 +2541,31 @@ include("head.inc");
</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_dhcp6vlanprio" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?= gettext('Use VLAN priority') ?></td>
<td>
<select name="dhcp6vlanprio">
<option value="" <?= "{$pconfig['dhcp6vlanprio']}" === '' ? 'selected="selected"' : '' ?>><?= gettext('Disabled') ?></option>
<?php
foreach (interfaces_vlan_priorities() as $pcp => $priority): ?>
<option value="<?= html_safe($pcp) ?>" <?= "{$pconfig['dhcp6vlanprio']}" === "$pcp" ? 'selected="selected"' : '' ?>><?= htmlspecialchars($priority) ?></option>
<?php
endforeach ?>
</select>
<div class="hidden" for="help_for_dhcp6vlanprio">
<?= gettext('Certain ISPs may require that DHCPv6 requests are sent with a specific VLAN priority.') ?>
</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>