use vendored djangocms-cascade plugin

DesignSafe-CI · Jun 7, 2023 · a309ebc · a309ebc
1 parent 8da799b
commit a309ebc
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 40 deletions.
diff --git a/designsafe/settings/common_settings.py b/designsafe/settings/common_settings.py
@@ -75,6 +75,7 @@
  'bootstrap3',
  'termsandconditions',
  'impersonate',
+ 'captcha',
 
 
  #websockets
@@ -298,7 +299,10 @@
  'ResponsiveEmbedPlugin',
  )
 }
-CMSPLUGIN_CASCADE_PLUGINS = ['cmsplugin_cascade.bootstrap4', 'cmsplugin_cascade.link']
+CMSPLUGIN_CASCADE_PLUGINS = [
+ 'cmsplugin_cascade.bootstrap3',
+ 'cmsplugin_cascade.link',
+]
 
 # These settings enable iFrames in the CMS cktext-editor.
 TEXT_ADDITIONAL_TAGS = ('iframe',)
@@ -312,11 +316,9 @@
  'easy_thumbnails.processors.filters',
 )
 
+
 CKEDITOR_SETTINGS = {
-'language': '{{ language }}',
-'skin': 'moono-lisa',
-'toolbar': 'CMS',
-'stylesSet': format_lazy('default:{}', reverse_lazy('admin:cascade_texteditor_config')),
+ 'allowedContent': True
 }
 
 #MIGRATION_MODULES = {

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -38,8 +38,8 @@ dropbox = "10.6.0"
 django-recaptcha2 = "1.4.1"
 djangocms-snippet = "^2.3.0"
 django-bootstrap3 = "^11.1.0"
-djangocms-text-ckeditor = "^4.0"
-djangocms-cascade = "1.3.7"
+djangocms-text-ckeditor = "^3.5.0"
+djangocms-cascade = { git = "https://github.com/jarosenb/djangocms-cascade-ds-compat", rev = "04d52dca46312b24ded3aa1d4cf3955a88ebc147" }
 djangocms-style = "^2.3.0"
 djangocms-video = "^2.3.0"
 djangocms-picture = "^2.4.0"