kallithea Changeset - 7a7b817aa156

Changeset - 7a7b817aa156

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 10 years ago 2016-05-04 01:18:25
madski@unity3d.com

helpers: cleanup of gravatar handling

2 files changed with 32 insertions and 33 deletions:

kallithea/lib/helpers.py

kallithea/public/js/base.js

0 comments (0 inline, 0 general)

kallithea/lib/helpers.py

➞

Show inline comments

@@ @@ -839,7 +839,7 @@ HasRepoGroupPermissionAny @@
 #==============================================================================
 # GRAVATAR URL
 #==============================================================================
-def gravatar(email_address, cls='', size=30, ssl_enabled=True):
 def gravatar(email_address, cls='', size=30):
     """return html element of the gravatar
     This method will return an <img> with the resolution double the size (for
@@ @@ -847,44 +847,42 @@ def gravatar(email_address, cls='', size @@
     empty then we fallback to using an icon.
     """
-    src = gravatar_url(email_address, size*2, ssl_enabled)
+    src = gravatar_url(email_address, size * 2)
     #  here it makes sense to use style="width: ..." (instead of, say, a
     # stylesheet) because we using this to generate a high-res (retina) size
     tmpl = '<img alt="" class="{cls}" style="width: {size}px; height: {size}px" src="{src}"/>'
     if src:
         # here it makes sense to use style="width: ..." (instead of, say, a
         # stylesheet) because we using this to generate a high-res (retina) size
         html = ('<img alt="" class="{cls}" style="width: {size}px; height: {size}px" src="{src}"/>'
             .format(cls=cls, size=size, src=src))
     # if src is empty then there was no gravatar, so we use a font icon
     if not src:
         tmpl = """<i class="icon-user {cls}" style="font-size: {size}px;"></i>"""
     else:
         # if src is empty then there was no gravatar, so we use a font icon
         html = ("""<i class="icon-user {cls}" style="font-size: {size}px;"></i>"""
             .format(cls=cls, size=size, src=src))
     tmpl = tmpl.format(cls=cls, size=size, src=src)
     return literal(tmpl)
     return literal(html)
-def gravatar_url(email_address, size=30, ssl_enabled=True):
 def gravatar_url(email_address, size=30):
     # doh, we need to re-import those to mock it later
     from pylons import url
     from pylons import tmpl_context as c
     if not c.visual.use_gravatar:
         return ""
     _def = 'anonymous@kallithea-scm.org'  # default gravatar
     _use_gravatar = c.visual.use_gravatar
     _gravatar_url = c.visual.gravatar_url or User.DEFAULT_GRAVATAR_URL
     email_address = email_address or _def
-    if not _use_gravatar or not email_address or email_address == _def:
     if email_address == _def:
         return ""
     if _use_gravatar:
         _md5 = lambda s: hashlib.md5(s).hexdigest()
         tmpl = _gravatar_url
         parsed_url = urlparse.urlparse(url.current(qualified=True))
         tmpl = tmpl.replace('{email}', email_address) \
                    .replace('{md5email}', _md5(safe_str(email_address).lower())) \
                    .replace('{netloc}', parsed_url.netloc) \
                    .replace('{scheme}', parsed_url.scheme) \
                    .replace('{size}', safe_str(size))
         return tmpl
     parsed_url = urlparse.urlparse(url.current(qualified=True))
     url = (c.visual.gravatar_url or User.DEFAULT_GRAVATAR_URL ) \
                .replace('{email}', email_address) \
                .replace('{md5email}', hashlib.md5(safe_str(email_address).lower()).hexdigest()) \
                .replace('{netloc}', parsed_url.netloc) \
                .replace('{scheme}', parsed_url.scheme) \
                .replace('{size}', safe_str(size))
     return url
 class Page(_Page):
     """

kallithea/public/js/base.js

➞

Show inline comments

@@ @@ -1076,18 +1076,19 @@ var autocompleteHighlightMatch = functio @@
         + "</span>" + full.substring(matchindex + snippet.length);
 };
 var gravatar = function(link, size, cssclass) {
     var elem = '<img alt="" class="{2}" style="width: {0}px; height: {0}px" src="{1}"/>'.format(size, link, cssclass);
     if (!link) {
         elem = '<i class="icon-user {1}" style="font-size: {0}px;"></i>'.format(size, cssclass);
 var gravatar = function(gravatar_lnk, size, cssclass) {
     if (!gravatar_lnk) {
         return '<i class="icon-user {1}" style="font-size: {0}px;"></i>'.format(size, cssclass);
+    }
-    return elem;
+    return '<img alt="" class="{2}" style="width: {0}px; height: {0}px" src="{1}"/>'.format(size, gravatar_lnk, cssclass);
+}
 var autocompleteGravatar = function(res, link, size, group) {
     var elem = gravatar(link, size, "perm-gravatar-ac");
 var autocompleteGravatar = function(res, gravatar_lnk, size, group) {
     var elem;
     if (group !== undefined) {
         elem = '<i class="perm-gravatar-ac icon-users"></i>';
     } else {
         elem = gravatar(gravatar_lnk, size, "perm-gravatar-ac");
+    }
     return '<div class="ac-container-wrap">{0}{1}</div>'.format(elem, res);
+}

0 comments (0 inline, 0 general)