Merge branch 'release/4.9.2'

Author: dyve

HISTORY.rst

@@ -4,6 +4,12 @@ History
 -------
 
 
+4.9.2 (2014-08-11)
+++++++++++++++++++
+
+* Fixed bug causing problems with setting classes for horizontal forms
+
+
 4.9.1 (2014-08-10)
 ++++++++++++++++++
 

bootstrap3/__init__.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '4.9.1'
+__version__ = '4.9.2'

bootstrap3/forms.py

@@ -84,12 +84,12 @@ def render_button(content, button_type=None, icon=None, button_class='', size=''
     elif size == 'md' or size == 'medium':
         pass
     elif size:
-        raise BootstrapError('Parameter "size" should be "xs", "sm", "lg" or empty.')
+        raise BootstrapError('Parameter "size" should be "xs", "sm", "lg" or empty ("{}" given).'.format(size))
     if button_type:
         if button_type == 'submit':
             classes = add_css_class(classes, 'btn-primary')
-        elif not button_type in ('reset' 'button', 'link'):
-            raise BootstrapError('Parameter "button_type" should be "submit", "reset", "button", "link" or empty.')
+        elif button_type not in ('reset', 'button', 'link'):
+            raise BootstrapError('Parameter "button_type" should be "submit", "reset", "button", "link" or empty  ("{}" given).'.format(button_type))
         attrs['type'] = button_type
     attrs['class'] = classes
     icon_content = render_icon(icon) if icon else ''

bootstrap3/renderers.py

@@ -31,6 +31,14 @@ def __init__(self, *args, **kwargs):
         self.exclude = kwargs.get('exclude', '')
         self.set_required = kwargs.get('set_required', True)
         self.size = self.parse_size(kwargs.get('size', ''))
+        self.horizontal_label_class = kwargs.get(
+            'horizontal_label_class',
+            get_bootstrap_setting('horizontal_label_class')
+        )
+        self.horizontal_field_class = kwargs.get(
+            'horizontal_field_class',
+            get_bootstrap_setting('horizontal_field_class')
+        )
 
     def parse_size(self, size):
         size = text_value(size).lower().strip()
@@ -81,6 +89,8 @@ def render_forms(self):
                 exclude=self.exclude,
                 set_required=self.set_required,
                 size=self.size,
+                horizontal_label_class=self.horizontal_label_class,
+                horizontal_field_class=self.horizontal_field_class,
             ))
         return '\n'.join(rendered_forms)
 
@@ -130,6 +140,8 @@ def render_fields(self):
                 exclude=self.exclude,
                 set_required=self.set_required,
                 size=self.size,
+                horizontal_label_class=self.horizontal_label_class,
+                horizontal_field_class=self.horizontal_field_class,
             ))
         return '\n'.join(rendered_fields)
 
@@ -322,7 +334,7 @@ def append_to_field(self, html):
     def get_field_class(self):
         field_class = self.field_class
         if not field_class and self.layout == 'horizontal':
-            field_class = get_bootstrap_setting('horizontal_field_class')
+            field_class = self.horizontal_field_class
         return field_class
 
     def wrap_field(self, html):
@@ -334,7 +346,7 @@ def wrap_field(self, html):
     def get_label_class(self):
         label_class = self.label_class
         if not label_class and self.layout == 'horizontal':
-            label_class = get_bootstrap_setting('horizontal_label_class')
+            label_class = self.horizontal_label_class
         label_class = text_value(label_class)
         if not self.show_label:
             label_class = add_css_class(label_class, 'sr-only')

bootstrap3/tests.py

@@ -190,6 +190,9 @@ def test_layout_horizontal(self):
         res = render_template('{% bootstrap_form form layout="horizontal" %}', form=form)
         self.assertIn('col-md-2', res)
         self.assertIn('col-md-4', res)
+        res = render_template('{% bootstrap_form form layout="horizontal" horizontal_label_class="hlabel" horizontal_field_class="hfield" %}', form=form)
+        self.assertIn('hlabel', res)
+        self.assertIn('hfield', res)
 
     def test_buttons_tag(self):
         form = TestForm()