diff options
| -rw-r--r-- | includes/form.inc | 13 | ||||
| -rw-r--r-- | modules/user/user.css | 2 |
2 files changed, 12 insertions, 3 deletions
diff --git a/includes/form.inc b/includes/form.inc index a774a7ae9..66537c6ba 100644 --- a/includes/form.inc +++ b/includes/form.inc @@ -1574,7 +1574,7 @@ function theme_fieldset($element) { } $element['#attributes']['id'] = $element['#id']; - return '<fieldset' . drupal_attributes($element['#attributes']) . '>' . ($element['#title'] ? '<legend>' . $element['#title'] . '</legend>' : '') . (isset($element['#description']) && $element['#description'] ? '<div class="description">' . $element['#description'] . '</div>' : '') . (!empty($element['#children']) ? $element['#children'] : '') . (isset($element['#value']) ? $element['#value'] : '') . "</fieldset>\n"; + return '<fieldset' . drupal_attributes($element['#attributes']) . '>' . ($element['#title'] ? '<legend>' . $element['#title'] . '</legend>' : '') . (isset($element['#description']) && $element['#description'] ? '<div class="fieldset-description">' . $element['#description'] . '</div>' : '') . (!empty($element['#children']) ? $element['#children'] : '') . (isset($element['#value']) ? $element['#value'] : '') . "</fieldset>\n"; } /** @@ -2608,7 +2608,16 @@ function theme_form_element($element) { // This is also used in the installer, pre-database setup. $t = get_t(); - $output = '<div class="form-item"'; + // Add element's #type and #name as class to aid with JS/CSS selectors. + $class = array('form-item'); + if (!empty($element['#type'])) { + $class[] = 'form-item-' . strtr($element['#type'], array('_' => '-')); + } + if (!empty($element['#name'])) { + $class[] = strtr($element['#name'], array('_' => '-', '[' => '-', ']' => '')) . '-wrapper'; + } + + $output = '<div class="' . implode(' ', $class) . '"'; if (!empty($element['#id'])) { $output .= ' id="' . $element['#id'] . '-wrapper"'; } diff --git a/modules/user/user.css b/modules/user/user.css index bd31977c9..513eb7117 100644 --- a/modules/user/user.css +++ b/modules/user/user.css @@ -23,7 +23,7 @@ margin-left: 0.5em; /* LTR */ clear: right; /* LTR */ } -#user-admin-settings fieldset .description { +#user-admin-settings fieldset .fieldset-description { font-size: 0.85em; padding-bottom: .5em; } |