diff options
| author | NoahY <yuttadhammo@yahoo.com> | 2011-07-27 09:54:18 +0530 |
|---|---|---|
| committer | NoahY <yuttadhammo@yahoo.com> | 2011-07-27 09:54:18 +0530 |
| commit | 7d539bf9d4f3f74f36be506e20cc199e2c58f53f (patch) | |
| tree | a159e2f249941214783e26651bc4ae84c56a357e | |
| parent | eaa46cf56392efc6b62c7f2fe98ff7fe5226a08a (diff) | |
| download | askbot-7d539bf9d4f3f74f36be506e20cc199e2c58f53f.tar.gz askbot-7d539bf9d4f3f74f36be506e20cc199e2c58f53f.tar.bz2 askbot-7d539bf9d4f3f74f36be506e20cc199e2c58f53f.zip | |
fixed custom favicon selection
| -rw-r--r-- | askbot/conf/skin_general_settings.py | 2 | ||||
| -rw-r--r-- | askbot/skins/default/templates/base.html | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/askbot/conf/skin_general_settings.py b/askbot/conf/skin_general_settings.py index 5bb0b296..bbe5e22d 100644 --- a/askbot/conf/skin_general_settings.py +++ b/askbot/conf/skin_general_settings.py @@ -58,7 +58,7 @@ settings.register( ) % {'favicon_info_url': const.DEPENDENCY_URLS['favicon']}, upload_directory = django_settings.ASKBOT_FILE_UPLOAD_DIR, upload_url = '/' + django_settings.ASKBOT_UPLOADED_FILES_URL, - default = '/images/favicon.gif', + default = '/m/default/media/images/favicon.gif', url_resolver = skin_utils.get_media_url ) ) diff --git a/askbot/skins/default/templates/base.html b/askbot/skins/default/templates/base.html index b4056e4d..0a2563b3 100644 --- a/askbot/skins/default/templates/base.html +++ b/askbot/skins/default/templates/base.html @@ -12,7 +12,11 @@ {% if settings.GOOGLE_SITEMAP_CODE %} <meta name="google-site-verification" content="{{settings.GOOGLE_SITEMAP_CODE}}" /> {% endif %} - <link rel="shortcut icon" href="{{ "/images/favicon.gif"|media }}" /> + {% if settings.SITE_FAVICON %} + <link rel="shortcut icon" href="{{ setting.SITE_FAVICON|media }}" /> + {% else %} + <link rel="shortcut icon" href="{{ '/m/default/media/images/favicon.gif'|media }}" /> + {% endif %} <link href="{{"/style/style.css"|media }}" rel="stylesheet" type="text/css" /> {{ skin.get_extra_css_link() }} {% if settings.USE_CUSTOM_CSS %} |