Merge branch 'release/4.8.0'

Author: dyve

bootstrap3/__init__.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '4.7.1'
+__version__ = '4.8.0'

bootstrap3/bootstrap.py

@@ -17,6 +17,7 @@
     'horizontal_label_class': 'col-md-2',
     'horizontal_field_class': 'col-md-4',
     'set_required': True,
+    'set_placeholder': True,
     'form_required_class': '',
     'form_error_class': '',
     'formset_renderers':{

bootstrap3/renderers.py

@@ -173,7 +173,10 @@ def __init__(self, field, *args, **kwargs):
         self.field_help = text_value(mark_safe(field.help_text)) if self.show_help and field.help_text else ''
         self.field_errors = [conditional_escape(text_value(error)) for error in field.errors]
 
-        self.placeholder = field.label
+        if get_bootstrap_setting('set_placeholder'):
+            self.placeholder = field.label
+        else:
+            self.placeholder = ''
 
         self.addon_before = kwargs.get('addon_before', '')
         self.addon_after = kwargs.get('addon_after', '')

bootstrap3/tests.py

@@ -124,7 +124,6 @@ def render_field(field, **context_args):
 class SettingsTest(TestCase):
     def test_settings(self):
         from .bootstrap import BOOTSTRAP3
-
         self.assertTrue(BOOTSTRAP3)
 
     def test_settings_filter(self):

docs/installation.rst

@@ -14,4 +14,8 @@ In your project, you should add ``django-bootstrap3`` to your ``requirements.txt
 
 Be sure to use ``virtualenv`` if you develop python projects.
 
+Add to INSTALLED_APPS in your ``settings.py``:
+
+   ``'bootstrap3',``
+
 After installation, the :doc:`quickstart` will get you on your way to using ``django-bootstrap3``.