Merge branch 'release/4.3.0'

Author: dyve

HISTORY.rst

@@ -3,6 +3,12 @@
 History
 -------
 
+4.3.0 (2014-04-25)
+++++++++++++++++++
+
+* added `required_css_class` and `error_css_class` as optional settings (global) and parameters (form and field rendering)
+
+
 4.2.0 (2014-04-06)
 ++++++++++++++++++
 

bootstrap3/__init__.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '4.2.0'
+__version__ = '4.3.0'

bootstrap3/bootstrap.py

@@ -16,6 +16,8 @@
     'horizontal_label_class': 'col-md-2',
     'horizontal_field_class': 'col-md-4',
     'set_required': True,
+    'form_required_class': '',
+    'form_error_class': '',
     'form_renderers': {
         'default': 'bootstrap3.renderers.FormRenderer',
     },

bootstrap3/forms.py

@@ -55,22 +55,23 @@ 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):
+def render_button(content, button_type=None, icon=None, button_class=''):
     """
     Render a button with content
     """
-    attrs = {'class': 'btn'}
+    attrs = {}
+    attrs['class'] = add_css_class('btn', button_class)
     if button_type:
         if button_type == 'submit':
-            attrs['class'] += ' btn-primary'
+            attrs['class'] = add_css_class(attrs['class'], 'btn-primary')
         elif button_type != 'reset' and button_type != 'button':
             raise BootstrapError('Parameter "button_type" should be "submit", "reset", "button" or empty.')
         attrs['type'] = button_type
     icon_content = render_icon(icon) if icon else ''
     return render_tag('button', attrs=attrs, content=text_concat(icon_content, content, separator=' '))
 
 
-def render_field_and_label(field, label, field_class='', label_class='', layout='', **kwargs):
+def render_field_and_label(field, label, field_class='', label_for=None, label_class='', layout='', **kwargs):
     """
     Render a field with its label
     """
@@ -86,7 +87,7 @@ def render_field_and_label(field, label, field_class='', label_class='', layout=
     if field_class:
         html = '<div class="{klass}">{html}</div>'.format(klass=field_class, html=html)
     if label:
-        html = render_label(label, label_class=label_class) + html
+        html = render_label(label, label_for=label_for, label_class=label_class) + html
     return html
 
 

bootstrap3/renderers.py

@@ -83,7 +83,8 @@ class FieldRenderer(object):
     def __init__(self, field, layout='', form_group_class=FORM_GROUP_CLASS,
                  field_class=None, label_class=None, show_label=True,
                  show_help=True, exclude='', set_required=True,
-                 addon_before=None, addon_after=None):
+                 addon_before=None, addon_after=None,
+                 error_css_class='', required_css_class=''):
         # Only allow BoundField
         if not isinstance(field, BoundField):
             raise BootstrapError('Parameter "field" should contain a valid Django BoundField.')
