Consequent naming of css classes for error and required, fixes zostera#162

Author: dyve

bootstrap3/bootstrap.py

@@ -18,8 +18,8 @@
     'horizontal_field_class': 'col-md-4',
     'set_required': True,
     'set_placeholder': True,
-    'form_required_class': '',
-    'form_error_class': '',
+    'required_css_class': '',
+    'error_css_class': '',
     'formset_renderers': {
         'default': 'bootstrap3.renderers.FormsetRenderer',
     },

bootstrap3/renderers.py

@@ -202,18 +202,18 @@ def __init__(self, field, *args, **kwargs):
         error_css_class = kwargs.get('error_css_class', '')
         required_css_class = kwargs.get('required_css_class', '')
         if error_css_class:
-            self.form_error_class = error_css_class
+            self.error_css_class = error_css_class
         else:
-            self.form_error_class = getattr(field.form, 'error_css_class', get_bootstrap_setting('error_css_class'))
+            self.error_css_class = getattr(field.form, 'error_css_class', get_bootstrap_setting('error_css_class'))
         if required_css_class:
-            self.form_required_class = required_css_class
+            self.required_css_class = required_css_class
         else:
-            self.form_required_class = getattr(field.form, 'required_css_class',
+            self.required_css_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 = ''
+            self.required_css_class = ''
 
     def restore_widget_attrs(self):
         self.widget.attrs = self.initial_attrs
@@ -369,11 +369,11 @@ def add_label(self, html):
 
     def get_form_group_class(self):
         form_group_class = self.form_group_class
-        if self.field.errors and self.form_error_class:
+        if self.field.errors and self.error_css_class:
             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, self.error_css_class)
+        if self.field.field.required and self.required_css_class:
+            form_group_class = add_css_class(form_group_class, self.required_css_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

@@ -130,7 +130,7 @@ def test_settings(self):
         self.assertTrue(BOOTSTRAP3)
 
     def test_settings_filter(self):
-        res = render_template('{% load bootstrap3 %}{{ "form_required_class"|bootstrap_setting }}')
+        res = render_template('{% load bootstrap3 %}{{ "required_css_class"|bootstrap_setting }}')
         self.assertEqual(res.strip(), 'bootstrap3-req')
         res = render_template(
             '{% load bootstrap3 %}{% if "javascript_in_head"|bootstrap_setting %}head{% else %}body{% endif %}')

demo/demo/settings.py

@@ -163,7 +163,7 @@
 # Settings for django-bootstrap3
 BOOTSTRAP3 = {
     'set_required': False,
-    'form_error_class': 'bootstrap3-error',
-    'form_required_class': 'bootstrap3-required',
+    'error_css_class': 'bootstrap3-error',
+    'required_css_class': 'bootstrap3-required',
     'javascript_in_head': True,
 }

docs/settings.rst

@@ -48,10 +48,10 @@ The ``BOOTSTRAP3`` dict variable is contains these settings and defaults:
         'set_placeholder': True,
 
         # Class to indicate required (better to set this in your Django form)
-        'form_required_class': '',
+        'required_css_class': '',
 
         # Class to indicate error (better to set this in your Django form)
-        'form_error_class': '',
+        'error_css_class': '',
 
         # Renderers (only set these if you have studied the source and understand the inner workings)
         'formset_renderers':{

testsettings.py

@@ -11,7 +11,7 @@
 
 BOOTSTRAP3 = {
     'javascript_in_head': True,
-    'form_required_class': 'bootstrap3-req',
+    'required_css_class': 'bootstrap3-req',
 }
 
 SECRET_KEY = 'bootstrap3isawesome'