From a834f18042c0dd44450020f78212a5fb320116bb Mon Sep 17 00:00:00 2001 From: Simon Caminada Date: Thu, 15 Mar 2018 11:21:43 +0000 Subject: [PATCH] install djangocms-style 2.0.2 --- addons/djangocms-style/addon.json | 6 ++++ addons/djangocms-style/aldryn_config.py | 43 +++++++++++++++++++++++++ addons/djangocms-style/settings.json | 5 +++ requirements.in | 1 + settings.py | 1 + 5 files changed, 56 insertions(+) create mode 100644 addons/djangocms-style/addon.json create mode 100644 addons/djangocms-style/aldryn_config.py create mode 100644 addons/djangocms-style/settings.json diff --git a/addons/djangocms-style/addon.json b/addons/djangocms-style/addon.json new file mode 100644 index 0000000..7a8f5c8 --- /dev/null +++ b/addons/djangocms-style/addon.json @@ -0,0 +1,6 @@ +{ + "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 new file mode 100644 index 0000000..6146e26 --- /dev/null +++ b/addons/djangocms-style/aldryn_config.py @@ -0,0 +1,43 @@ +# -*- 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 new file mode 100644 index 0000000..2b9cd23 --- /dev/null +++ b/addons/djangocms-style/settings.json @@ -0,0 +1,5 @@ +{ + "class_names": null, + "tag_types": null, + "templates": null +} \ No newline at end of file diff --git a/requirements.in b/requirements.in index b440911..dcc2e1c 100644 --- a/requirements.in +++ b/requirements.in @@ -7,6 +7,7 @@ https://control.divio.com/api/v1/apps/serve/djangocms-googlemap/1.1.0/829bcfeb-0 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-snippet/2.0.0/03734ae6-5d3e-44aa-8641-8f764dbced64/djangocms-snippet-2.0.0.tar.gz#egg=djangocms-snippet==2.0.0 +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/djangocms-video/2.0.4/d62adbd2-40e9-4cc5-9a10-01a5e141bf85/djangocms-video-2.0.4.tar.gz#egg=djangocms-video==2.0.4 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 83b62ba..dc9f49b 100644 --- a/settings.py +++ b/settings.py @@ -10,6 +10,7 @@ INSTALLED_ADDONS = [ 'djangocms-link', 'djangocms-picture', 'djangocms-snippet', + 'djangocms-style', 'djangocms-text-ckeditor', 'djangocms-video', 'django-filer',