From a49654afd927cf753d5f338fac34b8e1c621dd87 Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Wed, 28 Nov 2012 11:57:45 +0000
Subject: [PATCH] Issue #882666 by mgifford, andrewmacpherson, sun: Fixed Core
form descriptions shouldn't use a label when not associated with a form.
---
core/modules/field/field.form.inc | 2 +-
core/modules/filter/filter.module | 2 +-
core/modules/language/language.admin.inc | 2 +-
core/modules/system/system.theme.css | 6 ++++++
4 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/core/modules/field/field.form.inc b/core/modules/field/field.form.inc
index 583072576b92..483c2131f844 100644
--- a/core/modules/field/field.form.inc
+++ b/core/modules/field/field.form.inc
@@ -29,7 +29,7 @@ function theme_field_multiple_value_form($variables) {
$header = array(
array(
- 'data' => '<label>' . t('!title !required', array('!title' => $element['#title'], '!required' => $required)) . "</label>",
+ 'data' => '<h4 class="label">' . t('!title !required', array('!title' => $element['#title'], '!required' => $required)) . "</h4>",
'colspan' => 2,
'class' => array('field-label'),
),
diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module
index 947686069e4e..859cae44f802 100644
--- a/core/modules/filter/filter.module
+++ b/core/modules/filter/filter.module
@@ -1284,7 +1284,7 @@ function theme_filter_guidelines($variables) {
$attributes['class'][] = 'filter-guidelines-item';
$attributes['class'][] = 'filter-guidelines-' . $format->format;
$output = '<div' . new Attribute($attributes) . '>';
- $output .= '<h3>' . check_plain($format->name) . '</h3>';
+ $output .= '<h4 class="label">' . check_plain($format->name) . '</h4>';
$output .= theme('filter_tips', array('tips' => _filter_tips($format->format, FALSE)));
$output .= '</div>';
return $output;
diff --git a/core/modules/language/language.admin.inc b/core/modules/language/language.admin.inc
index 4cdcf51d0a30..1872146bba9c 100644
--- a/core/modules/language/language.admin.inc
+++ b/core/modules/language/language.admin.inc
@@ -548,7 +548,7 @@ function theme_language_negotiation_configure_form($variables) {
foreach ($form['#language_types'] as $type) {
$rows = array();
- $title = '<label>' . $form[$type]['#title'] . '</label>';
+ $title = '<h4 class="label">' . $form[$type]['#title'] . '</h4>';
$description = '<div class="description">' . $form[$type]['#description'] . '</div>';
foreach ($form[$type]['title'] as $id => $element) {
diff --git a/core/modules/system/system.theme.css b/core/modules/system/system.theme.css
index 770fa1ab82e8..0bbeaf64101d 100644
--- a/core/modules/system/system.theme.css
+++ b/core/modules/system/system.theme.css
@@ -102,6 +102,12 @@ label.option {
display: inline;
font-weight: normal;
}
+h4.label {
+ font-size: inherit;
+ font-weight: bold;
+ margin: 0;
+ padding: 0;
+}
.form-checkboxes .form-item,
.form-radios .form-item {
margin-top: 0.4em;
--
GitLab