From ddc04d1e4383154831ca4703cac4b1b66d31ca64 Mon Sep 17 00:00:00 2001 From: Simon Caminada Date: Thu, 7 Jun 2018 16:05:37 +0000 Subject: [PATCH] uninstall djangocms-text-ckeditor 3.6.0 --- addons/djangocms-text-ckeditor/addon.json | 6 --- .../djangocms-text-ckeditor/aldryn_config.py | 50 ------------------- addons/djangocms-text-ckeditor/settings.json | 4 -- requirements.in | 1 - settings.py | 1 - 5 files changed, 62 deletions(-) delete mode 100644 addons/djangocms-text-ckeditor/addon.json delete mode 100644 addons/djangocms-text-ckeditor/aldryn_config.py delete mode 100644 addons/djangocms-text-ckeditor/settings.json diff --git a/addons/djangocms-text-ckeditor/addon.json b/addons/djangocms-text-ckeditor/addon.json deleted file mode 100644 index 7678082..0000000 --- a/addons/djangocms-text-ckeditor/addon.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "installed-apps": [ - "djangocms_text_ckeditor" - ], - "package-name": "djangocms-text-ckeditor" -} \ No newline at end of file diff --git a/addons/djangocms-text-ckeditor/aldryn_config.py b/addons/djangocms-text-ckeditor/aldryn_config.py deleted file mode 100644 index 8ff9e40..0000000 --- a/addons/djangocms-text-ckeditor/aldryn_config.py +++ /dev/null @@ -1,50 +0,0 @@ -# -*- coding: utf-8 -*- -from aldryn_client import forms - - -class Form(forms.BaseForm): - style_set = forms.CharField( - 'The "styles definition set" to use in the editor', - required=False, - ) - content_css = forms.CharField( - 'List of CSS files to be used to apply style to editor content', - required=False, - ) - - def clean(self): - data = super(Form, self).clean() - - if data.get('content_css'): - files = data['content_css'].split(',') - data['content_css'] = [item.strip() for item in files if item] - return data - - def to_settings(self, data, settings): - # boilerplate must provide /static/js/modules/ckeditor.wysiwyg.js and /static/css/base.css - CKEDITOR_SETTINGS = { - 'height': 300, - 'language': '{{ language }}', - 'toolbar': 'CMS', - 'skin': 'moono-lisa', - } - - # This could fail if aldryn-django-cms has not been configured yet. - boilerplate_name = settings['ALDRYN_BOILERPLATE_NAME'] - - if data.get('content_css'): - CKEDITOR_SETTINGS['contentsCss'] = data['content_css'] - else: - CKEDITOR_SETTINGS['contentsCss'] = ['/static/css/base.css'] - - if data.get('style_set'): - style_set = data['style_set'] - elif boilerplate_name == 'bootstrap3': - style_set = '/static/js/addons/ckeditor.wysiwyg.js' - else: - style_set = '' - - CKEDITOR_SETTINGS['stylesSet'] = 'default:{}'.format(style_set) - - settings['CKEDITOR_SETTINGS'] = CKEDITOR_SETTINGS - return settings diff --git a/addons/djangocms-text-ckeditor/settings.json b/addons/djangocms-text-ckeditor/settings.json deleted file mode 100644 index 4fa0b78..0000000 --- a/addons/djangocms-text-ckeditor/settings.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "content_css": "", - "style_set": "" -} \ No newline at end of file diff --git a/requirements.in b/requirements.in index 144af84..56686f2 100644 --- a/requirements.in +++ b/requirements.in @@ -8,7 +8,6 @@ https://control.divio.com/api/v1/apps/serve/aldryn-google-analytics/1.0.1/9fa370 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-text-ckeditor/3.6.0/ae5a13e2-be4d-4291-a4ff-0f9696aa0456/djangocms-text-ckeditor-3.6.0.tar.gz#egg=djangocms-text-ckeditor==3.6.0 https://control.divio.com/api/v1/apps/serve/django-filer/1.3.2/a68cceeb-0373-47af-9cf6-01dbc9bead40/django-filer-1.3.2.tar.gz#egg=django-filer==1.3.2 # Whoosh==2.7.4 diff --git a/settings.py b/settings.py index 3eba910..a84b6a0 100644 --- a/settings.py +++ b/settings.py @@ -13,7 +13,6 @@ INSTALLED_ADDONS = [ 'djangocms-history', 'djangocms-link', 'djangocms-picture', - 'djangocms-text-ckeditor', 'django-filer', # ]