diff options
author | gnhb <gnoahb@gmail.com> | 2010-05-29 11:13:49 +0700 |
---|---|---|
committer | gnhb <gnoahb@gmail.com> | 2010-05-29 11:13:49 +0700 |
commit | 7005d8439007f62022702e0843d00f0614548bab (patch) | |
tree | f6d277e454d36480a36fafe68c88e218a3f38c12 /usr/local/www/interfaces.php | |
parent | 93ee63233439ea758143fe7eaf3227c42274ff54 (diff) | |
parent | fda6084959b0cbd010e97330daeccf63b3533902 (diff) | |
download | pfsense-7005d8439007f62022702e0843d00f0614548bab.zip pfsense-7005d8439007f62022702e0843d00f0614548bab.tar.gz |
Merge branch 'master' of http://gitweb.pfsense.org/pfsense/mainline into mlppp
Conflicts:
usr/local/www/interfaces.php
Diffstat (limited to 'usr/local/www/interfaces.php')
-rwxr-xr-x | usr/local/www/interfaces.php | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php index 8a9d0a2..1cda057 100755 --- a/usr/local/www/interfaces.php +++ b/usr/local/www/interfaces.php @@ -985,12 +985,11 @@ $types = array("none" => "None", "static" => "Static", "dhcp" => "DHCP", "pppoe" <select name="type" onChange="updateType(this.value);" class="formselect" id="type"> <?php foreach ($types as $key => $opt) { - //echo "<option onClick=\"updateType('{$key}');\""; - echo "<option"; - $select = ""; + echo "<option onClick=\"updateType('{$key}');\""; if ($key == $pconfig['type']) - $select = "selected"; - echo " value=\"{$key}\" {$select}>" . htmlspecialchars($opt) . "</option>"; + echo " selected"; + echo " value=\"{$key}\" >" . htmlspecialchars($opt); + echo "</option>"; } ?> </select> @@ -1345,16 +1344,16 @@ $types = array("none" => "None", "static" => "Static", "dhcp" => "DHCP", "pppoe" <tr> <td valign="top" class="vncellreq">Standard</td> <td class="vtable"> - <select name="standard" class="formselect" id="standard"> - <?php - foreach($wl_modes as $wl_standard => $wl_channels) { - echo "<option "; - if ($pconfig['standard'] == "$wl_standard") - echo "selected "; - echo "value=\"$wl_standard\">802.$wl_standard</option>\n"; - } - ?> - </select> + <select name="standard" class="formselect" id="standard"> + <?php + foreach($wl_modes as $wl_standard => $wl_channels) { + echo "<option "; + if ($pconfig['standard'] == "$wl_standard") + echo "selected "; + echo "value=\"$wl_standard\">802.$wl_standard</option>\n"; + } + ?> + </select> </td> </tr> <?php if (isset($wl_modes['11g'])): ?> @@ -1748,6 +1747,7 @@ $types = array("none" => "None", "static" => "Static", "dhcp" => "DHCP", "pppoe" </tr> </table> <!-- End "allcfg" table --> </div> <!-- End "allcfg" div --> + <table width="100%" border="0" cellpadding="6" cellspacing="0"> <tr> <td width="100" valign="top"> @@ -1852,7 +1852,6 @@ $types = array("none" => "None", "static" => "Static", "dhcp" => "DHCP", "pppoe" else echo "show_allcfg(document.iform.enable);"; echo "updateType('{$pconfig['type']}');\n"; - ?> </script> <?php include("fend.inc"); ?> </body> |