diff options
-rw-r--r-- | askbot/__init__.py | 4 | ||||
-rw-r--r-- | askbot/deps/django_authopenid/views.py | 2 | ||||
-rw-r--r-- | askbot/setup_templates/settings.py | 10 | ||||
-rw-r--r-- | askbot/setup_templates/settings.py.mustache | 8 | ||||
-rw-r--r-- | askbot/setup_templates/urls.py | 2 | ||||
-rw-r--r-- | askbot/startup_procedures.py | 16 | ||||
-rw-r--r-- | askbot_requirements.txt | 2 |
7 files changed, 27 insertions, 17 deletions
diff --git a/askbot/__init__.py b/askbot/__init__.py index 0d9156aa..265eb611 100644 --- a/askbot/__init__.py +++ b/askbot/__init__.py @@ -33,14 +33,14 @@ REQUIREMENTS = { 'openid': 'python-openid', 'pystache': 'pystache==0.3.1', 'pytz': 'pytz', - 'tinymce': 'django-tinymce', + 'tinymce': 'django-tinymce==1.5.1b2', 'longerusername': 'longerusername', 'bs4': 'beautifulsoup4' } if platform.system() != 'Windows': REQUIREMENTS['lamson'] = 'Lamson' - + #necessary for interoperability of django and coffin try: from askbot import patches diff --git a/askbot/deps/django_authopenid/views.py b/askbot/deps/django_authopenid/views.py index 8f33e8c0..9ddb6414 100644 --- a/askbot/deps/django_authopenid/views.py +++ b/askbot/deps/django_authopenid/views.py @@ -99,7 +99,7 @@ def create_authenticated_user_account( user = User.objects.create_user(username, email) user_registered.send(None, user=user) - logging.debug('creating new openid user association for %s') + logging.debug('creating new openid user association for %s', username) if password: user.set_password(password) diff --git a/askbot/setup_templates/settings.py b/askbot/setup_templates/settings.py index 237a1280..51bb05fb 100644 --- a/askbot/setup_templates/settings.py +++ b/askbot/setup_templates/settings.py @@ -248,7 +248,7 @@ TINYMCE_COMPRESSOR = True TINYMCE_SPELLCHECKER = False TINYMCE_JS_ROOT = os.path.join(STATIC_ROOT, 'default/media/js/tinymce/') -TINYMCE_URL = STATIC_URL + 'default/media/js/tinymce/' +TINYMCE_JS_URL = STATIC_URL + 'default/media/js/tinymce/tiny_mce.js' TINYMCE_DEFAULT_CONFIG = { 'plugins': 'askbot_imageuploader,askbot_attachment', 'convert_urls': False, @@ -268,8 +268,16 @@ TINYMCE_DEFAULT_CONFIG = { 'theme_advanced_resizing': True, 'theme_advanced_resize_horizontal': False, 'theme_advanced_statusbar_location': 'bottom', + 'width': '730', 'height': '250' } #delayed notifications, time in seconds, 15 mins by default NOTIFICATION_DELAY_TIME = 60 * 15 + +GROUP_MESSAGING = { + 'BASE_URL_GETTER_FUNCTION': 'askbot.models.user_get_profile_url', + 'BASE_URL_PARAMS': {'section': 'messages', 'sort': 'inbox'} +} + +ASKBOT_MULTILINGUAL = False diff --git a/askbot/setup_templates/settings.py.mustache b/askbot/setup_templates/settings.py.mustache index bd77e82e..1c4ca6de 100644 --- a/askbot/setup_templates/settings.py.mustache +++ b/askbot/setup_templates/settings.py.mustache @@ -250,10 +250,10 @@ HAYSTACK_SITECONF = 'askbot.search.haystack' #http://django-haystack.readthedocs.org/en/v1.2.7/settings.html HAYSTACK_SEARCH_ENGINE = 'simple' -TINYMCE_COMPRESSOR = True +TINYMCE_COMPRESSOR = True TINYMCE_SPELLCHECKER = False TINYMCE_JS_ROOT = os.path.join(STATIC_ROOT, 'default/media/js/tinymce/') -TINYMCE_URL = STATIC_URL + 'default/media/js/tinymce/' +TINYMCE_JS_URL = STATIC_URL + 'default/media/js/tinymce/tiny_mce.js' TINYMCE_DEFAULT_CONFIG = { 'plugins': 'askbot_imageuploader,askbot_attachment', 'convert_urls': False, @@ -274,7 +274,7 @@ TINYMCE_DEFAULT_CONFIG = { 'theme_advanced_resizing': True, 'theme_advanced_resize_horizontal': False, 'theme_advanced_statusbar_location': 'bottom', - 'width': '723', + 'width': '730', 'height': '250' } @@ -285,3 +285,5 @@ GROUP_MESSAGING = { 'BASE_URL_GETTER_FUNCTION': 'askbot.models.user_get_profile_url', 'BASE_URL_PARAMS': {'section': 'messages', 'sort': 'inbox'} } + +ASKBOT_MULTILINGUAL = False diff --git a/askbot/setup_templates/urls.py b/askbot/setup_templates/urls.py index 35f1c5b3..4c76781b 100644 --- a/askbot/setup_templates/urls.py +++ b/askbot/setup_templates/urls.py @@ -30,7 +30,7 @@ urlpatterns += patterns('', (r'^tinymce/', include('tinymce.urls')), (r'^robots.txt$', include('robots.urls')), url( # TODO: replace with django.conf.urls.static ? - r'^%s(?P<path>.*)$' % settings.MEDIA_URL[1:], + r'^%s(?P<path>.*)$' % settings.MEDIA_URL[1:], 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT.replace('\\','/')}, ), diff --git a/askbot/startup_procedures.py b/askbot/startup_procedures.py index f3597820..d0d02aec 100644 --- a/askbot/startup_procedures.py +++ b/askbot/startup_procedures.py @@ -231,7 +231,7 @@ def test_template_loader(): errors.append( '"%s" must be the first element of TEMPLATE_LOADERS' % current_loader ) - + print_errors(errors) def test_celery(): @@ -609,7 +609,7 @@ def test_tinymce(): required_attrs = ( 'TINYMCE_COMPRESSOR', 'TINYMCE_JS_ROOT', - 'TINYMCE_URL', + 'TINYMCE_JS_URL', 'TINYMCE_DEFAULT_CONFIG' ) @@ -665,11 +665,11 @@ def test_tinymce(): errors.append(error_tpl % relative_js_path) #check url setting - url = getattr(django_settings, 'TINYMCE_URL', '') - expected_url = django_settings.STATIC_URL + relative_js_path + url = getattr(django_settings, 'TINYMCE_JS_URL', '') + expected_url = django_settings.STATIC_URL + relative_js_path + 'tiny_mce.js' old_expected_url = django_settings.STATIC_URL + old_relative_js_path if urls_equal(url, expected_url) is False: - error_tpl = "add line: TINYMCE_URL = STATIC_URL + '%s'" + error_tpl = "add line: TINYMCE_JS_URL = STATIC_URL + '%s'" if urls_equal(url, old_expected_url): error_tpl += '\nNote: we have moved files from "common" into "default"' errors.append(error_tpl % relative_js_path) @@ -721,7 +721,7 @@ def test_template_context_processors(): required_processors.append(new_auth_processor) if old_auth_processor in django_settings.TEMPLATE_CONTEXT_PROCESSORS: invalid_processors.append(old_auth_processor) - + missing_processors = list() for processor in required_processors: if processor not in django_settings.TEMPLATE_CONTEXT_PROCESSORS: @@ -790,7 +790,7 @@ def test_group_messaging(): errors.append( "make setting 'GROUP_MESSAGING to be exactly:\n" + settings_sample ) - + url_params = settings.get('BASE_URL_PARAMS', None) else: errors.append('add this to your settings.py:\n' + settings_sample) @@ -819,7 +819,7 @@ def test_multilingual(): errors.append('ASKBOT_MULTILINGUAL=True works only with django >= 1.4') if is_multilang: - middleware = 'django.middleware.locale.LocaleMiddleware' + middleware = 'django.middleware.locale.LocaleMiddleware' if middleware not in django_settings.MIDDLEWARE_CLASSES: errors.append( "add 'django.middleware.locale.LocaleMiddleware' to your MIDDLEWARE_CLASSES " diff --git a/askbot_requirements.txt b/askbot_requirements.txt index a9a939b4..ea9dd005 100644 --- a/askbot_requirements.txt +++ b/askbot_requirements.txt @@ -20,6 +20,6 @@ python-openid pystache==0.3.1 pytz sanction -django-tinymce +django-tinymce==1.5.1b2 longerusername beautifulsoup4 |