diff --git a/addons/djangocms-style/addon.json b/addons/djangocms-style/addon.json deleted file mode 100644 index 7a8f5c8..0000000 --- a/addons/djangocms-style/addon.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "installed-apps": [ - "djangocms_style" - ], - "package-name": "djangocms-style" -} \ No newline at end of file diff --git a/addons/djangocms-style/aldryn_config.py b/addons/djangocms-style/aldryn_config.py deleted file mode 100644 index 6146e26..0000000 --- a/addons/djangocms-style/aldryn_config.py +++ /dev/null @@ -1,43 +0,0 @@ -# -*- coding: utf-8 -*- -from aldryn_client import forms - - -def split_and_strip(string): - return [item.strip() for item in string.split(',') if item] - - -class Form(forms.BaseForm): - templates = forms.CharField( - 'List of additional templates (comma separated)', - required=False, - ) - class_names = forms.CharField( - 'List of classes (comma separated)', - required=False, - ) - tag_types = forms.CharField( - 'List of HTML tags (comma separated)', - required=False, - ) - - def clean(self): - data = super(Form, self).clean() - - # prettify - data['templates'] = ', '.join(split_and_strip(data['templates'])) - data['class_names'] = ', '.join(split_and_strip(data['class_names'])) - data['tag_types'] = ', '.join(split_and_strip(data['tag_types'])) - return data - - def to_settings(self, data, settings): - if data['templates']: - settings['DJANGOCMS_STYLE_TEMPLATES'] = [ - (item, item) - for item in split_and_strip(data['templates']) - ] - if data['class_names']: - settings['DJANGOCMS_STYLE_CHOICES'] = split_and_strip(data['class_names']) - if data['tag_types']: - settings['DJANGOCMS_STYLE_TAGS'] = split_and_strip(data['tag_types']) - - return settings diff --git a/addons/djangocms-style/settings.json b/addons/djangocms-style/settings.json deleted file mode 100644 index 2b9cd23..0000000 --- a/addons/djangocms-style/settings.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "class_names": null, - "tag_types": null, - "templates": null -} \ No newline at end of file diff --git a/requirements.in b/requirements.in index ca26f6c..44a8b55 100644 --- a/requirements.in +++ b/requirements.in @@ -7,7 +7,6 @@ https://control.divio.com/api/v1/apps/serve/aldryn-forms/2.2.8/fbefab76-74bf-445 https://control.divio.com/api/v1/apps/serve/djangocms-history/0.5.3/05803675-6e8d-4637-b14b-1bb8d18b24b3/djangocms-history-0.5.3.tar.gz#egg=djangocms-history==0.5.3 https://control.divio.com/api/v1/apps/serve/djangocms-link/2.1.2/35b986c1-fafb-46ee-b665-aa36603f233a/djangocms-link-2.1.2.tar.gz#egg=djangocms-link==2.1.2 https://control.divio.com/api/v1/apps/serve/djangocms-picture/2.0.6/005e8663-d1cc-4667-936c-30709edad076/djangocms-picture-2.0.6.tar.gz#egg=djangocms-picture==2.0.6 -https://control.divio.com/api/v1/apps/serve/djangocms-style/2.0.2/51797e49-ec8c-461d-92e0-1cc274eb96af/djangocms-style-2.0.2.tar.gz#egg=djangocms-style==2.0.2 https://control.divio.com/api/v1/apps/serve/djangocms-text-ckeditor/3.5.3/a7b5179f-cea5-4af8-b235-6b7f709c4e6a/djangocms-text-ckeditor-3.5.3.tar.gz#egg=djangocms-text-ckeditor==3.5.3 https://control.divio.com/api/v1/apps/serve/django-filer/1.3.0.1/bcb7d25b-6922-48a9-a252-9bc165f6403e/django-filer-1.3.0.1.tar.gz#egg=django-filer==1.3.0.1 # diff --git a/settings.py b/settings.py index 5c1e5fd..3ae74f3 100644 --- a/settings.py +++ b/settings.py @@ -10,7 +10,6 @@ INSTALLED_ADDONS = [ 'djangocms-history', 'djangocms-link', 'djangocms-picture', - 'djangocms-style', 'djangocms-text-ckeditor', 'django-filer', #