From 9cf8cef59ac090cd9d7460edd66333fcffba3a51 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Tue, 23 Oct 2012 21:52:35 -0300 Subject: added missing settings to the setup templates --- askbot/setup_templates/settings.py | 2 ++ askbot/setup_templates/settings.py.mustache | 2 ++ 2 files changed, 4 insertions(+) diff --git a/askbot/setup_templates/settings.py b/askbot/setup_templates/settings.py index 94df6f29..65075361 100644 --- a/askbot/setup_templates/settings.py +++ b/askbot/setup_templates/settings.py @@ -174,6 +174,7 @@ INSTALLED_APPS = ( 'djcelery', 'djkombu', 'followit', + 'tinymce', #'avatar',#experimental use git clone git://github.com/ericflo/django-avatar.git$ ) @@ -249,6 +250,7 @@ TINYMCE_JS_ROOT = os.path.join(STATIC_ROOT, 'common/media/js/tinymce/') TINYMCE_URL = STATIC_URL + 'common/media/js/tinymce/' TINYMCE_DEFAULT_CONFIG = { 'plugins': 'askbot_imageuploader,askbot_attachment', + 'convert_urls': False, 'theme': 'advanced', 'content_css': STATIC_URL + 'default/media/style/tinymce/content.css', 'force_br_newlines': True, diff --git a/askbot/setup_templates/settings.py.mustache b/askbot/setup_templates/settings.py.mustache index 74295513..287b0bb1 100644 --- a/askbot/setup_templates/settings.py.mustache +++ b/askbot/setup_templates/settings.py.mustache @@ -174,6 +174,7 @@ INSTALLED_APPS = ( 'djcelery', 'djkombu', 'followit', + 'tinymce', #'avatar',#experimental use git clone git://github.com/ericflo/django-avatar.git$ ) @@ -251,6 +252,7 @@ TINYMCE_JS_ROOT = os.path.join(STATIC_ROOT, 'common/media/js/tinymce/') TINYMCE_URL = STATIC_URL + 'common/media/js/tinymce/' TINYMCE_DEFAULT_CONFIG = { 'plugins': 'askbot_imageuploader,askbot_attachment', + 'convert_urls': False, 'theme': 'advanced', 'content_css': STATIC_URL + 'default/media/style/tinymce/content.css', 'force_br_newlines': True, -- cgit v1.2.3-1-g7c22 From 5c233c42df00c9f1949653f41dd1d91286c8097b Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Tue, 23 Oct 2012 21:54:50 -0300 Subject: made more changes to the setup templates files --- askbot/setup_templates/settings.py | 6 +++--- askbot/setup_templates/settings.py.mustache | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/askbot/setup_templates/settings.py b/askbot/setup_templates/settings.py index 65075361..b43b2b50 100644 --- a/askbot/setup_templates/settings.py +++ b/askbot/setup_templates/settings.py @@ -246,13 +246,13 @@ HAYSTACK_SEARCH_ENGINE = 'simple' TINYMCE_COMPRESSOR = True TINYMCE_SPELLCHECKER = False -TINYMCE_JS_ROOT = os.path.join(STATIC_ROOT, 'common/media/js/tinymce/') -TINYMCE_URL = STATIC_URL + 'common/media/js/tinymce/' +TINYMCE_JS_ROOT = os.path.join(STATIC_ROOT, 'default/media/js/tinymce/') + +TINYMCE_URL = STATIC_URL + 'default/media/js/tinymce/' TINYMCE_DEFAULT_CONFIG = { 'plugins': 'askbot_imageuploader,askbot_attachment', 'convert_urls': False, 'theme': 'advanced', - 'content_css': STATIC_URL + 'default/media/style/tinymce/content.css', 'force_br_newlines': True, 'force_p_newlines': False, 'forced_root_block': '', diff --git a/askbot/setup_templates/settings.py.mustache b/askbot/setup_templates/settings.py.mustache index 287b0bb1..aa153435 100644 --- a/askbot/setup_templates/settings.py.mustache +++ b/askbot/setup_templates/settings.py.mustache @@ -248,8 +248,8 @@ HAYSTACK_SEARCH_ENGINE = 'simple' TINYMCE_COMPRESSOR = True TINYMCE_SPELLCHECKER = False -TINYMCE_JS_ROOT = os.path.join(STATIC_ROOT, 'common/media/js/tinymce/') -TINYMCE_URL = STATIC_URL + 'common/media/js/tinymce/' +TINYMCE_JS_ROOT = os.path.join(STATIC_ROOT, 'default/media/js/tinymce/') +TINYMCE_URL = STATIC_URL + 'default/media/js/tinymce/' TINYMCE_DEFAULT_CONFIG = { 'plugins': 'askbot_imageuploader,askbot_attachment', 'convert_urls': False, -- cgit v1.2.3-1-g7c22