Commit 88e38112 authored by Ad Schellevis's avatar Ad Schellevis Committed by Franco Fichtner

(services_dnsmasq.php) colspan not compatible with...

(services_dnsmasq.php) colspan not compatible with mobile/opnsense_standard_table_form, closes https://github.com/opnsense/core/issues/1142

(cherry picked from commit a7e3a8bf)
parent 2dba5283
...@@ -277,42 +277,48 @@ $( document ).ready(function() { ...@@ -277,42 +277,48 @@ $( document ).ready(function() {
</td> </td>
</tr> </tr>
<tr> <tr>
<td rowspan="3"><a id="help_for_strict_order" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("DNS Query Forwarding");?></td> <td><a id="help_for_strict_order" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("DNS Query Forwarding");?></td>
<td> <td>
<input name="strict_order" type="checkbox" id="strict_order" value="yes" <?=!empty($pconfig['strict_order']) ? "checked=\"checked\"" : "";?> /> <table class="table table-striped table-condensed">
<strong><?=gettext("Query DNS servers sequentially");?></strong> <tr>
<div class="hidden" for="help_for_strict_order"> <td>
<?= gettext("If this option is set, the DNS Forwarder (dnsmasq) will ". <input name="strict_order" type="checkbox" id="strict_order" value="yes" <?=!empty($pconfig['strict_order']) ? "checked=\"checked\"" : "";?> />
"query the DNS servers sequentially in the order specified (System: " . <strong><?=gettext("Query DNS servers sequentially");?></strong>
"General Setup: DNS Servers), rather than all at once in parallel.") ?> <div class="hidden" for="help_for_strict_order">
</div> <?= gettext("If this option is set, the DNS Forwarder (dnsmasq) will ".
</td> "query the DNS servers sequentially in the order specified (System: " .
</tr> "General Setup: DNS Servers), rather than all at once in parallel.") ?>
<tr> </div>
<td> </td>
<input name="domain_needed" type="checkbox" id="domain_needed" value="yes" <?=!empty($pconfig['domain_needed']) ? "checked=\"checked\"" : "";?> /> </tr>
<strong><?=gettext("Require domain");?></strong> <tr>
<div class="hidden" for="help_for_strict_order"> <td>
<?= gettext('If this option is set, the DNS Forwarder (dnsmasq) will '. <input name="domain_needed" type="checkbox" id="domain_needed" value="yes" <?=!empty($pconfig['domain_needed']) ? "checked=\"checked\"" : "";?> />
'not forward A or AAAA queries for plain names, without dots or ' . <strong><?=gettext("Require domain");?></strong>
'domain parts, to upstream name servers. If the name is not known ' . <div class="hidden" for="help_for_strict_order">
'from /etc/hosts or DHCP then a "not found" answer is returned.') ?> <?= gettext('If this option is set, the DNS Forwarder (dnsmasq) will '.
</div> 'not forward A or AAAA queries for plain names, without dots or ' .
</td> 'domain parts, to upstream name servers. If the name is not known ' .
</tr> 'from /etc/hosts or DHCP then a "not found" answer is returned.') ?>
<tr> </div>
<td> </td>
<input name="no_private_reverse" type="checkbox" id="no_private_reverse" value="yes" <?=!empty($pconfig['no_private_reverse']) ? "checked=\"checked\"" : "";?> /> </tr>
<strong><?=gettext("Do not forward private reverse lookups");?></strong> <tr>
<div class="hidden" for="help_for_strict_order"> <td>
<?= gettext('If this option is set, the DNS Forwarder (dnsmasq) will '. <input name="no_private_reverse" type="checkbox" id="no_private_reverse" value="yes" <?=!empty($pconfig['no_private_reverse']) ? "checked=\"checked\"" : "";?> />
'not forward reverse DNS lookups (PTR) for private addresses ' . <strong><?=gettext("Do not forward private reverse lookups");?></strong>
'(RFC 1918) to upstream name servers. Any entries in the Domain ' . <div class="hidden" for="help_for_strict_order">
'Overrides section forwarding private "n.n.n.in-addr.arpa" names ' . <?= gettext('If this option is set, the DNS Forwarder (dnsmasq) will '.
'to a specific server are still forwarded. If the IP to name is ' . 'not forward reverse DNS lookups (PTR) for private addresses ' .
'not known from /etc/hosts, DHCP or a specific domain override ' . '(RFC 1918) to upstream name servers. Any entries in the Domain ' .
'then a "not found" answer is immediately returned.') ?> 'Overrides section forwarding private "n.n.n.in-addr.arpa" names ' .
</div> 'to a specific server are still forwarded. If the IP to name is ' .
'not known from /etc/hosts, DHCP or a specific domain override ' .
'then a "not found" answer is immediately returned.') ?>
</div>
</td>
</tr>
</table>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -325,7 +331,7 @@ $( document ).ready(function() { ...@@ -325,7 +331,7 @@ $( document ).ready(function() {
</td> </td>
</tr> </tr>
<tr> <tr>
<td rowspan="2"><a id="help_for_interfaces" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Interfaces"); ?></td> <td><a id="help_for_interfaces" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Interfaces"); ?></td>
<td> <td>
<select id="interface" name="interface[]" multiple="multiple" class="selectpicker"> <select id="interface" name="interface[]" multiple="multiple" class="selectpicker">
<option value="" <?=empty($pconfig['interface'][0]) ? 'selected="selected"' : ""; ?>> <option value="" <?=empty($pconfig['interface'][0]) ? 'selected="selected"' : ""; ?>>
...@@ -342,10 +348,7 @@ $( document ).ready(function() { ...@@ -342,10 +348,7 @@ $( document ).ready(function() {
<div class="hidden" for="help_for_interfaces"> <div class="hidden" for="help_for_interfaces">
<?=gettext("Interface IPs used by the DNS Forwarder for responding to queries from clients. If an interface has both IPv4 and IPv6 IPs, both are used. Queries to other interface IPs not selected below are discarded. The default behavior is to respond to queries on every available IPv4 and IPv6 address.");?> <?=gettext("Interface IPs used by the DNS Forwarder for responding to queries from clients. If an interface has both IPv4 and IPv6 IPs, both are used. Queries to other interface IPs not selected below are discarded. The default behavior is to respond to queries on every available IPv4 and IPv6 address.");?>
</div> </div>
</td> <br/>
</tr>
<tr>
<td>
<input name="strictbind" type="checkbox" id="strictbind" value="yes" <?= !empty($pconfig['strictbind']) ? "checked=\"checked\"" : "";?> /> <input name="strictbind" type="checkbox" id="strictbind" value="yes" <?= !empty($pconfig['strictbind']) ? "checked=\"checked\"" : "";?> />
<strong><?=gettext("Strict Interface Binding");?></strong> <strong><?=gettext("Strict Interface Binding");?></strong>
<div class="hidden" for="help_for_interfaces"> <div class="hidden" for="help_for_interfaces">
......
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