Merge branch 'release/4.8.1'

Author: dyve

HISTORY.rst

@@ -4,6 +4,18 @@ History
 -------
 
 
+4.8.1 (2014-07-10)
+++++++++++++++++++
+
+* Make extra classes override bootstrap defaults
+
+
+4.8.0 (2014-07-10)
+++++++++++++++++++
+
+* Introduced new setting `set_placeholder`, default True
+
+
 4.7.1 (2014-07-07)
 ++++++++++++++++++
 

bootstrap3/__init__.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '4.8.0'
+__version__ = '4.8.1'

bootstrap3/html.py

@@ -17,14 +17,16 @@ def split_css_classes(css_classes):
     return [c for c in classes_list if c]
 
 
-def add_css_class(css_classes, css_class):
+def add_css_class(css_classes, css_class, prepend=False):
     """
     Add a CSS class to a string of CSS classes
     """
     classes_list = split_css_classes(css_classes)
-    for c in split_css_classes(css_class):
-        if c not in classes_list:
-            classes_list.append(c)
+    classes_to_add = [c for c in split_css_classes(css_class) if c not in classes_list]
+    if prepend:
+        classes_list = classes_to_add + classes_list
+    else:
+        classes_list += classes_to_add
     return ' '.join(classes_list)
 
 

bootstrap3/renderers.py

@@ -203,7 +203,7 @@ def add_class_attrs(self):
                                         RadioSelect,
                                         CheckboxSelectMultiple,
                                         FileInput)):
-            classes = add_css_class(classes, 'form-control')
+            classes = add_css_class(classes, 'form-control', prepend=True)
             # For these widget types, add the size class here
             classes = add_css_class(classes, self.get_size_class())
         self.widget.attrs['class'] = classes

bootstrap3/tests.py

@@ -7,6 +7,8 @@
 
 from .exceptions import BootstrapError
 
+from .html import add_css_class
+
 
 RADIO_CHOICES = (
     ('1', 'Radio 1'),
@@ -304,3 +306,14 @@ def __str__(self):
     </div>
 """
         self.assertEqual(res.strip(), expected.strip())
+
+
+class HtmlTest(TestCase):
+    def test_add_css_class(self):
+        css_classes = "one two"
+        css_class = "three four"
+        classes = add_css_class(css_classes, css_class)
+        self.assertEqual(classes, "one two three four")
+
+        classes = add_css_class(css_classes, css_class, prepend=True)
+        self.assertEqual(classes, "three four one two")