diff options
author | Stephen Beaver <sbeaver@netgate.com> | 2015-12-22 08:17:46 -0500 |
---|---|---|
committer | Stephen Beaver <sbeaver@netgate.com> | 2015-12-22 08:17:46 -0500 |
commit | 09f9fff91e5d5906c5de774edcb1c969c7da2463 (patch) | |
tree | cd7ff346e6903fe6599ee76b92f286f5d088ceec /src/usr/local/www | |
parent | 6e14a6ca9f37f46ce2a254f5853b15053aa83daa (diff) | |
download | pfsense-09f9fff91e5d5906c5de774edcb1c969c7da2463.zip pfsense-09f9fff91e5d5906c5de774edcb1c969c7da2463.tar.gz |
Reverts change to Form_Selector which was breaking selectors with blank options
Diffstat (limited to 'src/usr/local/www')
-rw-r--r-- | src/usr/local/www/bootstrap/css/pfSense.css | 2 | ||||
-rw-r--r-- | src/usr/local/www/classes/Form/Select.class.php | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/usr/local/www/bootstrap/css/pfSense.css b/src/usr/local/www/bootstrap/css/pfSense.css index 644242a..fde1e66 100644 --- a/src/usr/local/www/bootstrap/css/pfSense.css +++ b/src/usr/local/www/bootstrap/css/pfSense.css @@ -330,11 +330,9 @@ form .btn + .btn { margin-top: 5px; } -/** .col-sm-10 .form-control { width: calc(50% - 15px); } -*/ @media (max-width: 991px) { .col-sm-10 .form-control { diff --git a/src/usr/local/www/classes/Form/Select.class.php b/src/usr/local/www/classes/Form/Select.class.php index 30c4911..c7d73c1 100644 --- a/src/usr/local/www/classes/Form/Select.class.php +++ b/src/usr/local/www/classes/Form/Select.class.php @@ -66,8 +66,7 @@ class Form_Select extends Form_Input $selected = ($sval == $value); } - if (!empty($name) || $name == '0') - $options .= '<option value="'. htmlspecialchars($value) .'"'.($selected ? ' selected' : '').'>'. htmlspecialchars(gettext($name)) .'</option>'; + $options .= '<option value="'. htmlspecialchars($value) .'"'.($selected ? ' selected' : '').'>'. htmlspecialchars(gettext($name)) .'</option>'; } return <<<EOT |