diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2014-06-15 03:27:36 -0300 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2014-06-15 03:27:36 -0300 |
| commit | 1b480d55662bee861e20a1a2ed26394a91712aec (patch) | |
| tree | 61b7219622d6b484ffb8c03ffce4e53b70282083 | |
| parent | 37d507dc3ee31756f10a027c358c5b72cc26d1f8 (diff) | |
| parent | 3f8f6694ab5bde2b367c60cddf359b5489485eb8 (diff) | |
| download | askbot-1b480d55662bee861e20a1a2ed26394a91712aec.tar.gz askbot-1b480d55662bee861e20a1a2ed26394a91712aec.tar.bz2 askbot-1b480d55662bee861e20a1a2ed26394a91712aec.zip | |
Merge pull request #238 from hackingspirit/custom_logo_url_destination
Allow customization of the destional URL for the logo image
| -rw-r--r-- | askbot/conf/skin_general_settings.py | 10 | ||||
| -rw-r--r-- | askbot/locale/zh_CN/LC_MESSAGES/django.mo | bin | 142943 -> 143134 bytes | |||
| -rw-r--r-- | askbot/locale/zh_CN/LC_MESSAGES/django.po | 3 | ||||
| -rw-r--r-- | askbot/templates/widgets/logo.html | 4 |
4 files changed, 14 insertions, 3 deletions
diff --git a/askbot/conf/skin_general_settings.py b/askbot/conf/skin_general_settings.py index 11d201ad..2a4c76fa 100644 --- a/askbot/conf/skin_general_settings.py +++ b/askbot/conf/skin_general_settings.py @@ -17,6 +17,16 @@ GENERAL_SKIN_SETTINGS = ConfigurationGroup( ) settings.register( + values.StringValue( + GENERAL_SKIN_SETTINGS, + 'LOGO_DESTINATION_URL', + default = '/', + description = _('Destination URL for the site logo'), + ) +) + + +settings.register( values.ImageValue( GENERAL_SKIN_SETTINGS, 'SITE_LOGO_URL', diff --git a/askbot/locale/zh_CN/LC_MESSAGES/django.mo b/askbot/locale/zh_CN/LC_MESSAGES/django.mo Binary files differindex 8d468276..6fb17c0e 100644 --- a/askbot/locale/zh_CN/LC_MESSAGES/django.mo +++ b/askbot/locale/zh_CN/LC_MESSAGES/django.mo diff --git a/askbot/locale/zh_CN/LC_MESSAGES/django.po b/askbot/locale/zh_CN/LC_MESSAGES/django.po index 8ed703d0..40f0106c 100644 --- a/askbot/locale/zh_CN/LC_MESSAGES/django.po +++ b/askbot/locale/zh_CN/LC_MESSAGES/django.po @@ -4504,7 +4504,8 @@ msgstr "发起问题" msgid "" "since you are not logged in right now, you will be asked to sign in or " "register after posting your question" -msgstr "" +msgstr "因为你还没有登录, 发表问题后你需要注册或登录." + #: templates/ask.html:25 #, python-format diff --git a/askbot/templates/widgets/logo.html b/askbot/templates/widgets/logo.html index 1b251432..afa0a95b 100644 --- a/askbot/templates/widgets/logo.html +++ b/askbot/templates/widgets/logo.html @@ -1,5 +1,5 @@ -<a id="logo" href="{% url questions %}"><img - src="{{ settings.SITE_LOGO_URL|media }}" +<a id="logo" href="{%if settings.LOGO_DESTINATION_URL%}{{ settings.LOGO_DESTINATION_URL}}{% else %} {% url questions %}{% endif %}"><img + src="{{ settings.SITE_LOGO_URL|media }}" title="{% trans %}back to home page{% endtrans %}" alt="{% trans site=settings.APP_SHORT_NAME %}{{site}} logo{% endtrans %}"/> </a> |