Show More
@@ -862,7 +862,7 b" def gravatar(email_address, cls='', size" | |||||
862 |
|
862 | |||
863 | return literal(html) |
|
863 | return literal(html) | |
864 |
|
864 | |||
865 | def gravatar_url(email_address, size=30): |
|
865 | def gravatar_url(email_address, size=30, default=''): | |
866 | # doh, we need to re-import those to mock it later |
|
866 | # doh, we need to re-import those to mock it later | |
867 | from pylons import url |
|
867 | from pylons import url | |
868 | from pylons import tmpl_context as c |
|
868 | from pylons import tmpl_context as c | |
@@ -873,7 +873,7 b' def gravatar_url(email_address, size=30)' | |||||
873 | email_address = email_address or _def |
|
873 | email_address = email_address or _def | |
874 |
|
874 | |||
875 | if email_address == _def: |
|
875 | if email_address == _def: | |
876 |
return |
|
876 | return default | |
877 |
|
877 | |||
878 | parsed_url = urlparse.urlparse(url.current(qualified=True)) |
|
878 | parsed_url = urlparse.urlparse(url.current(qualified=True)) | |
879 | url = (c.visual.gravatar_url or User.DEFAULT_GRAVATAR_URL ) \ |
|
879 | url = (c.visual.gravatar_url or User.DEFAULT_GRAVATAR_URL ) \ |
@@ -142,7 +142,7 b' class RepoModel(BaseModel):' | |||||
142 | 'fname': h.escape(u.name), |
|
142 | 'fname': h.escape(u.name), | |
143 | 'lname': h.escape(u.lastname), |
|
143 | 'lname': h.escape(u.lastname), | |
144 | 'nname': u.username, |
|
144 | 'nname': u.username, | |
145 | 'gravatar_lnk': h.gravatar_url(u.email, size=28), |
|
145 | 'gravatar_lnk': h.gravatar_url(u.email, size=28, default='default'), | |
146 | 'gravatar_size': 14, |
|
146 | 'gravatar_size': 14, | |
147 | } for u in users] |
|
147 | } for u in users] | |
148 | ) |
|
148 | ) |
@@ -1076,8 +1076,9 b' var autocompleteHighlightMatch = functio' | |||||
1076 | + "</span>" + full.substring(matchindex + snippet.length); |
|
1076 | + "</span>" + full.substring(matchindex + snippet.length); | |
1077 | }; |
|
1077 | }; | |
1078 |
|
1078 | |||
|
1079 | // Return html snippet for showing the provided gravatar url | |||
1079 | var gravatar = function(gravatar_lnk, size, cssclass) { |
|
1080 | var gravatar = function(gravatar_lnk, size, cssclass) { | |
1080 | if (!gravatar_lnk) { |
|
1081 | if (!gravatar_lnk || gravatar_lnk == 'default') { | |
1081 | return '<i class="icon-user {1}" style="font-size: {0}px;"></i>'.format(size, cssclass); |
|
1082 | return '<i class="icon-user {1}" style="font-size: {0}px;"></i>'.format(size, cssclass); | |
1082 | } |
|
1083 | } | |
1083 | return '<img alt="" class="{2}" style="width: {0}px; height: {0}px" src="{1}"/>'.format(size, gravatar_lnk, cssclass); |
|
1084 | return '<img alt="" class="{2}" style="width: {0}px; height: {0}px" src="{1}"/>'.format(size, gravatar_lnk, cssclass); |
@@ -279,7 +279,7 b'' | |||||
279 | fname="${u.name}" |
|
279 | fname="${u.name}" | |
280 | lname="${u.lastname}" |
|
280 | lname="${u.lastname}" | |
281 | nname="${u.username}" |
|
281 | nname="${u.username}" | |
282 | gravatar_lnk="${h.gravatar_url(u.email, size=28)}" |
|
282 | gravatar_lnk="${h.gravatar_url(u.email, size=28, default='default')}" | |
283 | gravatar_size="14" |
|
283 | gravatar_size="14" | |
284 | title="Click to add reviewer to the list, then Save Changes.">${u.full_name}</a> |
|
284 | title="Click to add reviewer to the list, then Save Changes.">${u.full_name}</a> | |
285 | </li> |
|
285 | </li> |
General Comments 0
You need to be logged in to leave comments.
Login now