Mercurial > kallithea
changeset 1629:2196aa27954b beta
implements #293 gravatar link should be disabled when use_gravatar = false
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Mon, 31 Oct 2011 23:10:11 +0200 |
| parents | de71a4bde097 |
| children | 25d8e4836bc2 |
| files | rhodecode/lib/base.py rhodecode/lib/helpers.py rhodecode/templates/admin/users/user_edit.html rhodecode/templates/admin/users/user_edit_my_account.html |
| diffstat | 4 files changed, 17 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/lib/base.py Mon Oct 31 21:42:41 2011 +0200 +++ b/rhodecode/lib/base.py Mon Oct 31 23:10:11 2011 +0200 @@ -11,6 +11,7 @@ from paste.deploy.converters import asbool from rhodecode import __version__ +from rhodecode.lib import str2bool from rhodecode.lib.auth import AuthUser, get_container_username from rhodecode.lib.utils import get_repo_slug from rhodecode.model import meta @@ -25,6 +26,7 @@ def __before__(self): c.rhodecode_version = __version__ c.rhodecode_name = config.get('rhodecode_title') + c.use_gravatar = str2bool(config.get('use_gravatar')) c.ga_code = config.get('rhodecode_ga_code') c.repo_name = get_repo_slug(request) c.backends = BACKENDS.keys()
--- a/rhodecode/lib/helpers.py Mon Oct 31 21:42:41 2011 +0200 +++ b/rhodecode/lib/helpers.py Mon Oct 31 23:10:11 2011 +0200 @@ -454,9 +454,8 @@ #============================================================================== def gravatar_url(email_address, size=30): - if not str2bool(config['app_conf'].get('use_gravatar')) or \ - not email_address or \ - email_address == 'anonymous@rhodecode.org': + if (not str2bool(config['app_conf'].get('use_gravatar')) or + not email_address or email_address == 'anonymous@rhodecode.org'): return url("/images/user%s.png" % size) ssl_enabled = 'https' == request.environ.get('wsgi.url_scheme')
--- a/rhodecode/templates/admin/users/user_edit.html Mon Oct 31 21:42:41 2011 +0200 +++ b/rhodecode/templates/admin/users/user_edit.html Mon Oct 31 23:10:11 2011 +0200 @@ -29,10 +29,13 @@ <div class="field"> <div class="gravatar_box"> <div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(c.user.email)}"/></div> - <p> - <strong>${_('Change your avatar at')} <a href="http://gravatar.com">gravatar.com</a></strong><br/> - ${_('Using')} ${c.user.email} - </p> + <p> + %if c.use_gravatar: + <strong>${_('Change your avatar at')} <a href="http://gravatar.com">gravatar.com</a></strong> + <br/>${_('Using')} ${c.user.email} + %else: + <br/>${c.user.email} + %endif </div> </div> <div class="field">
--- a/rhodecode/templates/admin/users/user_edit_my_account.html Mon Oct 31 21:42:41 2011 +0200 +++ b/rhodecode/templates/admin/users/user_edit_my_account.html Mon Oct 31 23:10:11 2011 +0200 @@ -29,8 +29,12 @@ <div class="gravatar_box"> <div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(c.user.email)}"/></div> <p> - <strong>${_('Change your avatar at')} <a href="http://gravatar.com">gravatar.com</a></strong><br/> - ${_('Using')} ${c.user.email} + %if c.use_gravatar: + <strong>${_('Change your avatar at')} <a href="http://gravatar.com">gravatar.com</a></strong> + <br/>${_('Using')} ${c.user.email} + %else: + <br/>${c.user.email} + %endif </p> </div> </div>