diff options
| -rw-r--r-- | _deploy/debian-server/localsettings-expo-live.py | 7 | ||||
| -rw-r--r-- | settings.py | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/_deploy/debian-server/localsettings-expo-live.py b/_deploy/debian-server/localsettings-expo-live.py index a8ddb3f..b4deafa 100644 --- a/_deploy/debian-server/localsettings-expo-live.py +++ b/_deploy/debian-server/localsettings-expo-live.py @@ -159,6 +159,13 @@ STATIC_URL = Path(URL_ROOT, "/static/") # used by Django admin pages. Do not de JSLIB_URL = Path(URL_ROOT, "/javascript/") # used for CaveViewer JS utility # STATIC_ROOT removed after merging content into MEDIA_ROOT. See urls.py & core/views/surveys.py +# Re-enable TinyMCE when Dj upgraded to v3. Also templates/editexpopage.html +# TINYMCE_DEFAULT_CONFIG = { +# 'plugins': "table,spellchecker,paste,searchreplace", +# 'theme': "advanced", +# } +# TINYMCE_SPELLCHECKER = False +# TINYMCE_COMPRESSOR = True #TINY_MCE_MEDIA_ROOT = STATIC_ROOT + '/tiny_mce/' # not needed while TinyMCE not installed #TINY_MCE_MEDIA_URL = STATIC_URL + '/tiny_mce/' # not needed while TinyMCE not installed diff --git a/settings.py b/settings.py index 741f8b5..d16a033 100644 --- a/settings.py +++ b/settings.py @@ -142,6 +142,7 @@ QM_PATTERN = r"\[\[\s*[Qq][Mm]:([ABC]?)(\d{4})-(\d*)-(\d*)\]\]" TEST_RUNNER = "django.test.runner.DiscoverRunner" +print("+ finished importing troggle/settings.py, re-importing localsettings again") from localsettings import * # localsettings needs to take precedence. Call it to override any existing vars. |