diff options
| author | Renato Botelho <garga@pfSense.org> | 2014-02-19 08:23:47 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@pfSense.org> | 2014-02-19 08:23:47 -0300 |
| commit | 96fc5388ac8b54c84c98b73bb8aa66e7f5f321e8 (patch) | |
| tree | 5520ec2ee860606f40dede8c65a3257eebec2b1c | |
| parent | db8450cbc198b4cef30722a9b6af8ae9d047316c (diff) | |
| parent | e2a6a6fb2b97407c6891cf86a708e6cdccf81adf (diff) | |
| download | pfsense-96fc5388ac8b54c84c98b73bb8aa66e7f5f321e8.zip pfsense-96fc5388ac8b54c84c98b73bb8aa66e7f5f321e8.tar.gz | |
Merge pull request #945 from phildd/master
Enhance interface gateway data entry descriptions
| -rwxr-xr-x | etc/rc.initial.setlanip | 4 | ||||
| -rwxr-xr-x | usr/local/www/interfaces.php | 10 | ||||
| -rw-r--r-- | usr/local/www/wizards/setup_wizard.xml | 4 |
3 files changed, 10 insertions, 8 deletions
diff --git a/etc/rc.initial.setlanip b/etc/rc.initial.setlanip index 13a9bdc..8b3a820 100755 --- a/etc/rc.initial.setlanip +++ b/etc/rc.initial.setlanip @@ -306,8 +306,8 @@ function console_configure_ip_address($version) { $subnet = gen_subnet($intip, $intbits); } do { - echo "\n" . sprintf(gettext("Enter the new %s %s gateway address. Press <ENTER> for none:"), - $upperifname, $label_IPvX) . "\n> "; + echo "\n" . sprintf(gettext("For a WAN, enter the new %s %s upstream gateway address."), $upperifname, $label_IPvX) . "\n" . + gettext("For a LAN, press <ENTER> for none:") . "\n> "; $gwip = chop(fgets($fp)); $is_ipaddr = ($version === 6) ? is_ipaddrv6($gwip) : is_ipaddrv4($gwip); $is_in_subnet = $is_ipaddr && ip_in_subnet($gwip, $subnet . "/" . $intbits); diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php index 83fc745..db66071 100755 --- a/usr/local/www/interfaces.php +++ b/usr/local/www/interfaces.php @@ -1712,7 +1712,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"), </td> </tr> <tr> - <td width="22%" valign="top" class="vncell"><?=gettext("Gateway"); ?></td> + <td width="22%" valign="top" class="vncell"><?=gettext("IPv4 Upstream Gateway"); ?></td> <td width="78%" class="vtable"> <select name="gateway" class="formselect" id="gateway"> <option value="none" selected="selected"><?=gettext("None"); ?></option> @@ -1733,7 +1733,8 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"), - or <strong><a onclick="show_add_gateway();" href="#gatewaysection"><?=gettext("add a new one."); ?></a></strong> <br/> <div id='addgwbox'> - <?=gettext("If this interface is an Internet connection, select an existing Gateway from the list or add one using the link above"); ?> + <?=gettext("If this interface is an Internet connection, select an existing Gateway from the list or add a new one using the link above."); ?><br/> + <?=gettext("On local LANs the upstream gateway should be \"none\"."); ?> </div> <div id='notebox'> </div> @@ -1817,7 +1818,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"), </td> </tr> <tr> - <td width="22%" valign="top" class="vncell"><?=gettext("Gateway IPv6"); ?></td> + <td width="22%" valign="top" class="vncell"><?=gettext("IPv6 Upstream Gateway"); ?></td> <td width="78%" class="vtable"> <select name="gatewayv6" class="formselect" id="gatewayv6"> <option value="none" selected="selected"><?=gettext("None"); ?></option> @@ -1838,7 +1839,8 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"), - or <strong><a onclick="show_add_gateway_v6();" href="#gatewayv6section"><?=gettext("add a new one."); ?></a></strong> <br/> <div id='addgwboxv6'> - <?=gettext("If this interface is an Internet connection, select an existing Gateway from the list or add a new one using the link above"); ?> + <?=gettext("If this interface is an Internet connection, select an existing Gateway from the list or add a new one using the link above."); ?><br/> + <?=gettext("On local LANs the upstream gateway should be \"none\"."); ?> </div> <div id='noteboxv6'> </div> diff --git a/usr/local/www/wizards/setup_wizard.xml b/usr/local/www/wizards/setup_wizard.xml index daf32dd..b7d9e6c 100644 --- a/usr/local/www/wizards/setup_wizard.xml +++ b/usr/local/www/wizards/setup_wizard.xml @@ -193,7 +193,7 @@ <option> <name>Static</name> <value>Static</value> - <enablefields>ipaddress,subnetmask,gateway</enablefields> + <enablefields>ipaddress,subnetmask,upstreamgateway</enablefields> </option> <option> <name>DHCP</name> @@ -262,7 +262,7 @@ <type>subnet_select</type> </field> <field> - <name>Gateway</name> + <name>Upstream Gateway</name> <bindstofield>wizardtemp->wangateway</bindstofield> <type>input</type> <validate>^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$</validate> |
