Ticket #6270: label_attrs.diff

django/newforms/fields.py

@@ -50 +50 @@
     creation_counter = 0
 
     def __init__(self, required=True, widget=None, label=None, initial=None,
-                 help_text=None, error_messages=None):
+                 help_text=None, error_messages=None, label_attrs=None):
         # required -- Boolean that specifies whether the field is required.
         #             True by default.
         # widget -- A Widget class, or instance of a Widget class, that should
@@ -64 +64 @@
         # initial -- A value to use in this Field's initial display. This value
         #            is *not* used as a fallback if data isn't given.
         # help_text -- An optional string to use as "help text" for this Field.
+        # label_attrs -- An optional dictionary to use as attributes for the 
+        #                label html tag.
         if label is not None:
             label = smart_unicode(label)
-        self.required, self.label, self.initial = required, label, initial
+        self.required, self.initial = required, initial
+        self.label, self.label_attrs = label, label_attrs
         self.help_text = smart_unicode(help_text or '')
         widget = widget or self.widget
         if isinstance(widget, type):

django/newforms/forms.py

@@ -124 +124 @@
                     if self.label_suffix:
                         if label[-1] not in ':?.!':
                             label += self.label_suffix
-                    label = bf.label_tag(label) or ''
+                    label = bf.label_tag(label, bf.label_attrs) or ''
                 else:
                     label = ''
                 if field.help_text:
@@ -238 +238 @@
         else:
             self.label = self.field.label
         self.help_text = field.help_text or ''
+        self.label_attrs = self.field.label_attrs
 
     def __unicode__(self):
         """Renders this field as an HTML widget."""

docs/newforms.txt

@@ -1128 +1128 @@
 In the `built-in Field classes`_ section below, each ``Field`` defines the
 error message keys it uses.
 
+``label_attrs``
+~~~~~~~~~~~~~~~~~~
+
+**New in Django development version**
+
+The ``label_attrs`` argument lets you define the extra arguments that the
+label tag will contain. Pass in a dictionary with keys matching the attribute
+you want to define. For example, here is a way to define the label's class::
+
+    >>> generic = forms.CharField(label_attrs={'class': 'large_label'})
+
+And here is the output::
+
+    <label for="id_generic" class="large_label">Generic:</label>
+
 Dynamic initial values
 ----------------------