Changeset - 3c1cdd1c1736
Parent rev.
Child rev.
[Not reviewed]
default
0 2 0
Mads Kiilerich - 8 years ago 2017-08-24 02:50:04
mads@kiilerich.com
changelog: simplify message expansion toggling

Slightly simpler, slightly less html, slightly smaller DOM.
2 files changed with 6 insertions and 8 deletions:
kallithea/templates/changelog/changelog.html
3
4
kallithea/templates/compare/compare_cs.html
3
4
0 comments (0 inline, 0 general)
kallithea/templates/changelog/changelog.html
➞
Show inline comments
 
@@ -83,54 +83,54 @@ ${self.repo_context_bar('changelog', c.f
 
                        <td class="status">
 
                          %if c.statuses.get(cs.raw_id):
 
                            %if c.statuses.get(cs.raw_id)[2]:
 
                              <a data-toggle="tooltip" title="${_('Changeset status: %s by %s\nClick to open associated pull request %s') % (c.statuses.get(cs.raw_id)[1], c.statuses.get(cs.raw_id)[5].username, c.statuses.get(cs.raw_id)[4])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}">
 
                                <i class="icon-circle changeset-status-${c.statuses.get(cs.raw_id)[0]}"></i>
 
                              </a>
 
                            %else:
 
                              <a data-toggle="tooltip" title="${_('Changeset status: %s by %s') % (c.statuses.get(cs.raw_id)[1], c.statuses.get(cs.raw_id)[5].username)}"
 
                                 href="${c.comments[cs.raw_id][0].url()}">
 
                                  <i class="icon-circle changeset-status-${c.statuses.get(cs.raw_id)[0]}"></i>
 
                              </a>
 
                            %endif
 
                          %endif
 
                        </td>
 
                        <td class="author" data-toggle="tooltip" title="${cs.author}">
 
                            ${h.gravatar(h.email_or_none(cs.author), size=16)}
 
                            <span class="user">${h.person(cs.author)}</span>
 
                        </td>
 
                        <td class="hash">
 
                            ${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id), class_='changeset_hash')}
 
                        </td>
 
                        <td class="date">
 
                            <div class="date" data-toggle="tooltip" title="${h.fmt_date(cs.date)}">${h.age(cs.date,True)}</div>
 
                        </td>
 
                        <td class="expand_commit" data-commit_id="${cs.raw_id}" title="${_('Expand commit message')}">
 
                        <td class="expand_commit" title="${_('Expand commit message')}">
 
                            <i class="icon-align-left"></i>
 
                        </td>
 
                        <td class="mid">
 
                            <div class="log-container">
 
                                <div class="message" id="C-${cs.raw_id}">${h.urlify_text(cs.message, c.repo_name,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>
 
                                <div class="message">${h.urlify_text(cs.message, c.repo_name,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>
 
                                <div class="extra-container">
 
                                    %if c.comments.get(cs.raw_id):
 
                                        <a class="comments-container comments-cnt" href="${c.comments[cs.raw_id][0].url()}" data-toggle="tooltip" title="${_('%s comments') % len(c.comments[cs.raw_id])}">
 
                                            ${len(c.comments[cs.raw_id])}
 
                                            <i class="icon-comment-discussion"></i>
 
                                        </a>
 
                                    %endif
 
                                    %if cs.bumped:
 
                                        <span class="bumpedtag" title="Bumped">
 
                                            Bumped
 
                                        </span>
 
                                    %endif
 
                                    %if cs.divergent:
 
                                        <span class="divergenttag" title="Divergent">
 
                                            Divergent
 
                                        </span>
 
                                    %endif
 
                                    %if cs.extinct:
 
                                        <span class="extincttag" title="Extinct">
 
                                            Extinct
 
                                        </span>
 
                                    %endif
 
                                    %if cs.unstable:
 
                                        <span class="unstabletag" title="Unstable">
 
@@ -265,50 +265,49 @@ ${self.repo_context_bar('changelog', c.f
 
                $('#singlerange').click(checkbox_checker);
 

			




	
	
	
		
 
                $('#rev_range_clear').click(function(e){

			




	
	
	
		
 
                    $checkboxes.prop('checked', false);

			




	
	
	
		
 
                    checkbox_checker();

			




	
	
	
		
 
                    graph.render(jsdata);

			




	
	
	
		
 
                });

			




	
	
	
		
 

			




	
	
	
		
 
                var $msgs = $('.message');

			




	
	
	
		
 
                // get first element height

			




	
	
	
		
 
                var el = $('#graph_content tr')[0];

			




	
	
	
		
 
                var row_h = el.clientHeight;

			




	
	
	
		
 
                $msgs.each(function() {

			




	
	
	
		
 
                    var m = this;

			




	
	
	
		
 

			




	
	
	
		
 
                    var h = m.clientHeight;

			




	
	
	
		
 
                    if(h > row_h){

			




	
	
	
		
 
                        var offset = row_h - (h+12);

			




	
	
	
		
 
                        $(m.nextElementSibling).css('display', 'block');

			




	
	
	
		
 
                        $(m.nextElementSibling).css('margin-top', offset+'px');

			




	
	
	
		
 
                    }

			




	
	
	
		
 
                });

			




	
	
	
		
 

			




	
	
	
		
 
                $('.expand_commit').on('click',function(e){

			




	
	
	
		
 
                    var cid = $(this).data('commit_id');

			




	
	
	
		
 
                    $('#C-'+cid).toggleClass('expanded');

			




	
	
	
		
 
                    $(this).next('.mid').find('.message').toggleClass('expanded');

			




	
	
	
		
 

			




	
	
	
		
 
                    //redraw the graph, r and jsdata are bound outside function

			




	
	
	
		
 
                    graph.render(jsdata);

			




	
	
	
		
 
                });

			




	
	
	
		
 

			




	
	
	
		
 
                // change branch filter

			




	
	
	
		
 
                $("#branch_filter").select2({

			




	
	
	
		
 
                    dropdownAutoWidth: true,

			




	
	
	
		
 
                    maxResults: 50,

			




	
	
	
		
 
                    sortResults: branchSort

			




	
	
	
		
 
                    });

			




	
	
	
		
 

			




	
	
	
		
 
                $("#branch_filter").change(function(e){

			




	
	
	
		
 
                    var selected_branch = e.currentTarget.options[e.currentTarget.selectedIndex].value;

			




	
	
	
		
 
                    if(selected_branch != ''){

			




	
	
	
		
 
                        window.location = pyroutes.url('changelog_home', {'repo_name': ${h.js(c.repo_name)},

			




	
	
	
		
 
                                                                          'branch': selected_branch});

			




	
	
	
		
 
                    }else{

			




	
	
	
		
 
                        window.location = pyroutes.url('changelog_home', {'repo_name': ${h.js(c.repo_name)}});

			




	
	
	
		
 
                    }

			




	
	
	
		
 
                    $("#changelog").hide();

			




	
	
	
		
 
                });

			




	
	
	
		
 

			




	
	
	
		
 
                graph.render(jsdata);

			




        

    


    
    

    

        

                

                    kallithea/templates/compare/compare_cs.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -52,93 +52,92 @@

			




	
	
	
		
 
              num_cs = len(c.cs_ranges)

			




	
	
	
		
 
              index = num_cs - cnt

			




	
	
	
		
 
              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 data-toggle="tooltip" title="${title}">

			




	
	
	
		
 
            ${index}

			




	
	
	
		
 
          </span>

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td><span data-toggle="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td>

			




	
	
	
		
 
        <td class="author">

			




	
	
	
		
 
            ${h.gravatar(h.email_or_none(cs.author), size=16)}

			




	
	
	
		
 
            <span data-toggle="tooltip" title="${cs.author}" class="user">${h.person(cs.author)}</span>

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td>${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id), class_='changeset_hash')}</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" data-commit_id="${cs.raw_id}" title="${_('Expand commit message')}">

			




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

			




	
	
	
		
 
            <i class="icon-align-left"></i>

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td class="mid">

			




	
	
	
		
 
            <div class="pull-right">

			




	
	
	
		
 
                %for tag in cs.tags:

			




	
	
	
		
 
                    <span class="tagtag" title="${_('Tag %s') % tag}">

			




	
	
	
		
 
                        ${h.link_to(tag,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}

			




	
	
	
		
 
                    </span>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div id="C-${cs.raw_id}" class="message">${h.urlify_text(cs.message, c.repo_name)}</div>

			




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

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
      </tr>

			




	
	
	
		
 
    %endfor

			




	
	
	
		
 
    </table>

			




	
	
	
		
 

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    %if c.is_ajax_preview:

			




	
	
	
		
 
      <h5>

			




	
	
	
		
 
      ## links should perhaps use ('rev', c.a_rev) instead ...

			




	
	
	
		
 
      ${h.link_to(_('Show merge diff'),

			




	
	
	
		
 
        h.url('compare_url',

			




	
	
	
		
 
          repo_name=c.a_repo.repo_name,

			




	
	
	
		
 
          org_ref_type=c.a_ref_type, org_ref_name=c.a_ref_name,

			




	
	
	
		
 
          other_repo=c.cs_repo.repo_name,

			




	
	
	
		
 
          other_ref_type=c.cs_ref_type, other_ref_name=c.cs_ref_name,

			




	
	
	
		
 
          merge='1')

			




	
	
	
		
 
        )}

			




	
	
	
		
 
      </h5>

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
    %if c.cs_ranges_org is not None:

			




	
	
	
		
 
      ## TODO: list actual changesets?

			




	
	
	
		
 
      <div>

			




	
	
	
		
 
        ${h.link_to_ref(c.cs_repo.repo_name, c.cs_ref_type, c.cs_ref_name, c.cs_rev)}

			




	
	
	
		
 
        ${_('is')}

			




	
	
	
		
 
        <a href="${c.swap_url}">${_('%s changesets') % (len(c.cs_ranges_org))}</a>

			




	
	
	
		
 
        ${_('behind')}

			




	
	
	
		
 
        ${h.link_to_ref(c.a_repo.repo_name, c.a_ref_type, c.a_ref_name)}

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
  %endif

			




	
	
	
		
 
</div>

			




	
	
	
		
 

			




	
	
	
		
 
%if c.is_ajax_preview:

			




	
	
	
		
 
<div id="jsdata" style="display:none">${h.js(c.jsdata)}</div>

			




	
	
	
		
 
%else:

			




	
	
	
		
 
<script type="text/javascript" src="${h.url('/js/graph.js', ver=c.kallithea_version)}"></script>

			




	
	
	
		
 
%endif

			




	
	
	
		
 

			




	
	
	
		
 
<script type="text/javascript">

			




	
	
	
		
 
    var jsdata = ${h.js(c.jsdata)};

			




	
	
	
		
 
    var graph = new BranchRenderer('graph_canvas', 'graph_content_pr', 'chg_');

			




	
	
	
		
 

			




	
	
	
		
 
    $(document).ready(function(){

			




	
	
	
		
 
        graph.render(jsdata);

			




	
	
	
		
 

			




	
	
	
		
 
        $('.expand_commit').click(function(e){

			




	
	
	
		
 
            var cid = $(this).data('commit_id');

			




	
	
	
		
 
            $('#C-'+cid).toggleClass('expanded');

			




	
	
	
		
 
            $(this).next('.mid').find('.message').toggleClass('expanded');

			




	
	
	
		
 
            graph.render(jsdata);

			




	
	
	
		
 
        });

			




	
	
	
		
 
    });

			




	
	
	
		
 
    $(window).resize(function(){

			




	
	
	
		
 
        graph.render(jsdata);

			




	
	
	
		
 
    });

			




	
	
	
		
 

			




	
	
	
		
 
</script>

			




        

    



    


    



    



      

      





    
    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.