diff options
| author | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2012-10-16 10:46:37 -0600 |
|---|---|---|
| committer | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2012-10-16 10:46:37 -0600 |
| commit | cf917cdbf65fb9988f582dca807472ff7f7b9705 (patch) | |
| tree | 52ccddd438661fbb5d6664ae987c26bb7becc9b8 /askbot/setup_templates | |
| parent | 0b8f2d396e74f05c9a3d822e96d64dbaccb0b9ab (diff) | |
| download | askbot-cf917cdbf65fb9988f582dca807472ff7f7b9705.tar.gz askbot-cf917cdbf65fb9988f582dca807472ff7f7b9705.tar.bz2 askbot-cf917cdbf65fb9988f582dca807472ff7f7b9705.zip | |
fixed setup_templates settings.py files
Diffstat (limited to 'askbot/setup_templates')
| -rw-r--r-- | askbot/setup_templates/settings.py | 5 | ||||
| -rw-r--r-- | askbot/setup_templates/settings.py.mustache | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/askbot/setup_templates/settings.py b/askbot/setup_templates/settings.py index 94df6f29..f9fdc8b9 100644 --- a/askbot/setup_templates/settings.py +++ b/askbot/setup_templates/settings.py @@ -245,10 +245,11 @@ 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, diff --git a/askbot/setup_templates/settings.py.mustache b/askbot/setup_templates/settings.py.mustache index 74295513..7909c738 100644 --- a/askbot/setup_templates/settings.py.mustache +++ b/askbot/setup_templates/settings.py.mustache @@ -247,10 +247,11 @@ 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, |