@@ -101,11 +102,19 @@ def __init__(self, field, layout='', form_group_class=FORM_GROUP_CLASS,
         self.field_help = text_value(mark_safe(field.help_text)) if show_help and field.help_text else ''
         self.field_errors = [conditional_escape(text_value(error)) for error in field.errors]
         self.placeholder = field.label
-        self.form_error_class = getattr(field.form, 'error_css_class', '')
-        self.form_required_class = getattr(field.form, 'required_css_class', '')
         self.addon_before = addon_before
         self.addon_after = addon_after
 
+        # These are set in Django or in the global BOOTSTRAP3 settings, and they can be overwritten in the template
+        if error_css_class:
+            self.form_error_class = error_css_class
+        else:
+            self.form_error_class = getattr(field.form, 'error_css_class', get_bootstrap_setting('error_css_class'))
+        if required_css_class:
+            self.form_required_class = required_css_class
+        else:
+            self.form_required_class = getattr(field.form, 'required_css_class',  get_bootstrap_setting('required_css_class'))
+
     def restore_widget_attrs(self):
         self.widget.attrs = self.initial_attrs
 
@@ -151,7 +160,7 @@ def list_to_class(self, html, klass):
 
     def put_inside_label(self, html):
         content = '{field} {label}'.format(field=html, label=self.field.label)
-        return render_label(content=content, label_title=strip_tags(self.field_help))
+        return render_label(content=content, label_for=self.field.id_for_label, label_title=strip_tags(self.field_help))
 
     def fix_date_select_input(self, html):
         div1 = '<div class="col-xs-4">'
@@ -248,7 +257,7 @@ def get_label(self):
     def add_label(self, html):
         label = self.get_label()
         if label:
-            html = render_label(label, label_class=self.get_label_class()) + html
+            html = render_label(label, label_for=self.field.id_for_label, label_class=self.get_label_class()) + html
         return html
 
     def get_form_group_class(self):

bootstrap3/templatetags/bootstrap3.py

@@ -518,7 +518,7 @@ def get_pagination_context(page, pages_to_show=11,
         url += force_text(extra) + '&'
     if url:
         url = url.replace('?&', '?')
-    # Set CSS classes,see twitter.github.io/bootstrap/components.html#pagination
+    # Set CSS classes, see http://getbootstrap.com/components/#pagination
     pagination_css_classes = ['pagination']
     if size == 'small':
         pagination_css_classes.append('pagination-sm')

bootstrap3/tests.py

@@ -73,6 +73,10 @@ def clean(self):
         return cleaned_data
 
 
+class TestFormWithoutRequiredClass(TestForm):
+    required_css_class = ''
+
+
 def render_template(text, **context_args):
     """
     Create a template ``text`` that first loads bootstrap3.
@@ -211,6 +215,10 @@ def test_required_field(self):
         form_field = 'form.subject'
         rendered = render_template('{% bootstrap_field ' + form_field + ' set_required=0 %}')
         self.assertNotIn('required', rendered)
+        # Required settings in field
+        form_field = 'form.subject'
+        rendered = render_template('{% bootstrap_field ' + form_field + ' required_css_class="test-required" %}')
+        self.assertIn('test-required', rendered)
 
     def test_input_group(self):
         res = render_template('{% bootstrap_field form.subject addon_before="$" addon_after=".00" %}')

demo/demo/settings.py

@@ -163,4 +163,6 @@
 # Settings for django-bootstrap3
 BOOTSTRAP3 = {
     'set_required': False,
+    'form_error_class': 'bootstrap3-error',
+    'form_required_class': 'bootstrap3-required',
 }

demo/demo/templates/demo/base.html

@@ -15,6 +15,7 @@ <h1>{% block title %}(no title){% endblock %}</h1>
             <a href="{% url 'form_inline' %}">form_inline</a>
             <a href="{% url 'form_with_files' %}">form_with_files</a>
             <a href="{% url 'pagination' %}">pagination</a>
+            <a href="{% url 'misc' %}">miscellaneous</a>
         </p>
 
         {% bootstrap_messages %}

demo/demo/templates/demo/misc.html

@@ -0,0 +1,13 @@
+{% extends 'demo/base.html' %}
+
+{% load bootstrap3 %}
+
+{% block title %}
+    Miscellaneous
+{% endblock %}
+
+{% block content %}
+
+    {% bootstrap_button 'button' %}
+
+{% endblock %}

demo/demo/urls.py

@@ -4,7 +4,7 @@
 from django.conf.urls import patterns, url
 
 from .views import HomePageView, FormHorizontalView, FormInlineView, PaginationView, FormWithFilesView, \
-    DefaultFormView
+    DefaultFormView, MiscView
 
 # Uncomment the next two lines to enable the admin:
 # from django.contrib import admin
@@ -27,6 +27,7 @@
     url(r'^form$', DefaultFormView.as_view(), name='form_default'),
     url(r'^form_horizontal$', FormHorizontalView.as_view(), name='form_horizontal'),
     url(r'^form_inline$', FormInlineView.as_view(), name='form_inline'),
-    url(r'^pagination$', PaginationView.as_view(), name='pagination'),
     url(r'^form_with_files$', FormWithFilesView.as_view(), name='form_with_files'),
+    url(r'^pagination$', PaginationView.as_view(), name='pagination'),
+    url(r'^misc$', MiscView.as_view(), name='misc'),
 )

demo/demo/views.py

@@ -77,3 +77,8 @@ def get_context_data(self, **kwargs):
             show_lines = paginator.page(paginator.num_pages)
         context['lines'] = show_lines
         return context
+
+
+class MiscView(TemplateView):
+    template_name = 'demo/misc.html'
+