diff options
| author | Ermal Luçi <eri@pfsense.org> | 2009-07-07 15:16:40 +0000 |
|---|---|---|
| committer | Ermal Luçi <eri@pfsense.org> | 2009-07-07 15:16:40 +0000 |
| commit | d6f5320405af61b2caaeed699a05747f0c75f85a (patch) | |
| tree | dc9a770e7f8614f35c59e751b5d70646403766db /usr/local/www/wizard.php | |
| parent | 7a29f7832176802ba0e2415945ae28131b20cc43 (diff) | |
| download | pfsense-d6f5320405af61b2caaeed699a05747f0c75f85a.zip pfsense-d6f5320405af61b2caaeed699a05747f0c75f85a.tar.gz | |
Fix some typos in wizard.php code introduced by previous commit.
Add 'displayname' even to option fields of select.
Convert traffic_shaper_wizard to use display better names with the introduced 'displayname'
Diffstat (limited to 'usr/local/www/wizard.php')
| -rwxr-xr-x | usr/local/www/wizard.php | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/usr/local/www/wizard.php b/usr/local/www/wizard.php index e2ec82c..f834e0b 100755 --- a/usr/local/www/wizard.php +++ b/usr/local/www/wizard.php @@ -285,7 +285,7 @@ function enablechange() { if ($field['type'] == "input") { if ($field['displayname']) { echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n"; - echo $field['displayname']); + echo $field['displayname']; echo ":</td>\n"; } else if(!$field['dontdisplayname']) { echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n"; @@ -305,7 +305,7 @@ function enablechange() { } else if ($field['type'] == "inputalias") { if ($field['displayname']) { echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n"; - echo $field['displayname']); + echo $field['displayname']; echo ":</td>\n"; } else if(!$field['dontdisplayname']) { echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n"; @@ -387,7 +387,7 @@ function enablechange() { } else if ($field['type'] == "select") { if ($field['displayname']) { echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n"; - echo $field['displayname']); + echo $field['displayname']; echo ":</td>\n"; } else if(!$field['dontdisplayname']) { echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n"; @@ -408,13 +408,18 @@ function enablechange() { foreach ($field['options']['option'] as $opt) { $selected = ""; if($value == $opt['value']) $selected = " SELECTED"; - echo "\t<option name='" . $opt['name'] . "' value='" . $opt['value'] . "'" . $selected . ">" . $opt['name'] . "</option>\n"; + echo "\t<option name='" . $opt['name'] . "' value='" . $opt['value'] . "'" . $selected . ">"; + if ($opt['displayname']) + echo $opt['displayname']; + else + echo $opt['name']; + echo "</option>\n"; } echo "</select>\n"; } else if ($field['type'] == "textarea") { if ($field['displayname']) { echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n"; - echo $field['displayname']); + echo $field['displayname']; echo ":</td>\n"; } else if(!$field['dontdisplayname']) { echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n"; @@ -434,7 +439,7 @@ function enablechange() { } else if ($field['type'] == "subnet_select") { if ($field['displayname']) { echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n"; - echo $field['displayname']); + echo $field['displayname']; echo ":</td>\n"; } else if(!$field['dontdisplayname']) { echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n"; @@ -454,7 +459,7 @@ function enablechange() { } else if ($field['type'] == "timezone_select") { if ($field['displayname']) { echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n"; - echo $field['displayname']); + echo $field['displayname']; echo ":</td>\n"; } else if(!$field['dontdisplayname']) { echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n"; @@ -475,7 +480,7 @@ function enablechange() { } else if ($field['type'] == "checkbox") { if ($field['displayname']) { echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n"; - echo $field['displayname']); + echo $field['displayname']; echo ":</td>\n"; } else if(!$field['dontdisplayname']) { echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n"; |
