Added further cleanup (divio#133)

Author: FinalAngel

CHANGELOG.rst

@@ -23,6 +23,7 @@ Changelog
 * Added default CKEditor "styleSet" to load via djangocms-text-ckeditor in
   ``/static/aldryn_bootstrap3/js/ckeditor.js``
 * Added transifex integration for translations
+* Added ``ALDRYN_BOOTSTRAP3_GRID_SIZE`` to Divio Cloud settings
 * Set all max_values to 255
 * Fixed an issue where column offset, push and pull did not accept "0" as a value
 * Restructured code to reflect Bootstrap 3's documentation

README.rst

@@ -107,6 +107,11 @@ In addition you can set or extend your own icon fonts using ``ALDRYN_BOOTSTRAP3_
         ('icons', 'icon', 'Custom Icons'),
     ]
 
+The default grid size is set to **24** when validating the column input,
+you can override this by setting::
+
+    ALDRYN_BOOTSTRAP3_GRID_SIZE = 12
+
 
 Running Tests
 -------------

aldryn_bootstrap3/constants.py

@@ -7,8 +7,7 @@
 
 
 # Changable constants, overriden through settings
-GRID_SIZE = settings.ALDRYN_BOOTSTRAP3_GRID_SIZE
-
+GRID_SIZE = getattr(settings, 'ALDRYN_BOOTSTRAP3_GRID_SIZE', 24)
 
 # Fixed constants, not influenced by settings
 # Changes here will most likely require database migrtions

aldryn_bootstrap3/fields.py

@@ -8,9 +8,6 @@
 from . import widgets, constants
 
 
-# Please check `model_fields.py` for import reference
-
-
 class Context(django.forms.fields.ChoiceField):
     widget = widgets.Context
     CHOICES = constants.CONTEXT_CHOICES

aldryn_bootstrap3/migrations/0014_translations_update.py

@@ -5,6 +5,9 @@
 import djangocms_text_ckeditor.fields
 import filer.fields.file
 import django.db.models.deletion
+from aldryn_bootstrap3.models import Bootstrap3CarouselPlugin
+from aldryn_bootstrap3.model_fields import get_additional_styles
+
 
 class Migration(migrations.Migration):
 
@@ -78,4 +81,9 @@ class Migration(migrations.Migration):
             name='content',
             field=djangocms_text_ckeditor.fields.HTMLField(default='', help_text='Content may also be added using child plugins.', verbose_name='Content', blank=True),
         ),
+        migrations.AlterField(
+            model_name='bootstrap3carouselplugin',
+            name='style',
+            field=models.CharField(choices=Bootstrap3CarouselPlugin.STYLE_CHOICES + get_additional_styles(), default='standard', max_length=255, verbose_name='Style'),
+        ),
     ]

aldryn_bootstrap3/migrations/__init__.py

@@ -0,0 +1 @@
+# -*- coding: utf-8 -*-

aldryn_bootstrap3/model_fields.py

@@ -37,9 +37,12 @@ def get_additional_styles():
     if raw:
         if isinstance(raw, str):
             raw = raw.split(',')
-        for choice in raw:
-            clean = choice.strip()
-            choices.append((clean.lower(), clean.title()))
+            for choice in raw:
+                clean = choice.strip()
+                choices.append((clean.lower(), clean.title()))
+        else:
+            for choice in raw:
+                choices.append(choice)
     return choices
 
 

aldryn_bootstrap3/static/aldryn_bootstrap3/fonts/FontAwesome.otf

@@ -7,9 +7,6 @@
 from .conf import settings
 
 
-# Please check `fields.py` for import reference
-
-
 class ContextRenderer(django.forms.widgets.RadioFieldRenderer):
     def render(self):
         from django.template.loader import render_to_string

aldryn_bootstrap3/widgets.py

@@ -7,6 +7,10 @@ def split_and_strip(string):
 
 
 class Form(forms.BaseForm):
+    grid_size = forms.NumberField(
+        'Maximum columns to support',
+        required=False
+    )
     enable_glyphicons = forms.CheckboxField(
         'Enable Glyphicons',
         required=False,
@@ -38,6 +42,8 @@ def clean(self):
 
     def to_settings(self, data, settings):
         choices = []
+        if data['grid_size']:
+            settings['ALDRYN_BOOTSTRAP3_GRID_SIZE'] = int(data['grid_size'])
         if data['enable_glyphicons']:
             choices.append(
                 ('glyphicons', 'glyphicons', 'Glyphicons')