Merge branch 'release/4.6.0'

Author: dyve

HISTORY.rst

@@ -3,6 +3,13 @@
 History
 -------
 
+
+4.6.0 (2014-05-22)
+++++++++++++++++++
+
+* new bootstrap_formset_errors tag
+
+
 4.5.0 (2014-05-21)
 ++++++++++++++++++
 

bootstrap3/__init__.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '4.5.0'
+__version__ = '4.6.0'

bootstrap3/forms.py

@@ -27,6 +27,14 @@ def render_formset(formset, layout='', **kwargs):
     return renderer_cls(formset, layout, **kwargs).render()
 
 
+def render_formset_errors(form, layout='', **kwargs):
+    """
+    Render formset errors to a Bootstrap layout
+    """
+    renderer_cls = get_formset_renderer(layout)
+    return renderer_cls(form, layout, **kwargs).render_errors()
+
+
 def render_form(form, layout='', **kwargs):
     """
     Render a formset to a Bootstrap layout

bootstrap3/renderers.py

@@ -12,7 +12,7 @@
 from django.utils.safestring import mark_safe
 
 from .bootstrap import get_bootstrap_setting
-from bootstrap3.text import text_value
+from .text import text_value
 from .exceptions import BootstrapError
 from .html import add_css_class
 from .forms import (render_form, render_field, render_label, render_form_group,

bootstrap3/templatetags/bootstrap3.py

@@ -11,7 +11,7 @@
 from ..bootstrap import css_url, javascript_url, jquery_url, theme_url, get_bootstrap_setting
 from ..html import render_link_tag
 from ..forms import render_button, render_field, render_field_and_label, render_form, render_form_group, render_formset, \
-    render_label, render_form_errors
+    render_label, render_form_errors, render_formset_errors
 from ..components import render_icon, render_alert
 from ..templates import handle_var, parse_token_contents
 from ..text import force_text
@@ -222,6 +222,31 @@ def bootstrap_formset(*args, **kwargs):
     return render_formset(*args, **kwargs)
 
 
+@register.simple_tag
+def bootstrap_formset_errors(*args, **kwargs):
+    """
+    Render form errors
+
+    **Tag name**::
+
+        bootstrap_form_errors
+
+    **Parameters**:
+
+        :args:
+        :kwargs:
+
+    **usage**::
+
+        {% bootstrap_form_errors form %}
+
+    **example**::
+
+        {% bootstrap_form_errors form layout='inline' %}
+    """
+    return render_formset_errors(*args, **kwargs)
+
+
 @register.simple_tag
 def bootstrap_form(*args, **kwargs):
     """

demo/demo/templates/demo/formset.html

@@ -7,7 +7,7 @@
 {% endblock %}
 
 {% block content %}
-
+    {% bootstrap_formset_errors form %}
     <form role="form" method="post">
         {% csrf_token %}
         {{ form.management_form }}

docs/quickstart.rst

@@ -23,3 +23,12 @@ Settings
 --------
 
 You can set defaults for ``django-bootstrap3`` in your settings file. Refer to :doc:`settings` for more information.
+
+
+Demo application
+----------------
+
+The demo application provides a number of useful examples.
+
+https://github.com/dyve/django-bootstrap3/tree/develop/demo
+

docs/templatetags.rst

@@ -17,12 +17,24 @@ bootstrap_form
 .. autofunction:: bootstrap3.templatetags.bootstrap3.bootstrap_form
 
 
+bootstrap_form_errors
+~~~~~~~~~~~~~~~~~~~~~
+
+.. autofunction:: bootstrap3.templatetags.bootstrap3.bootstrap_form_errors
+
+
 bootstrap_formset
 ~~~~~~~~~~~~~~~~~
 
 .. autofunction:: bootstrap3.templatetags.bootstrap3.bootstrap_formset
 
 
+bootstrap_formset_errors
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. autofunction:: bootstrap3.templatetags.bootstrap3.bootstrap_formset_errors
+
+
 bootstrap_field
 ~~~~~~~~~~~~~~~