diff options
| author | Ermal Luçi <eri@pfsense.org> | 2014-02-19 08:54:43 +0100 |
|---|---|---|
| committer | Ermal Luçi <eri@pfsense.org> | 2014-02-19 08:54:43 +0100 |
| commit | 63fd5773076cb1995ac9405de566dd0fd74eb54a (patch) | |
| tree | 1f97d90a41f6cf2a4950a6f42b322b067dadba62 /usr/local/www | |
| parent | 18e5723b3753a6eef8d0f48ba677cb149e1f2686 (diff) | |
| parent | c1d59c7a4f559efeebc629bce7f1f1f1f3f78d5a (diff) | |
| download | pfsense-63fd5773076cb1995ac9405de566dd0fd74eb54a.zip pfsense-63fd5773076cb1995ac9405de566dd0fd74eb54a.tar.gz | |
Merge pull request #903 from phildd/RELENG_2_1
Releng 2 1 Enhance interface gateway data entry descriptions
Diffstat (limited to 'usr/local/www')
| -rwxr-xr-x | usr/local/www/interfaces.php | 12 | ||||
| -rw-r--r-- | usr/local/www/wizards/setup_wizard.xml | 4 |
2 files changed, 9 insertions, 7 deletions
diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php index 7e2fc73..bb1854b 100755 --- a/usr/local/www/interfaces.php +++ b/usr/local/www/interfaces.php @@ -4,7 +4,7 @@ interfaces.php Copyright (C) 2004-2008 Scott Ullrich Copyright (C) 2006 Daniel S. Haischt. - Copyright (C) 2008-2010 Ermal Lu�i + Copyright (C) 2008-2010 Ermal Luci All rights reserved. originally part of m0n0wall (http://m0n0.ch/wall) @@ -1546,7 +1546,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> @@ -1567,7 +1567,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> @@ -1651,7 +1652,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> @@ -1672,7 +1673,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> |
