Merge branch 'release/4.9.0'

Author: dyve

HISTORY.rst

@@ -4,6 +4,12 @@ History
 -------
 
 
+4.9.0 (2014-08-09)
+++++++++++++++++++
+
+* New parameter `href` for `bootstrap_button`, if provided will render `a` tag instead of `buttonz tag
+
+
 4.8.2 (2014-07-10)
 ++++++++++++++++++
 

bootstrap3/__init__.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '4.8.2'
+__version__ = '4.9.0'

bootstrap3/bootstrap.py

@@ -20,7 +20,7 @@
     'set_placeholder': True,
     'form_required_class': '',
     'form_error_class': '',
-    'formset_renderers':{
+    'formset_renderers': {
         'default': 'bootstrap3.renderers.FormsetRenderer',
     },
     'form_renderers': {

bootstrap3/forms.py

@@ -68,7 +68,7 @@ def render_label(content, label_for=None, label_class=None, label_title=''):
     return render_tag('label', attrs=attrs, content=content)
 
 
-def render_button(content, button_type=None, icon=None, button_class='', size=''):
+def render_button(content, button_type=None, icon=None, button_class='', size='', href=''):
     """
     Render a button with content
     """
@@ -88,12 +88,17 @@ def render_button(content, button_type=None, icon=None, button_class='', size=''
     if button_type:
         if button_type == 'submit':
             classes = add_css_class(classes, 'btn-primary')
-        elif button_type != 'reset' and button_type != 'button':
-            raise BootstrapError('Parameter "button_type" should be "submit", "reset", "button" or empty.')
+        elif not button_type in ('reset' 'button', 'link'):
+            raise BootstrapError('Parameter "button_type" should be "submit", "reset", "button", "link" or empty.')
         attrs['type'] = button_type
     attrs['class'] = classes
     icon_content = render_icon(icon) if icon else ''
-    return render_tag('button', attrs=attrs, content=text_concat(icon_content, content, separator=' '))
+    if href:
+        attrs['href'] = href
+        tag = 'a'
+    else:
+        tag = 'button'
+    return render_tag(tag, attrs=attrs, content=text_concat(icon_content, content, separator=' '))
 
 
 def render_field_and_label(field, label, field_class='', label_for=None, label_class='', layout='', **kwargs):

bootstrap3/html.py

@@ -43,7 +43,7 @@ def render_link_tag(url, rel='stylesheet', media='all'):
     """
     Build a link tag
     """
-    return render_tag('link', attrs = {'href': url, 'rel': rel, 'media': media}, close=False)
+    return render_tag('link', attrs={'href': url, 'rel': rel, 'media': media}, close=False)
 
 
 def render_tag(tag, attrs=None, content=None, close=True):

bootstrap3/renderers.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
+from django.contrib.auth.forms import ReadOnlyPasswordHashWidget
 
 from django.forms import (TextInput, DateInput, FileInput, CheckboxInput,
                           ClearableFileInput, Select, RadioSelect, CheckboxSelectMultiple)
@@ -94,7 +95,8 @@ def render_errors(self):
                 'errors': formset_errors,
                 'form': self.formset,
                 'layout': self.layout,
-            }))
+            })
+            )
         return ''
 
     def render(self):
@@ -111,6 +113,9 @@ def __init__(self, form, *args, **kwargs):
             raise BootstrapError('Parameter "form" should contain a valid Django Form.')
         self.form = form
         super(FormRenderer, self).__init__(*args, **kwargs)
+        # Handle form.empty_permitted
+        if self.form.empty_permitted:
+            self.set_required = False
 
     def render_fields(self):
         rendered_fields = []
@@ -193,16 +198,22 @@ def __init__(self, field, *args, **kwargs):
         else:
             self.form_required_class = getattr(field.form, 'required_css_class',
                                                get_bootstrap_setting('required_css_class'))
+        # Handle form.empty_permitted
+        if self.field.form.empty_permitted:
+            self.set_required = False
+            self.form_required_class = ''
 
     def restore_widget_attrs(self):
         self.widget.attrs = self.initial_attrs
 
     def add_class_attrs(self):
         classes = self.widget.attrs.get('class', '')
-        if not isinstance(self.widget, (CheckboxInput,
-                                        RadioSelect,
-                                        CheckboxSelectMultiple,
-                                        FileInput)):
+        if isinstance(self.widget, ReadOnlyPasswordHashWidget):
+            classes = add_css_class(classes, 'form-control-static', prepend=True)
+        elif not isinstance(self.widget, (CheckboxInput,
+                                          RadioSelect,
+                                          CheckboxSelectMultiple,
+                                          FileInput)):
             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())
@@ -350,8 +361,7 @@ def get_form_group_class(self):
             form_group_class = add_css_class(
                 form_group_class, self.form_error_class)
         if self.field.field.required and self.form_required_class:
-            form_group_class = add_css_class(
-                form_group_class, self.form_required_class)
+            form_group_class = add_css_class(form_group_class, self.form_required_class)
         if self.field_errors:
             form_group_class = add_css_class(form_group_class, 'has-error')
         elif self.field.form.is_bound:

bootstrap3/tests.py

@@ -4,6 +4,7 @@
 from django import forms
 from django.template import Template, Context
 from django.utils.unittest import TestCase
+from bootstrap3.text import text_value, text_concat
 
 from .exceptions import BootstrapError
 
@@ -229,6 +230,15 @@ def test_required_field(self):
         rendered = render_template('{% bootstrap_field ' + form_field + ' required_css_class="test-required" %}')
         self.assertIn('test-required', rendered)
 
+    def test_empty_permitted(self):
+        form = TestForm()
+        res = render_form_field('subject', form=form)
+        self.assertIn('required', res)
+        form.empty_permitted = True
+        res = render_form_field('subject', form=form)
+        self.assertNotIn('required', res)
+
+
     def test_input_group(self):
         res = render_template('{% bootstrap_field form.subject addon_before="$" addon_after=".00" %}')
         self.assertIn('class="input-group"', res)
@@ -308,7 +318,7 @@ def __str__(self):
         self.assertEqual(res.strip(), expected.strip())
 
 
-class HtmlTest(TestCase):
+class TextTest(TestCase):
     def test_add_css_class(self):
         css_classes = "one two"
         css_class = "three four"
@@ -317,3 +327,24 @@ def test_add_css_class(self):
 
         classes = add_css_class(css_classes, css_class, prepend=True)
         self.assertEqual(classes, "three four one two")
+
+
+class HtmlTest(TestCase):
+    def test_text_value(self):
+        self.assertEqual(text_value(''), "")
+        self.assertEqual(text_value(' '), " ")
+        self.assertEqual(text_value(None), "")
+        self.assertEqual(text_value(1), "1")
+
+    def test_text_concat(self):
+        self.assertEqual(text_concat(1, 2), "12")
+        self.assertEqual(text_concat(1, 2, separator='='), "1=2")
+        self.assertEqual(text_concat(None, 2, separator='='), "2")
+
+
+class ButtonTest(TestCase):
+    def test_button(self):
+        res = render_template("{% bootstrap_button 'button' size='lg' %}")
+        self.assertEqual(res.strip(), '<button class="btn btn-lg">button</button>')
+        res = render_template("{% bootstrap_button 'button' size='lg' href='#' %}")
+        self.assertEqual(res.strip(), '<a class="btn btn-lg" href="#">button</a>')

bootstrap3/text.py

@@ -22,8 +22,5 @@ def text_concat(*args, **kwargs):
     Concatenate several values as a text string with an optional separator
     """
     separator = text_value(kwargs.get('separator', ''))
-    skip_empty = kwargs.get('skip_empty', False)
-    values = [text_value(v) for v in args]
-    if skip_empty:
-        values = [v for v in values if v]
+    values = filter(None, [text_value(v) for v in args])
     return separator.join(values)