Changeset - b9688c512c63
Parent rev.
Child rev.
[Not reviewed]
default
0 6 0
Mads Kiilerich - 10 years ago 2016-05-04 01:18:25
madski@unity3d.com
helpers: more efficient disabling of gravatars - don't leave spacing behind
6 files changed with 27 insertions and 3 deletions:
kallithea/lib/helpers.py
8
1
kallithea/public/js/base.js
7
2
kallithea/templates/admin/my_account/my_account_emails.html
4
kallithea/templates/admin/users/user_edit_emails.html
4
kallithea/templates/changeset/changeset_range.html
2
kallithea/templates/compare/compare_cs.html
2
0 comments (0 inline, 0 general)
kallithea/lib/helpers.py
➞
Show inline comments
 
@@ -831,46 +831,53 @@ def action_parser(user_log, feed=False,
 
#==============================================================================
 
# PERMS
 
#==============================================================================
 
from kallithea.lib.auth import HasPermissionAny, HasPermissionAll, \
 
HasRepoPermissionAny, HasRepoPermissionAll, HasRepoGroupPermissionAll, \
 
HasRepoGroupPermissionAny
 

			




	
	
	
		
 

			




	
	
	
		
 
#==============================================================================

			




	
	
	
		
 
# 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 = []

			




	
	
	
		
 
    for k, v in sorted(div_attributes.items()):

			




	
	
	
		
 
        assert k.startswith('div_'), k

			




	
	
	
		
 
        attributes.append(' %s="%s"' % (k[4:], escape(v)))

			




	
	
	
		
 
    return literal("""<div%s>%s</div>""" %

			




	
	
	
		
 
                   (''.join(attributes),

			




	
	
	
		
 
                    gravatar(email_address, cls=cls, size=size)))

			




	
	
	
		
 

			




	
	
	
		
 
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

			




	
	
	
		
 
    retina screens) of the image. If the url returned from gravatar_url is

			




	
	
	
		
 
    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:

			




	
	
	
		
 
        # 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))

			




	
	
	
		
 

			




	
	
	
		
 
    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))

			




        

    


    
    

    

        

                

                    kallithea/public/js/base.js
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -1069,25 +1069,28 @@ var autocompleteMatchGroups = function (

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
// Helper highlight function for the formatter

			




	
	
	
		
 
var autocompleteHighlightMatch = function (full, snippet, matchindex) {

			




	
	
	
		
 
    return full.substring(0, matchindex)

			




	
	
	
		
 
        + "<span class='match'>"

			




	
	
	
		
 
        + full.substr(matchindex, snippet.length)

			




	
	
	
		
 
        + "</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 || 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);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
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");

			




	
	
	
		
 
    }

			




	
	
		
 
@@ -1308,25 +1311,27 @@ var addReviewMember = function(id,fname,

			




	
	
	
		
 
        displayname = "{0} {1} ({2})".format(fname, lname, nname);

			




	
	
	
		
 
    }

			




	
	
	
		
 
    var gravatarelm = gravatar(gravatar_link, gravatar_size, "");

			




	
	
	
		
 
    // WARNING: the HTML below is duplicate with

			




	
	
	
		
 
    // kallithea/templates/pullrequests/pullrequest_show.html

			




	
	
	
		
 
    // If you change something here it should be reflected in the template too.

			




	
	
	
		
 
    var element = (

			




	
	
	
		
 
        '     <li id="reviewer_{2}">\n'+

			




	
	
	
		
 
        '       <div class="reviewers_member">\n'+

			




	
	
	
		
 
        '           <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'+

			




	
	
	
		
 
        '             <i class="icon-minus-circled"></i>\n'+

			




	
	
	
		
 
        '         </div> (add not saved)\n'+

			




	
	
	
		
 
        '       </div>\n'+

			




	
	
	
		
 
        '     </li>\n'

			




	
	
	
		
 
        ).format(gravatarelm, displayname, id);

			




	
	
	
		
 
    // check if we don't have this ID already in

			




	
	
	
		
 
    var ids = [];

			




	
	
	
		
 
    $('#review_members').find('li').each(function() {

			




	
	
	
		
 
            ids.push(this.id);

			




        

    


    
    

    

        

                

                    kallithea/templates/admin/my_account/my_account_emails.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
<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>

			




	
	
	
		
 
    </td>

			




	
	
	
		
 
    </tr>

			




	
	
	
		
 
    %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')}

			




	
	
	
		
 
                    ${h.hidden('del_email_id',em.email_id)}

			




	
	
	
		
 
                    <i class="icon-minus-circled" style="color:#FF4444"></i>

			




	
	
	
		
 
                    ${h.submit('remove_',_('Delete'),id="remove_email_%s" % em.email_id,

			




	
	
	
		
 
                    class_="action_button", onclick="return  confirm('"+_('Confirm to delete this email: %s') % em.email+"');")}

			




	
	
	
		
 
                ${h.end_form()}

			




	
	
	
		
 
            </td>

			




	
	
	
		
 
          </tr>

			




	
	
	
		
 
        %endfor

			




	
	
	
		
 
    %else:

			




        

    


    
    

    

        

                

                    kallithea/templates/admin/users/user_edit_emails.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
<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>

			




	
	
	
		
 
    </td>

			




	
	
	
		
 
    </tr>

			




	
	
	
		
 
    %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')}

			




	
	
	
		
 
                    ${h.hidden('del_email_id',em.email_id)}

			




	
	
	
		
 
                    <i class="icon-minus-circled" style="color:#FF4444"></i>

			




	
	
	
		
 
                    ${h.submit('remove_',_('Delete'),id="remove_email_%s" % em.email_id,

			




	
	
	
		
 
                    class_="action_button", onclick="return  confirm('"+_('Confirm to delete this email: %s') % em.email+"');")}

			




	
	
	
		
 
                ${h.end_form()}

			




	
	
	
		
 
            </td>

			




	
	
	
		
 
          </tr>

			




	
	
	
		
 
        %endfor

			




	
	
	
		
 
    %else:

			




        

    


    
    

    

        

                

                    kallithea/templates/changeset/changeset_range.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -30,25 +30,27 @@ ${self.repo_context_bar('changelog')}

			




	
	
	
		
 
                    ${h.show_id(c.cs_ranges[0])}

			




	
	
	
		
 
                    <i class="icon-right"></i>

			




	
	
	
		
 
                    ${h.show_id(c.cs_ranges[-1])}

			




	
	
	
		
 
                    <a style="font-weight: bold" href="${h.url('compare_url',repo_name=c.repo_name,org_ref_type='rev',org_ref_name=getattr(c.cs_ranges[0].parents[0] if c.cs_ranges[0].parents else h.EmptyChangeset(),'raw_id'),other_ref_type='rev',other_ref_name=c.cs_ranges[-1].raw_id)}" class="btn btn-small"><i class="icon-git-compare"></i> Compare Revisions</a>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div id="changeset_compare_view_content">

			




	
	
	
		
 
            <div class="container">

			




	
	
	
		
 
            <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>

			




	
	
	
		
 
                <td>

			




	
	
	
		
 
                  %if c.statuses:

			




	
	
	
		
 
                    <div title="${_('Changeset status')}" class="changeset-status-ico"><i class="icon-circle changeset-status-${c.statuses[cnt]}"></i></div>

			




	
	
	
		
 
                  %endif

			




	
	
	
		
 
                </td>

			




	
	
	
		
 
                <td><div class="message">${h.urlify_commit(h.wrap_paragraphs(cs.message),c.repo_name)}</div></td>

			




	
	
	
		
 
                </tr>

			




	
	
	
		
 
            %endfor

			




	
	
	
		
 
            </table>

			




        

    


    
    

    

        

                

                    kallithea/templates/compare/compare_cs.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -43,25 +43,27 @@

			




	
	
	
		
 
              if index == 1:

			




	
	
	
		
 
                  title = _('First (oldest) changeset in this list')

			




	
	
	
		
 
              elif index == num_cs:

			




	
	
	
		
 
                  title = _('Last (most recent) changeset in this list')

			




	
	
	
		
 
              else:

			




	
	
	
		
 
                  title = _('Position in this list of changesets')

			




	
	
	
		
 
          %>

			




	
	
	
		
 
          <span class="tooltip" title="${title}">

			




	
	
	
		
 
            ${index}

			




	
	
	
		
 
          </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>

			




	
	
	
		
 
        %if cs.branch:

			




	
	
	
		
 
        <span class="branchtag">${h.link_to(cs.branch,h.url('changelog_home',repo_name=c.cs_repo.repo_name,branch=cs.branch))}</span>

			




	
	
	
		
 
        %endif

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td class="expand_commit" commit_id="${cs.raw_id}" title="${_('Expand commit message')}">

			




	
	
	
		
 
            <i class="icon-align-left" style="color:#999"></i>

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td>

			




	
	
	
		
 
            <div style="float: right; margin-top: -4px;">

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.