Revision 9bf15239
Added by Phil Davis over 9 years ago
| src/usr/local/www/services_dnsmasq.php | ||
|---|---|---|
| 343 | 343 |
print($form); |
| 344 | 344 |
|
| 345 | 345 |
?> |
| 346 |
<div class="infoblock"> |
|
| 347 |
<?php |
|
| 348 |
print_callout('<p>' .
|
|
| 349 |
gettext('If the DNS forwarder is enabled, the DHCP service (if enabled) will automatically' .
|
|
| 350 |
' serve the LAN IP address as a DNS server to DHCP clients so they will use the forwarder.') . '</p><p>' . |
|
| 351 |
sprintf(gettext('The DNS forwarder will use the DNS servers entered in %1$sSystem > General Setup%2$s or' .
|
|
| 352 |
' those obtained via DHCP or PPP on WAN if "Allow DNS server list to be overridden by DHCP/PPP on WAN" is checked.' . |
|
| 353 |
' If that option is not used (or if a static IP address is used on WAN),' . |
|
| 354 |
' at least one DNS server must be manually specified on the %1$sSystem > General Setup%2$s page.'), |
|
| 355 |
'<a href="system.php">', |
|
| 356 |
'</a>') . |
|
| 357 |
'</p>' |
|
| 358 |
); |
|
| 359 |
|
|
| 360 |
?> |
|
| 361 |
</div> |
|
| 362 |
<?php |
|
| 363 |
print_callout(gettext("Entries in this section override individual results from the forwarders.") . " " .
|
|
| 364 |
gettext("Use these for changing DNS results or for adding custom DNS records.")
|
|
| 365 |
); |
|
| 366 |
?> |
|
| 367 |
|
|
| 368 | 346 |
<div class="panel panel-default"> |
| 369 | 347 |
<div class="panel-heading"><h2 class="panel-title"><?=gettext("Host Overrides")?></h2></div>
|
| 370 | 348 |
<div class="panel-body table-responsive"> |
| ... | ... | |
| 440 | 418 |
</a> |
| 441 | 419 |
</nav> |
| 442 | 420 |
|
| 443 |
<?php |
|
| 444 |
print_callout(gettext("Entries in this area override an entire domain, and subdomains, by specifying an".
|
|
| 445 |
" authoritative DNS server to be queried for that domain.") |
|
| 446 |
); |
|
| 447 |
?> |
|
| 448 |
|
|
| 449 | 421 |
<div class="panel panel-default"> |
| 450 | 422 |
<div class="panel-heading"><h2 class="panel-title"><?=gettext("Domain Overrides")?></h2></div>
|
| 451 | 423 |
<div class="panel-body table-responsive"> |
| ... | ... | |
| 492 | 464 |
<?=gettext('Add')?>
|
| 493 | 465 |
</a> |
| 494 | 466 |
</nav> |
| 467 |
<div class="infoblock"> |
|
| 468 |
<?php |
|
| 469 |
print_info_box( |
|
| 470 |
'<p>' . |
|
| 471 |
gettext('If the DNS forwarder is enabled, the DHCP service (if enabled) will automatically' .
|
|
| 472 |
' serve the LAN IP address as a DNS server to DHCP clients so they will use the forwarder.') . '</p><p>' . |
|
| 473 |
sprintf(gettext('The DNS forwarder will use the DNS servers entered in %1$sSystem > General Setup%2$s or' .
|
|
| 474 |
' those obtained via DHCP or PPP on WAN if "Allow DNS server list to be overridden by DHCP/PPP on WAN" is checked.' . |
|
| 475 |
' If that option is not used (or if a static IP address is used on WAN),' . |
|
| 476 |
' at least one DNS server must be manually specified on the %1$sSystem > General Setup%2$s page.'), |
|
| 477 |
'<a href="system.php">', |
|
| 478 |
'</a>') . |
|
| 479 |
'</p>', |
|
| 480 |
'info', |
|
| 481 |
false |
|
| 482 |
); |
|
| 483 |
?> |
|
| 484 |
</div> |
|
| 495 | 485 |
|
| 496 | 486 |
<?php |
| 497 | 487 |
include("foot.inc");
|
Also available in: Unified diff
Make forwarder info boxes consistent with resolver
DNS Resolver just has a single info box at the bottom of its settings page.
DNS Forwarder has different print_callout stuff that looks inconsistent with the rest of the GUI pages.
I have made it consistent with DNS Resolver, which does not have those bits of text describing host and domain overrides.
What do you think?