Improvements and small changes to button rendering

Author: dyve

HISTORY.rst

@@ -8,12 +8,13 @@ Develop
 
 * **BREAKING** Remove everything to do with setting HTML `required` attribute (#337)
 * **BREAKING** Remove everything to do with setting HTML `disabled` attribute (#345)
-* Several improvements to documentation, tests, and comments. Thanks all!
+* Default button type to btn-default
 * Add addon_before_class and addon_after_class (#295, thanks @DanWright91 and others)
 * Fix handling of error class (#170)
 * No size class for checkboxes (#318, thanks @cybojenix)
 * Fix warnings during install (thanks @mfcovington)
 * Add subresource integrity to external components (thanks @mfcovington and @Alex131089)
+* Several improvements to documentation, tests, and comments. Thanks all!
 
 
 7.1.0 (2016-09-16)

bootstrap3/components.py

@@ -3,7 +3,7 @@
 
 from django.forms.widgets import flatatt
 from django.utils.safestring import mark_safe
-from bootstrap3.utils import render_tag
+from bootstrap3.utils import render_tag, add_css_class
 
 from .text import text_value
 
@@ -12,15 +12,15 @@ def render_icon(icon, **kwargs):
     """
     Render a Bootstrap glyphicon icon
     """
-    classes = ['glyphicon glyphicon-{icon}'.format(icon=icon)]
-    if kwargs.get('add_class'):
-        classes.append(kwargs.get('add_class'))
     attrs = {
-        'class': ' '.join(classes),
+        'class': add_css_class(
+            'glyphicon glyphicon-{icon}'.format(icon=icon),
+            kwargs.get('extra_classes', ''),
+        )
     }
-    if kwargs.get('title'):
-        attrs['title'] = kwargs.get('title')
-
+    title = kwargs.get('title')
+    if title:
+        attrs['title'] = title
     return render_tag('span', attrs=attrs)
 
 

bootstrap3/forms.py

@@ -13,11 +13,10 @@
     get_bootstrap_setting, get_form_renderer, get_field_renderer,
     get_formset_renderer
 )
-from .text import text_concat, text_value
-from .exceptions import BootstrapError
-from .utils import add_css_class, render_tag, split_css_classes
 from .components import render_icon
-
+from .exceptions import BootstrapError
+from .text import text_concat, text_value
+from .utils import add_css_class, render_tag
 
 FORM_GROUP_CLASS = 'form-group'
 
@@ -77,8 +76,8 @@ def render_label(content, label_for=None, label_class=None, label_title=''):
 
 
 def render_button(
-        content, button_type=None, icon=None, button_class='', size='',
-        href='', name=None, value=None, title=None):
+        content, button_type=None, icon=None, button_class='btn-default', size='',
+        href='', name=None, value=None, title=None, extra_classes=''):
     """
     Render a button with content
     """
@@ -98,14 +97,12 @@ def render_button(
             'Parameter "size" should be "xs", "sm", "lg" or ' +
             'empty ("{}" given).'.format(size))
     if button_type:
-        if button_type == 'submit':
-            if not any([c.startswith('btn-') for c in split_css_classes(classes)]):
-                classes = add_css_class(classes, 'btn-primary')
-        elif button_type not in ('reset', 'button', 'link'):
+        if button_type not in ('submit', 'reset', 'button', 'link'):
             raise BootstrapError(
                 'Parameter "button_type" should be "submit", "reset", ' +
                 '"button", "link" or empty  ("{}" given).'.format(button_type))
         attrs['type'] = button_type
+    classes = add_css_class(classes, extra_classes)
     attrs['class'] = classes
     icon_content = render_icon(icon) if icon else ''
     if href:
@@ -168,8 +165,8 @@ def is_widget_required_attribute(widget):
         return False
     if isinstance(
             widget, (
-                AdminFileWidget, HiddenInput, FileInput,
-                CheckboxInput, CheckboxSelectMultiple)):
+                    AdminFileWidget, HiddenInput, FileInput,
+                    CheckboxInput, CheckboxSelectMultiple)):
         return False
     return True
 

bootstrap3/templatetags/bootstrap3.py

@@ -558,6 +558,9 @@ def bootstrap_button(*args, **kwargs):
             Name of an icon to render in the button's visible content. See bootstrap_icon_ for acceptable values.
 
         button_class
+            The class of button to use. If none is given, btn-default will be used.
+
+        extra_classes
             Any extra CSS classes that should be added to the button.
 
         size
@@ -608,6 +611,12 @@ def bootstrap_icon(icon, **kwargs):
         icon
             Icon name. See the `Bootstrap docs <http://getbootstrap.com/components/#glyphicons>`_ for all icons.
 
+        extra_classes
+            Extra CSS classes to add to the icon HTML
+
+        title
+            A title for the icon (HTML title attrivute)
+
     **Usage**::
 
         {% bootstrap_icon icon %}

bootstrap3/tests.py

@@ -628,11 +628,11 @@ class ButtonTest(TestCase):
     def test_button(self):
         res = render_template_with_form("{% bootstrap_button 'button' size='lg' %}")
         self.assertEqual(
-            res.strip(), '<button class="btn btn-lg">button</button>')
+            res.strip(), '<button class="btn btn-default btn-lg">button</button>')
         res = render_template_with_form("{% bootstrap_button 'button' size='lg' href='#' %}")
         self.assertIn(
             res.strip(),
-            '<a class="btn btn-lg" href="#">button</a><a href="#" ' +
+            '<a class="btn btn-default btn-lg" href="#">button</a><a href="#" ' +
             'class="btn btn-lg">button</a>')
 
 
@@ -660,5 +660,19 @@ def test_button_with_icon(self):
         )
         self.assertEqual(
             res.strip(),
-            '<button class="btn"><span class="glyphicon glyphicon-info-sign"></span> test</button>'
+            '<button class="btn btn-default"><span class="glyphicon glyphicon-info-sign"></span> test</button>'
+        )
+        res = render_template_with_form(
+            "{% bootstrap_button 'test' icon='info-sign' button_class='btn-primary' %}"
+        )
+        self.assertEqual(
+            res.strip(),
+            '<button class="btn btn-primary"><span class="glyphicon glyphicon-info-sign"></span> test</button>'
+        )
+        res = render_template_with_form(
+            "{% bootstrap_button 'test' icon='info-sign' button_type='submit' %}"
+        )
+        self.assertEqual(
+            res.strip(),
+            '<button class="btn btn-default" type="submit"><span class="glyphicon glyphicon-info-sign"></span> test</button>'
         )