Changeset - 458fd829aa20
Parent rev.
Child rev.
[Not reviewed]
default
0 3 0
Mads Kiilerich - 12 years ago 2013-06-12 12:20:57
madski@unity3d.com
Grafted from: e666eeeee5be
pull requests: add a 'Changeset status' comment on changeset status
3 files changed with 7 insertions and 5 deletions:
rhodecode/templates/changelog/changelog.html
5
3
rhodecode/templates/changelog/changelog_summary_data.html
1
1
rhodecode/templates/compare/compare_cs.html
1
1
0 comments (0 inline, 0 general)
rhodecode/templates/changelog/changelog.html
➞
Show inline comments
 
@@ -30,125 +30,127 @@ ${self.repo_context_bar('changelog')}
 
    <div class="title">
 
        ${self.breadcrumbs()}
 
    </div>
 
    <div class="table">
 
        % if c.pagination:
 
            <div id="graph">
 
                <div style="display:${'none' if c.changelog_for_path else ''}">
 
                    <div class="info_box" style="clear: both;padding: 10px 6px;min-height: 12px;text-align: right;">
 
                        <a href="#" class="ui-btn small" id="rev_range_container" style="display:none"></a>
 
                        <a href="#" class="ui-btn small" id="rev_range_clear" style="display:none">${_('Clear selection')}</a>
 

			




	
	
	
		
 
                        %if c.rhodecode_db_repo.fork:

			




	
	
	
		
 
                            <a id="compare_fork" title="${_('Compare fork with %s' % c.rhodecode_db_repo.fork.repo_name)}" href="${h.url('compare_url',repo_name=c.rhodecode_db_repo.fork.repo_name,org_ref_type='branch',org_ref='default',other_repo=c.repo_name,other_ref_type='branch',other_ref=request.GET.get('branch') or 'default',merge=1)}" class="ui-btn small">${_('Compare fork with parent')}</a>

			




	
	
	
		
 
                        %endif

			




	
	
	
		
 
                        %if h.is_hg(c.rhodecode_repo):

			




	
	
	
		
 
                        <a id="open_new_pr" href="${h.url('pullrequest_home',repo_name=c.repo_name)}" class="ui-btn small">${_('Open new pull request')}</a>

			




	
	
	
		
 
                        %endif

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                    <div class="container_header">

			




	
	
	
		
 
                        ${h.form(h.url.current(),method='get')}

			




	
	
	
		
 
                        <div style="float:left">

			




	
	
	
		
 
                            ${h.submit('set',_('Show'),class_="ui-btn")}

			




	
	
	
		
 
                            ${h.text('size',size=1,value=c.size)}

			




	
	
	
		
 
                            ${_('revisions')}

			




	
	
	
		
 
                        </div>

			




	
	
	
		
 
                        ${h.end_form()}

			




	
	
	
		
 
                        <div style="float:right">${h.select('branch_filter',c.branch_name,c.branch_filters)}</div>

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div id="graph_nodes">

			




	
	
	
		
 
                    <canvas id="graph_canvas"></canvas>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div id="graph_content">

			




	
	
	
		
 

			




	
	
	
		
 
                <table id="changesets">

			




	
	
	
		
 
                <tbody>

			




	
	
	
		
 
                %for cnt,cs in enumerate(c.pagination):

			




	
	
	
		
 
                    <tr id="chg_${cnt+1}" class="container ${'tablerow%s' % (cnt%2)}">

			




	
	
	
		
 
                        <td class="checkbox">

			




	
	
	
		
 
                            %if c.changelog_for_path:

			




	
	
	
		
 
                                ${h.checkbox(cs.raw_id,class_="changeset_range", disabled="disabled")}

			




	
	
	
		
 
                            %else:

			




	
	
	
		
 
                                ${h.checkbox(cs.raw_id,class_="changeset_range")}

			




	
	
	
		
 
                            %endif

			




	
	
	
		
 
                        <td class="status">

			




	
	
	
		
 
                          %if c.statuses.get(cs.raw_id):

			




	
	
	
		
 
                            <div class="changeset-status-ico">

			




	
	
	
		
 
                            %if c.statuses.get(cs.raw_id)[2]:

			




	
	
	
		
 
                              <a class="tooltip" title="${_('Click to open associated pull request #%s' % c.statuses.get(cs.raw_id)[2])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}">

			




	
	
	
		
 
                              <a class="tooltip" title="${_('Changeset status: %s\nClick to open associated pull request #%s') % (c.statuses.get(cs.raw_id)[0], c.statuses.get(cs.raw_id)[2])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}">

			




	
	
	
		
 
                                <img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses.get(cs.raw_id)[0])}" />

			




	
	
	
		
 
                              </a>

			




	
	
	
		
 
                            %else:

			




	
	
	
		
 
                              <img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses.get(cs.raw_id)[0])}" />

			




	
	
	
		
 
                              <a class="tooltip" title="${_('Changeset status: %s') % c.statuses.get(cs.raw_id)[0]}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}">

			




	
	
	
		
 
                                  <img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses.get(cs.raw_id)[0])}" />

			




	
	
	
		
 
                              </a>

			




	
	
	
		
 
                            %endif

			




	
	
	
		
 
                            </div>

			




	
	
	
		
 
                          %endif

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td class="author">

			




	
	
	
		
 
                            <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),16)}"/>

			




	
	
	
		
 
                            <span title="${cs.author}" class="user">${h.shorter(h.person(cs.author),22)}</span>

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td class="hash" style="width:${len(h.show_id(cs))*6.5}px">

			




	
	
	
		
 
                            <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}">

			




	
	
	
		
 
                                <span class="changeset_hash">${h.show_id(cs)}</span>

			




	
	
	
		
 
                            </a>

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td class="date">

			




	
	
	
		
 
                            <div class="date">${h.age(cs.date,True)}</div>

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td class="mid">

			




	
	
	
		
 
                            <div class="log-container">

			




	
	
	
		
 
                                <div class="message">${h.urlify_commit(cs.message, c.repo_name,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>

			




	
	
	
		
 
                                <div class="expand"><span class="expandtext">&darr; ${_('Show more')} &darr;</span></div>

			




	
	
	
		
 
                                <div class="extra-container">

			




	
	
	
		
 
                                    %if c.comments.get(cs.raw_id):

			




	
	
	
		
 
                                        <div class="comments-container">

			




	
	
	
		
 
                                            <div class="comments-cnt" title="${('comments')}">

			




	
	
	
		
 
                                            <div class="comments-cnt" title="${_('Changeset has comments')}">

			




	
	
	
		
 
                                                <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}">

			




	
	
	
		
 
                                                    ${len(c.comments[cs.raw_id])}

			




	
	
	
		
 
                                                </a>

			




	
	
	
		
 
                                            </div>

			




	
	
	
		
 
                                        </div>

			




	
	
	
		
 
                                    %endif

			




	
	
	
		
 
                                    %if h.is_hg(c.rhodecode_repo):

			




	
	
	
		
 
                                        %for book in cs.bookmarks:

			




	
	
	
		
 
                                            <div class="booktag" title="${_('Bookmark %s') % book}">

			




	
	
	
		
 
                                                ${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}

			




	
	
	
		
 
                                            </div>

			




	
	
	
		
 
                                        %endfor

			




	
	
	
		
 
                                    %endif

			




	
	
	
		
 
                                    %for tag in cs.tags:

			




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

			




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

			




	
	
	
		
 
                                        </div>

			




	
	
	
		
 
                                    %endfor

			




	
	
	
		
 
                                    %if (not c.branch_name) and cs.branch:

			




	
	
	
		
 
                                        <div class="branchtag" title="${_('Branch %s' % cs.branch)}">

			




	
	
	
		
 
                                            ${h.link_to(h.shorter(cs.branch),h.url('changelog_home',repo_name=c.repo_name,branch=cs.branch))}

			




	
	
	
		
 
                                        </div>

			




	
	
	
		
 
                                    %endif

			




	
	
	
		
 
                                </div>

			




	
	
	
		
 
                            </div>

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                    </tr>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
                </tbody>

			




	
	
	
		
 
                </table>

			




	
	
	
		
 

			




	
	
	
		
 
                <div class="pagination-wh pagination-left">

			




	
	
	
		
 
                    ${c.pagination.pager('$link_previous ~2~ $link_next')}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




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

			




	
	
	
		
 
        <script type="text/javascript">

			




	
	
	
		
 
            YAHOO.util.Event.onDOMReady(function(){

			




	
	
	
		
 

			




	
	
	
		
 
                //Monitor range checkboxes and build a link to changesets

			




	
	
	
		
 
                //ranges

			




	
	
	
		
 
                var checkboxes = YUD.getElementsByClassName('changeset_range');

			




	
	
	
		
 
                // register our routes needed for this view

			




	
	
	
		
 
                pyroutes.register('changeset_home', "${h.url('changeset_home', repo_name='%(repo_name)s', revision='%(revision)s')}", ['repo_name', 'revision']);

			




	
	
	
		
 
                pyroutes.register('changelog_home', "${h.url('changelog_home', repo_name='%(repo_name)s')}", ['repo_name']);

			




	
	
	
		
 
                pyroutes.register('pullrequest_home', "${h.url('pullrequest_home', repo_name='%(repo_name)s')}", ['repo_name']);

			




        

    


    
    

    

        

                

                    rhodecode/templates/changelog/changelog_summary_data.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
## -*- coding: utf-8 -*-

			




	
	
	
		
 
%if c.repo_changesets:

			




	
	
	
		
 
<table class="table_disp">

			




	
	
	
		
 
    <tr>

			




	
	
	
		
 
        <th class="left">${_('Revision')}</th>

			




	
	
	
		
 
        <th class="left">${_('Commit message')}</th>

			




	
	
	
		
 
        <th class="left">${_('Age')}</th>

			




	
	
	
		
 
        <th class="left">${_('Author')}</th>

			




	
	
	
		
 
        <th class="left">${_('Refs')}</th>

			




	
	
	
		
 
    </tr>

			




	
	
	
		
 
%for cnt,cs in enumerate(c.repo_changesets):

			




	
	
	
		
 
    <tr class="parity${cnt%2}">

			




	
	
	
		
 
        <td>

			




	
	
	
		
 
          <div>

			




	
	
	
		
 
            <div class="changeset-status-container">

			




	
	
	
		
 
              %if c.comments.get(cs.raw_id,[]):

			




	
	
	
		
 
               <div class="comments-container">

			




	
	
	
		
 
                   <div class="comments-cnt" title="${('comments')}">

			




	
	
	
		
 
                       <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}">

			




	
	
	
		
 
                           ${len(c.comments[cs.raw_id])}

			




	
	
	
		
 
                       </a>

			




	
	
	
		
 
                   </div>

			




	
	
	
		
 
               </div>

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
              %if c.statuses.get(cs.raw_id):

			




	
	
	
		
 
                <div class="changeset-status-ico">

			




	
	
	
		
 
                %if c.statuses.get(cs.raw_id)[2]:

			




	
	
	
		
 
                  <a class="tooltip" title="${_('Click to open associated pull request #%s' % c.statuses.get(cs.raw_id)[2])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}">

			




	
	
	
		
 
                  <a class="tooltip" title="${_('Changeset status: %s\nClick to open associated pull request #%s') % (c.statuses.get(cs.raw_id)[0], c.statuses.get(cs.raw_id)[2])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}">

			




	
	
	
		
 
                    <img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses.get(cs.raw_id)[0])}" />

			




	
	
	
		
 
                  </a>

			




	
	
	
		
 
                %else:

			




	
	
	
		
 
                  <img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses.get(cs.raw_id)[0])}" />

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <pre><a href="${h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id)}">${h.show_id(cs)}</a></pre>

			




	
	
	
		
 
         </div>

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td>

			




	
	
	
		
 
            ${h.urlify_commit(h.truncate(cs.message,50),c.repo_name, h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td><span class="tooltip" title="${h.tooltip(h.fmt_date(cs.date))}">

			




	
	
	
		
 
                      ${h.age(cs.date)}</span>

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td title="${cs.author}">${h.person(cs.author)}</td>

			




	
	
	
		
 
        <td>

			




	
	
	
		
 
            %if h.is_hg(c.rhodecode_repo):

			




	
	
	
		
 
                %for book in cs.bookmarks:

			




	
	
	
		
 
                    <div class="booktag" title="${_('Bookmark %s') % book}">

			




	
	
	
		
 
                        ${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
            %for tag in cs.tags:

			




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

			




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

			




	
	
	
		
 
             </div>

			




	
	
	
		
 
            %endfor

			




	
	
	
		
 
            %if cs.branch:

			




	
	
	
		
 
             <div class="branchtag" title="${_('Branch %s' % cs.branch)}">

			




	
	
	
		
 
                 ${h.link_to(h.shorter(cs.branch),h.url('changelog_home',repo_name=c.repo_name,branch=cs.branch))}

			




	
	
	
		
 
             </div>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
    </tr>

			




	
	
	
		
 
%endfor

			




	
	
	
		
 

			




	
	
	
		
 
</table>

			




	
	
	
		
 

			




	
	
	
		
 
<script type="text/javascript">

			




	
	
	
		
 
  YUE.onDOMReady(function(){

			




	
	
	
		
 
    YUE.delegate("shortlog_data","click",function(e, matchedEl, container){

			




	
	
	
		
 
        ypjax(e.target.href,"shortlog_data",function(){tooltip_activate();});

			




	
	
	
		
 
        YUE.preventDefault(e);

			




	
	
	
		
 
    },'.pager_link');

			




        

    


    
    

    

        

                

                    rhodecode/templates/compare/compare_cs.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
## Changesets table !

			




	
	
	
		
 
<div class="container">

			




	
	
	
		
 
  %if not c.cs_ranges:

			




	
	
	
		
 
    <span class="empty_data">${_('No changesets')}</span>

			




	
	
	
		
 
  %else:

			




	
	
	
		
 
    <table class="compare_view_commits noborder">

			




	
	
	
		
 
    %for cs in reversed(c.cs_ranges):

			




	
	
	
		
 
        <tr>

			




	
	
	
		
 
        <td>

			




	
	
	
		
 
          %if cs.raw_id in c.statuses:

			




	
	
	
		
 
            <div title="${c.statuses[cs.raw_id][1]}" class="changeset-status-ico"><img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses[cs.raw_id][0])}" /></div>

			




	
	
	
		
 
            <div title="${_('Changeset status: %s') % c.statuses[cs.raw_id][1]}" class="changeset-status-ico"><img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses[cs.raw_id][0])}" /></div>

			




	
	
	
		
 
          %endif

			




	
	
	
		
 
        </td>

			




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

			




	
	
	
		
 
        <td><div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),14)}"/></div></td>

			




	
	
	
		
 
        <td><div class="author">${h.person(cs.author)}</div></td>

			




	
	
	
		
 
        <td>${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.other_repo.repo_name,revision=cs.raw_id))}

			




	
	
	
		
 
        %if c.as_form:

			




	
	
	
		
 
          ${h.hidden('revisions',cs.raw_id)}

			




	
	
	
		
 
        %endif

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td>

			




	
	
	
		
 
        %if cs.branch:

			




	
	
	
		
 
        <span class="branchtag">${cs.branch}</span>

			




	
	
	
		
 
        %endif

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td><div class="message tooltip" title="${h.tooltip(cs.message)}" style="white-space:normal">${h.urlify_commit(h.shorter(cs.message, 60),c.repo_name)}</div></td>

			




	
	
	
		
 
        </tr>

			




	
	
	
		
 
    %endfor

			




	
	
	
		
 
    </table>

			




	
	
	
		
 
    %if c.ancestor:

			




	
	
	
		
 
    <span class="ancestor">${_('Ancestor')}:

			




	
	
	
		
 
      ${h.link_to(h.short_id(c.ancestor),h.url('changeset_home',repo_name=c.repo_name,revision=c.ancestor))}

			




	
	
	
		
 
    </span>

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
    %if c.as_form:

			




	
	
	
		
 
      ${h.hidden('ancestor_rev',c.ancestor)}

			




	
	
	
		
 
      ${h.hidden('merge_rev',c.cs_ranges[-1].raw_id)}

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
  %endif

			




	
	
	
		
 
</div>

			




        

    



    


    



    



      

      





    
    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.