Mercurial > kallithea

changeset 5896:b9688c512c63

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
helpers: more efficient disabling of gravatars - don't leave spacing behind
author Mads Kiilerich <madski@unity3d.com>
date Wed, 04 May 2016 01:18:25 +0200
parents f287754980cc
children 54e9131c3aa6
files kallithea/lib/helpers.py kallithea/public/js/base.js kallithea/templates/admin/my_account/my_account_emails.html kallithea/templates/admin/users/user_edit_emails.html kallithea/templates/changeset/changeset_range.html kallithea/templates/compare/compare_cs.html
diffstat 6 files changed, 27 insertions(+), 3 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
@@ -840,10 +840,13 @@
 # GRAVATAR URL
 #==============================================================================
 def gravatar_div(email_address, cls='', size=30, **div_attributes):
-    """Return an html literal with a div around a gravatar.
+    """Return an html literal with a div around a gravatar if they are enabled.
     Extra keyword parameters starting with 'div_' will get the prefix removed
     and be used as attributes on the div. The default class is 'gravatar'.
     """
+    from pylons import tmpl_context as c
+    if not c.visual.use_gravatar:
+        return ''
     if 'div_class' not in div_attributes:
         div_attributes['div_class'] = "gravatar"
     attributes = []
@@ -862,6 +865,10 @@
     empty then we fallback to using an icon.
 
     """
+    from pylons import tmpl_context as c
+    if not c.visual.use_gravatar:
+        return ''
+
     src = gravatar_url(email_address, size * 2)
 
     if src:
--- 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
@@ -1078,7 +1078,10 @@
 
 // Return html snippet for showing the provided gravatar url
 var gravatar = function(gravatar_lnk, size, cssclass) {
-    if (!gravatar_lnk || gravatar_lnk == 'default') {
+    if (!gravatar_lnk) {
+        return '';
+    }
+    if (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);
@@ -1317,7 +1320,9 @@
         '           <div class="reviewer_status tooltip" title="not_reviewed">\n'+
         '             <i class="icon-circle changeset-status-not_reviewed"></i>\n'+
         '           </div>\n'+
-        '         <div class="reviewer_gravatar gravatar">{0}</div>\n'+
+        (gravatarelm ?
+        '         <div class="reviewer_gravatar gravatar">{0}</div>\n' :
+        '')+
         '         <div style="float:left;">{1}</div>\n'+
         '         <input type="hidden" value="{2}" name="review_members" />\n'+
         '         <div class="reviewer_member_remove action_button" onclick="removeReviewMember({2})">\n'+
--- a/kallithea/templates/admin/my_account/my_account_emails.html	Wed May 04 01:18:25 2016 +0200
+++ b/kallithea/templates/admin/my_account/my_account_emails.html	Wed May 04 01:18:25 2016 +0200
@@ -1,7 +1,9 @@
 <div class="emails_wrap">
   <table class="noborder">
     <tr>
+    %if c.visual.use_gravatar:
     <td>${h.gravatar_div(c.user.email, size=16)}</td>
+    %endif
     <td><div class="email">${c.user.email}</div></td>
     <td>
         <span class="btn btn-mini btn-success disabled">${_('Primary')}</span>
@@ -10,7 +12,9 @@
     %if c.user_email_map:
         %for em in c.user_email_map:
           <tr>
+            %if c.visual.use_gravatar:
             <td>${h.gravatar_div(em.email, size=16)}</td>
+            %endif
             <td><div class="email">${em.email}</div></td>
             <td>
                 ${h.form(url('my_account_emails'),method='delete')}
--- a/kallithea/templates/admin/users/user_edit_emails.html	Wed May 04 01:18:25 2016 +0200
+++ b/kallithea/templates/admin/users/user_edit_emails.html	Wed May 04 01:18:25 2016 +0200
@@ -1,7 +1,9 @@
 <div class="emails_wrap">
   <table class="noborder">
     <tr>
+    %if c.visual.use_gravatar:
     <td>${h.gravatar_div(c.user.email, size=16)}</td>
+    %endif
     <td><div class="email">${c.user.email}</div></td>
     <td>
         <span class="btn btn-mini btn-success disabled">${_('Primary')}</span>
@@ -10,7 +12,9 @@
     %if c.user_email_map:
         %for em in c.user_email_map:
           <tr>
+            %if c.visual.use_gravatar:
             <td>${h.gravatar_div(c.user.email, size=16)}</td>
+            %endif
             <td><div class="email">${em.email}</div></td>
             <td>
                 ${h.form(url('edit_user_emails', id=c.user.user_id),method='delete')}
--- a/kallithea/templates/changeset/changeset_range.html	Wed May 04 01:18:25 2016 +0200
+++ b/kallithea/templates/changeset/changeset_range.html	Wed May 04 01:18:25 2016 +0200
@@ -39,7 +39,9 @@
             <table class="compare_view_commits noborder">
             %for cnt,cs in enumerate(c.cs_ranges):
                 <tr>
+                %if c.visual.use_gravatar:
                 <td>${h.gravatar_div(h.email_or_none(cs.author), size=14)}</td>
+                %endif
                 <td>${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}</td>
                 <td><div class="author">${h.person(cs.author)}</div></td>
                 <td><span class="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td>
--- a/kallithea/templates/compare/compare_cs.html	Wed May 04 01:18:25 2016 +0200
+++ b/kallithea/templates/compare/compare_cs.html	Wed May 04 01:18:25 2016 +0200
@@ -52,7 +52,9 @@
           </span>
         </td>
         <td style="width: 140px"><span class="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td>
+        %if c.visual.use_gravatar:
         <td>${h.gravatar_div(h.email_or_none(cs.author), size=14, div_commit_id="${cs.raw_id}")}</td>
+        %endif
         <td><div class="author">${h.person(cs.author)}</div></td>
         <td>${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}</td>
         <td>