Added a text_attrs Param to PostlabeledInputField (please check the a…

…pplicable Genshi template for errors - I don't know if py:attrs erases other attributes). Also added PostlabeledCheckBox, which is just a double inheritance with a pass.

tw2/forms/__init__.py

@@ -2,7 +2,8 @@
 This package contains the basic form widgets.
 """
 
-from widgets import (Button, CheckBox, FieldSet, FileField, Form, HiddenField, ImageButton,
+from widgets import (Button, CheckBox, PostlabeledCheckBox,
+    FieldSet, FileField, Form, HiddenField, ImageButton,
     Label, Spacer, ListLayout, TableLayout, PasswordField,
     RadioButton, ResetButton, SubmitButton, TextField, TextArea,
     SingleSelectField, MultipleSelectField, RadioButtonList, CheckBoxList,

tw2/forms/templates/postlabeled_input_field.html

@@ -1 +1 @@
-<input xmlns:py="http://genshi.edgewall.org/" py:attrs="w.attrs"/> <label for='${w.compound_id}'>$w.text</label>
+<input xmlns:py="http://genshi.edgewall.org/" py:attrs="w.attrs"/> <label for='${w.compound_id}' py:attrs="w.text_attrs">$w.text</label>

tw2/forms/templates/postlabeled_input_field.mak

@@ -1,2 +1,2 @@
 <%namespace name="tw" module="tw2.core.mako_util"/>\
-<input ${tw.attrs(attrs=w.attrs)}/> <label for='${w.compound_id}'>${w.text}</label>
+<input ${tw.attrs(attrs=w.attrs)}/> <label for='${w.compound_id}' ${tw.attrs(attrs=w.text_attrs)}>${w.text}</label>

tw2/forms/widgets.py

@@ -15,7 +15,8 @@ class InputField(FormField):
 
 class PostlabeledInputField(InputField):
     """Inherits :class:`InputField`, but with a :attr:`text` label that follows the input field"""
-    text = twc.Param('Text to display after the field')
+    text = twc.Param('Text to display after the field.')
+    text_attrs = twc.Param('Dict of attributes to inject into the label.', default={})
     template = "tw2.forms.templates.postlabeled_input_field"
 
 
@@ -38,7 +39,9 @@ def prepare(self):
         self.safe_modify('attrs')
         self.attrs['checked'] = self.value and 'checked' or None
         self.value = None
-
+
+class PostlabeledCheckBox(CheckBox, PostlabeledInputField):
+    pass
 
 class RadioButton(InputField):
     type = "radio"