diff options
| author | piskvorky <radimrehurek@seznam.cz> | 2011-12-18 08:48:23 +0100 |
|---|---|---|
| committer | piskvorky <radimrehurek@seznam.cz> | 2011-12-18 08:49:35 +0100 |
| commit | 4a2d5f0ff27a5d993f71bcc3b05cbcf9f8a8f833 (patch) | |
| tree | 20c1219d80c9d62183d1b54d52ddf3d2e2a18345 | |
| parent | 53cd343ea0f33f3b269ae5fd5e3890a3a3ad934d (diff) | |
| download | askbot-4a2d5f0ff27a5d993f71bcc3b05cbcf9f8a8f833.tar.gz askbot-4a2d5f0ff27a5d993f71bcc3b05cbcf9f8a8f833.tar.bz2 askbot-4a2d5f0ff27a5d993f71bcc3b05cbcf9f8a8f833.zip | |
updated static urls in javascript
| -rw-r--r-- | askbot/context.py | 1 | ||||
| -rw-r--r-- | askbot/skins/common/media/js/utils.js | 2 | ||||
| -rw-r--r-- | askbot/skins/default/templates/meta/bottom_scripts.html | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/askbot/context.py b/askbot/context.py index f3665240..f3819481 100644 --- a/askbot/context.py +++ b/askbot/context.py @@ -15,6 +15,7 @@ def application_settings(request): my_settings = askbot_settings.as_dict() my_settings['LANGUAGE_CODE'] = getattr(request, 'LANGUAGE_CODE', settings.LANGUAGE_CODE) my_settings['ASKBOT_URL'] = settings.ASKBOT_URL + my_settings['STATIC_URL'] = settings.STATIC_URL my_settings['ASKBOT_CSS_DEVEL'] = getattr(settings, 'ASKBOT_CSS_DEVEL', False) my_settings['DEBUG'] = settings.DEBUG my_settings['ASKBOT_VERSION'] = askbot.get_version() diff --git a/askbot/skins/common/media/js/utils.js b/askbot/skins/common/media/js/utils.js index 0afd03a7..60ac8d97 100644 --- a/askbot/skins/common/media/js/utils.js +++ b/askbot/skins/common/media/js/utils.js @@ -1,6 +1,6 @@ //var $, scriptUrl, askbotSkin var mediaUrl = function(resource){ - return scriptUrl + 'm/' + askbotSkin + '/' + resource; + return askbot['settings']['static_url'] + askbotSkin + '/' + resource; }; var cleanUrl = function(url){ diff --git a/askbot/skins/default/templates/meta/bottom_scripts.html b/askbot/skins/default/templates/meta/bottom_scripts.html index 0df25e7c..980059da 100644 --- a/askbot/skins/default/templates/meta/bottom_scripts.html +++ b/askbot/skins/default/templates/meta/bottom_scripts.html @@ -28,6 +28,7 @@ askbot['urls']['follow_user'] = scriptUrl + 'followit/follow/user/{{'{{'}}userId{{'}}'}}/'; askbot['urls']['unfollow_user'] = scriptUrl + 'followit/unfollow/user/{{'{{'}}userId{{'}}'}}/'; askbot['urls']['user_signin'] = '{{ settings.LOGIN_URL }}'; + askbot['settings']['static_url'] = '{{ settings.STATIC_URL }}'; </script> <script type="text/javascript" |