Small fixes for Django 1.7, also cosmetic changes and typo fixes

Author: dyve

bootstrap3/renderers.py

@@ -53,7 +53,7 @@ def parse_size(self, size):
             return 'large'
         if size in ('md', 'medium', ''):
             return 'medium'
-        raise BootstrapError('Invalid value "%s" for parameter "size".' % size)
+        raise BootstrapError('Invalid value "%s" for parameter "size" (expected "sm", "md", "lg" or "").' % size)
 
     def get_size_class(self, prefix='input'):
         if self.size == 'small':

bootstrap3/tests.py

@@ -2,14 +2,13 @@
 from __future__ import unicode_literals
 
 import re
+from unittest import TestCase
 
 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 .text import text_value, text_concat
 from .exceptions import BootstrapError
-
 from .html import add_css_class
 
 

demo/demo/settings.py

@@ -4,18 +4,17 @@
 import os
 import sys
 
-PROJECT_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
+BASE_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
 
 # Include BOOTSTRAP3_FOLDER in path
-BOOTSTRAP3_FOLDER = os.path.abspath(os.path.join(PROJECT_ROOT, '..', 'bootstrap3'))
+BOOTSTRAP3_FOLDER = os.path.abspath(os.path.join(BASE_DIR, '..', 'bootstrap3'))
 if BOOTSTRAP3_FOLDER not in sys.path:
     sys.path.insert(0, BOOTSTRAP3_FOLDER)
 
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 
 ADMINS = ()
-MANAGERS = ADMINS
 
 DATABASES = {
     'default': {
@@ -38,8 +37,6 @@
 # http://www.i18nguy.com/unicode/language-identifiers.html
 LANGUAGE_CODE = 'en-us'
 
-SITE_ID = 1
-
 # If you set this to False, Django will make some optimizations so as not
 # to load the internationalization machinery.
 USE_I18N = True
@@ -82,27 +79,19 @@
 STATICFILES_FINDERS = (
     'django.contrib.staticfiles.finders.FileSystemFinder',
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
-#    'django.contrib.staticfiles.finders.DefaultStorageFinder',
+    # 'django.contrib.staticfiles.finders.DefaultStorageFinder',
 )
 
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = '8s)l4^2s&&0*31-)+6lethmfy3#r1egh^6y^=b9@g!q63r649_'
 
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.Loader',
-    'django.template.loaders.app_directories.Loader',
-#     'django.template.loaders.eggs.Loader',
-)
-
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
-    # Uncomment the next line for simple clickjacking protection:
-    # 'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    'django.middleware.clickjacking.XFrameOptionsMiddleware',
 )
 
 ROOT_URLCONF = 'demo.urls'

demo/demo/templates/demo/form_by_field.html

@@ -11,7 +11,7 @@
     <form role="form" method="post">
         {% csrf_token %}
         {% bootstrap_form_errors form type='non_fields' %}
-        {% bootstrap_field form.subject layout='horizontal' %}
+        {% bootstrap_field form.subject layout='horizontal' size='sm' %}
         {% buttons submit='OK' reset="Cancel" %}{% endbuttons %}
     </form>
 

docs/settings.rst

@@ -38,7 +38,7 @@ The ``BOOTSTRAP3`` dict variable is contains these settings and defaults:
         # Label class to use in horizontal forms
         'horizontal_label_class': 'col-md-2',
 
-        # Field class to use in horiozntal forms
+        # Field class to use in horizontal forms
         'horizontal_field_class': 'col-md-4',
 
         # Set HTML required attribute on required fields

testsettings.py

@@ -3,7 +3,6 @@
 
 SECRET_KEY = 'bootstrap3isawesome'
 
-
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',