diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2010-08-15 17:05:54 -0400 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2010-08-15 17:07:21 -0400 |
| commit | 126795ea7d12a416e576c9b810a2a73e7c0e0852 (patch) | |
| tree | ccb6ef77c4e0f156a6f04254ec44310cee28dffc | |
| parent | 0b91db5254d5965f91cb0151e50abe2a3b93c81d (diff) | |
| download | askbot-126795ea7d12a416e576c9b810a2a73e7c0e0852.tar.gz askbot-126795ea7d12a416e576c9b810a2a73e7c0e0852.tar.bz2 askbot-126795ea7d12a416e576c9b810a2a73e7c0e0852.zip | |
fixed site logo urls
| -rw-r--r-- | askbot/conf/skin_general_settings.py | 2 | ||||
| -rw-r--r-- | askbot/setup_templates/settings.py | 3 | ||||
| -rw-r--r-- | askbot/skins/default/templates/header.html | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/askbot/conf/skin_general_settings.py b/askbot/conf/skin_general_settings.py index 54775c48..ed48ea3f 100644 --- a/askbot/conf/skin_general_settings.py +++ b/askbot/conf/skin_general_settings.py @@ -17,7 +17,7 @@ GENERAL_SKIN_SETTINGS = ConfigurationGroup( settings.register( ImageValue( GENERAL_SKIN_SETTINGS, - 'SITE_LOGO', + 'SITE_LOGO_URL', description = _('Q&A site logo'), help_text = _( 'To change the logo, select new file, ' diff --git a/askbot/setup_templates/settings.py b/askbot/setup_templates/settings.py index 23e110ba..3bee538f 100644 --- a/askbot/setup_templates/settings.py +++ b/askbot/setup_templates/settings.py @@ -197,4 +197,5 @@ ASKBOT_URL = '' #no leading slash, default = '' empty string _ = lambda v:v #fake translation function for the login url LOGIN_URL = '/%s%s%s' % (ASKBOT_URL,_('account/'),_('signin/')) #note - it is important that upload dir url is NOT translated!!! -ASKBOT_UPLOADED_FILES_URL = '/%s%s' % (ASKBOT_URL, 'upfiles/') +#also, this url must not have the leading slash +ASKBOT_UPLOADED_FILES_URL = '%s%s' % (ASKBOT_URL, 'upfiles/') diff --git a/askbot/skins/default/templates/header.html b/askbot/skins/default/templates/header.html index 21957d5f..c1bf51f1 100644 --- a/askbot/skins/default/templates/header.html +++ b/askbot/skins/default/templates/header.html @@ -37,7 +37,7 @@ <td id="logoContainer"> <div id="logo"> <a href="{% url questions %}?start_over=true"><img - src="{% media settings.SITE_LOGO %}" title="{% trans "back to home page" %}" alt="{{settings.APP_TITLE}} logo"/></a> + src="{{settings.SITE_LOGO_URL}}" title="{% trans "back to home page" %}" alt="{{settings.APP_TITLE}} logo"/></a> </div> </td> <td id="navTabContainer" valign="bottom" align="left"> |