Merge "Update settings"
This commit is contained in:
commit
1e6692b11b
|
@ -102,6 +102,7 @@ AKISMET_API_KEY = '<%= @akismet_api_key %>'
|
|||
# List of callables that know how to import templates from various sources.
|
||||
TEMPLATE_LOADERS = (
|
||||
'askbot.skins.loaders.Loader',
|
||||
'askbot.skins.loaders.JinjaAppDirectoryLoader',
|
||||
'django.template.loaders.app_directories.Loader',
|
||||
'django.template.loaders.filesystem.Loader',
|
||||
#'django.template.loaders.eggs.load_template_source',
|
||||
|
@ -203,9 +204,11 @@ INSTALLED_APPS = (
|
|||
'followit',
|
||||
'tinymce',
|
||||
'group_messaging',
|
||||
'captcha',
|
||||
#'avatar',#experimental use git clone git://github.com/ericflo/django-avatar.git$
|
||||
)
|
||||
|
||||
NOCAPTCHA = True
|
||||
|
||||
#setup memcached for production use!
|
||||
#see http://docs.djangoproject.com/en/1.1/topics/cache/ for details
|
||||
|
@ -335,7 +338,7 @@ HAYSTACK_SIGNAL_PROCESSOR = 'askbot.search.haystack.signals.AskbotRealtimeSignal
|
|||
|
||||
TINYMCE_COMPRESSOR = True
|
||||
TINYMCE_SPELLCHECKER = False
|
||||
TINYMCE_JS_ROOT = os.path.join(STATIC_ROOT, 'default/media/js/tinymce/')
|
||||
TINYMCE_JS_ROOT = os.path.join(STATIC_ROOT, 'default/media/tinymce/')
|
||||
#TINYMCE_JS_URL = STATIC_URL + 'default/media/js/tinymce/tiny_mce.js'
|
||||
TINYMCE_DEFAULT_CONFIG = {
|
||||
'plugins': 'askbot_imageuploader,askbot_attachment',
|
||||
|
@ -357,7 +360,8 @@ TINYMCE_DEFAULT_CONFIG = {
|
|||
'theme_advanced_resizing': True,
|
||||
'theme_advanced_resize_horizontal': False,
|
||||
'theme_advanced_statusbar_location': 'bottom',
|
||||
'width': '730',
|
||||
'editor_deselector': 'mceNoEditor',
|
||||
'width': '100%',
|
||||
'height': '250'
|
||||
}
|
||||
|
||||
|
@ -403,7 +407,7 @@ GROUP_MESSAGING = {
|
|||
'BASE_URL_PARAMS': {'section': 'messages', 'sort': 'inbox'}
|
||||
}
|
||||
|
||||
ASKBOT_MULTILINGUAL = True
|
||||
ASKBOT_LANGUAGE_MODE = 'url-lang'
|
||||
|
||||
LANGUAGES = (
|
||||
('en', 'English'),
|
||||
|
@ -423,6 +427,7 @@ if 'ASKBOT_CSS_DEVEL' in locals() and ASKBOT_CSS_DEVEL == True:
|
|||
COMPRESS_JS_FILTERS = []
|
||||
COMPRESS_PARSER = 'compressor.parser.HtmlParser'
|
||||
JINJA2_EXTENSIONS = ('compressor.contrib.jinja2ext.CompressorExtension',)
|
||||
JINJA2_TEMPLATES = ('captcha',)
|
||||
|
||||
# Use syncdb for tests instead of South migrations. Without this, some tests
|
||||
# fail spuriously in MySQL.
|
||||
|
|
Loading…
Reference in New Issue