summaryrefslogtreecommitdiffstats
path: root/src/usr
diff options
context:
space:
mode:
authorSteve Beaver <sbeaver@netgate.com>2016-12-19 15:50:24 -0500
committerSteve Beaver <sbeaver@netgate.com>2016-12-19 15:50:24 -0500
commit297190ed9cda17398398ba19c58234f3087f1a94 (patch)
tree9c1cb58d98a23c9433f0ea782f6899a4cc7c2265 /src/usr
parent806a202a37389110d32a513588a4f82c2e677728 (diff)
downloadpfsense-297190ed9cda17398398ba19c58234f3087f1a94.zip
pfsense-297190ed9cda17398398ba19c58234f3087f1a94.tar.gz
COmpleted #6889 by re-formatting help text
Diffstat (limited to 'src/usr')
-rw-r--r--src/usr/local/www/services_router_advertisements.php22
1 files changed, 14 insertions, 8 deletions
diff --git a/src/usr/local/www/services_router_advertisements.php b/src/usr/local/www/services_router_advertisements.php
index ba7a075..26f53a3 100644
--- a/src/usr/local/www/services_router_advertisements.php
+++ b/src/usr/local/www/services_router_advertisements.php
@@ -122,6 +122,19 @@ $subnets_help = '<span class="help-block">' .
"If no subnets are specified here, the Router Advertisement (RA) Daemon will advertise to the subnet to which the router's interface is assigned.") .
'</span>';
+// THe use of <div class="infoblock"> here causes the text to be hidden until the user clicks the "info" icon
+$ramode_help = 'Select the Operating Mode for the Router Advertisement (RA) Daemon.' .
+ '<div class="infoblock">' .
+ '<br />' .
+ '<strong>Disabled</strong> - RADVD will not be enabled on this interface.' . '<br />' .
+ '<strong>Router Only</strong> - Will advertise this router.' . '<br />' .
+ '<strong>Unmanaged</strong> - Will advertise this router with stateless autoconfig.' . '<br />' .
+ '<strong>Managed</strong> - Will advertise this router with all configuration through a DHCPv6 server.' . '<br />' .
+ '<strong>Assisted</strong> - Will advertise this router with configuration through a DHCPv6 server and/or stateless autoconfig.' . '<br />' .
+ '<strong>Stateless DHCP</strong> - Will advertise this router with stateless autoconfig and other configuration information available via DHCPv6.' . '<br /><br />' .
+ 'It is not required to activate DHCPv6 server on pfSense when set to "Managed", "Assisted" or "Stateless DHCP", it can be another host on the network.' .
+ '</div';
+
if ($_POST) {
unset($input_errors);
@@ -293,14 +306,7 @@ $section->addInput(new Form_Select(
'Router mode',
$pconfig['ramode'],
$advertise_modes
-))->setHelp('Select the Operating Mode for the Router Advertisement (RA) Daemon.' . '<br /><br />' .
- '<strong>Disabled</strong> - RADVD will not be enabled on this interface.' . '<br />' .
- '<strong>Router Only</strong> - Will advertise this router.' . '<br />' .
- '<strong>Unmanaged</strong> - Will advertise this router with stateless autoconfig.' . '<br />' .
- '<strong>Managed</strong> - Will advertise this router with all configuration through a DHCPv6 server.' . '<br />' .
- '<strong>Assisted</strong> - Will advertise this router with configuration through a DHCPv6 server and/or stateless autoconfig.' . '<br />' .
- '<strong>Stateless DHCP</strong> - Will advertise this router with stateless autoconfig and other configuration information available via DHCPv6.' . '<br /><br />' .
- 'It is not required to activate DHCPv6 server on pfSense when set to "Managed", "Assisted" or "Stateless DHCP", it can be another host on the network.');
+))->setHelp($ramode_help);
$section->addInput(new Form_Select(
'rapriority',
OpenPOWER on IntegriCloud