diff -u b/core/includes/form.inc b/core/includes/form.inc
--- b/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -2842,7 +2842,7 @@
* An associative array containing:
* - element: An associative array containing the properties of the element.
* Properties used: #attributes, #children, #collapsed, #description, #id,
- * #title,#title_display, #value.
+ * #title, #value.
*
* @ingroup themeable
*/
@@ -2855,7 +2855,7 @@
* An associative array containing:
* - element: An associative array containing the properties of the element.
* Properties used: #attributes, #children, #collapsed, #description, #id,
- * #title, #value.
+ * #title,#title_display, #value.
*
* @ingroup themeable
*/
@@ -4516,7 +4516,7 @@
* Returns HTML for a textarea form element.
*
* @param $variables
- * An associative array containing:
+ *
* - element: An associative array containing the properties of the element.
* Properties used: #title, #value, #description, #rows, #cols,
* #placeholder, #required, #attributes, #resizable
@@ -4592,7 +4592,7 @@
* Returns HTML for a textarea form element.
*
* @param $variables
- *
+ * An associative array containing:
* - element: An associative array containing the properties of the element.
* Properties used: #title, #value, #description, #rows, #cols,
* #placeholder, #required, #attributes, #resizable
@@ -4688,14 +4688,32 @@
if (!empty($element['#attributes']['disabled'])) {
$attributes['class'][] = 'form-disabled';
}
+ $prefix = isset($element['#field_prefix']) ? '' . $element['#field_prefix'] . ' ' : '';
+ $suffix = isset($element['#field_suffix']) ? ' ' . $element['#field_suffix'] . '' : '';
+
+ // Composite elements consist of more than one HTML form control. These must
+ // be grouped by a fieldset.
+ if (isset($element['#composite']) && $element['#composite'] === TRUE) {
+ $fieldset_variables = array('element' => array());
+ $fieldset_variables['element']['#children'] = $prefix . $element['#children'] . $suffix;
+ foreach (array('#attributes', '#description', '#id', '#title', '#title_display') as $property) {
+ if (empty($element[$property])) {
+ $fieldset_variables['element'][$property] = NULL;
+ }
+ else {
+ $fieldset_variables['element'][$property] = $element[$property];
+ }
+ }
+ unset($fieldset_variables['element']['#attributes']['disabled']);
+ $fieldset_variables['element']['#title'] .= !empty($element['#required']) ? ' ' . theme('form_required_marker', array('element' => $element)) : '';
+ return theme('fieldset', $fieldset_variables);
+ }
$output = '
' . "\n";
// If #title is not set, we don't display any label or required marker.
if (!isset($element['#title'])) {
$element['#title_display'] = 'none';
}
- $prefix = isset($element['#field_prefix']) ? '
' . $element['#field_prefix'] . ' ' : '';
- $suffix = isset($element['#field_suffix']) ? '
' . $element['#field_suffix'] . '' : '';
switch ($element['#title_display']) {
case 'before':
@@ -4764,32 +4782,14 @@
if (!empty($element['#attributes']['disabled'])) {
$attributes['class'][] = 'form-disabled';
}
- $prefix = isset($element['#field_prefix']) ? '
' . $element['#field_prefix'] . ' ' : '';
- $suffix = isset($element['#field_suffix']) ? '
' . $element['#field_suffix'] . '' : '';
-
- // Composite elements consist of more than one HTML form control. These must
- // be grouped by a fieldset.
- if (isset($element['#composite']) && $element['#composite'] === TRUE) {
- $fieldset_variables = array('element' => array());
- $fieldset_variables['element']['#children'] = $prefix . $element['#children'] . $suffix;
- foreach (array('#attributes', '#description', '#id', '#title', '#title_display') as $property) {
- if (empty($element[$property])) {
- $fieldset_variables['element'][$property] = NULL;
- }
- else {
- $fieldset_variables['element'][$property] = $element[$property];
- }
- }
- unset($fieldset_variables['element']['#attributes']['disabled']);
- $fieldset_variables['element']['#title'] .= !empty($element['#required']) ? ' ' . theme('form_required_marker', array('element' => $element)) : '';
- return theme('fieldset', $fieldset_variables);
- }
$output = '
' . "\n";
// If #title is not set, we don't display any label or required marker.
if (!isset($element['#title'])) {
$element['#title_display'] = 'none';
}
+ $prefix = isset($element['#field_prefix']) ? '' . $element['#field_prefix'] . ' ' : '';
+ $suffix = isset($element['#field_suffix']) ? ' ' . $element['#field_suffix'] . '' : '';
switch ($element['#title_display']) {
case 'before':
diff -u b/core/modules/system/system.module b/core/modules/system/system.module
--- b/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -2982,8 +2982,6 @@
$defaults = array(
'engine' => 'phptemplate',
'regions' => array(
- 'account' => 'Account links',
- 'main_menu' => 'Main navigation',
'sidebar_first' => 'Left sidebar',
'sidebar_second' => 'Right sidebar',
'content' => 'Content',
@@ -3003,6 +3001,8 @@
$defaults = array(
'engine' => 'phptemplate',
'regions' => array(
+ 'account' => 'Account links',
+ 'main_menu' => 'Main navigation',
'sidebar_first' => 'Left sidebar',
'sidebar_second' => 'Right sidebar',
'content' => 'Content',
only in patch2:
unchanged:
--- a/core/modules/system/system.theme.css
+++ b/core/modules/system/system.theme.css
@@ -8,7 +8,7 @@
* HTML elements.
*/
fieldset {
- border: 1px solid #ccc;
+ border: 0;
margin: 1em 0;
padding: 0.5em;
}
only in patch2:
unchanged:
--- a/core/themes/seven/style.css
+++ b/core/themes/seven/style.css
@@ -23,6 +23,8 @@ hr {
summary,
legend {
font-weight: bold;
+}
+summary {
text-transform: uppercase;
}
h1,