Mercurial > kallithea
changeset 5893:8d01c8a72bb5
helpers: refactor handling of default gravatars - use explicit 'default' instead of empty string
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Wed, 04 May 2016 01:18:25 +0200 |
| parents | 7a7b817aa156 |
| children | 74f0df038ccd |
| files | kallithea/lib/helpers.py kallithea/model/repo.py kallithea/public/js/base.js kallithea/templates/pullrequests/pullrequest_show.html |
| diffstat | 4 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/lib/helpers.py Wed May 04 01:18:25 2016 +0200 +++ b/kallithea/lib/helpers.py Wed May 04 01:18:25 2016 +0200 @@ -862,7 +862,7 @@ return literal(html) -def gravatar_url(email_address, size=30): +def gravatar_url(email_address, size=30, default=''): # doh, we need to re-import those to mock it later from pylons import url from pylons import tmpl_context as c @@ -873,7 +873,7 @@ email_address = email_address or _def if email_address == _def: - return "" + return default parsed_url = urlparse.urlparse(url.current(qualified=True)) url = (c.visual.gravatar_url or User.DEFAULT_GRAVATAR_URL ) \
--- a/kallithea/model/repo.py Wed May 04 01:18:25 2016 +0200 +++ b/kallithea/model/repo.py Wed May 04 01:18:25 2016 +0200 @@ -142,7 +142,7 @@ 'fname': h.escape(u.name), 'lname': h.escape(u.lastname), 'nname': u.username, - 'gravatar_lnk': h.gravatar_url(u.email, size=28), + 'gravatar_lnk': h.gravatar_url(u.email, size=28, default='default'), 'gravatar_size': 14, } for u in users] )
--- a/kallithea/public/js/base.js Wed May 04 01:18:25 2016 +0200 +++ b/kallithea/public/js/base.js Wed May 04 01:18:25 2016 +0200 @@ -1076,8 +1076,9 @@ + "</span>" + full.substring(matchindex + snippet.length); }; +// Return html snippet for showing the provided gravatar url var gravatar = function(gravatar_lnk, size, cssclass) { - if (!gravatar_lnk) { + if (!gravatar_lnk || gravatar_lnk == 'default') { return '<i class="icon-user {1}" style="font-size: {0}px;"></i>'.format(size, cssclass); } return '<img alt="" class="{2}" style="width: {0}px; height: {0}px" src="{1}"/>'.format(size, gravatar_lnk, cssclass);
--- a/kallithea/templates/pullrequests/pullrequest_show.html Wed May 04 01:18:25 2016 +0200 +++ b/kallithea/templates/pullrequests/pullrequest_show.html Wed May 04 01:18:25 2016 +0200 @@ -279,7 +279,7 @@ fname="${u.name}" lname="${u.lastname}" nname="${u.username}" - gravatar_lnk="${h.gravatar_url(u.email, size=28)}" + gravatar_lnk="${h.gravatar_url(u.email, size=28, default='default')}" gravatar_size="14" title="Click to add reviewer to the list, then Save Changes.">${u.full_name}</a> </li>