Changeset - fd4ea41c2dc1
Parent rev.
Child rev.
[Not reviewed]
default
0 3 0
Mads Kiilerich - 12 years ago 2013-06-12 02:13:05
madski@unity3d.com
Grafted from: fb679d015656
pull requests: make the difference between changeset comments with status and PR comments with votes more obvious
3 files changed with 11 insertions and 6 deletions:
rhodecode/templates/changeset/changeset_file_comment.html
10
4
rhodecode/templates/changeset/changeset_range.html
1
rhodecode/templates/pullrequests/pullrequest_show.html
1
1
0 comments (0 inline, 0 general)
rhodecode/templates/changeset/changeset_file_comment.html
➞
Show inline comments
 
## -*- coding: utf-8 -*-
 
## usage:
 
## <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
 
## ${comment.comment_block(co)}
 
##
 
<%def name="comment_block(co)">
 
  <div class="comment" id="comment-${co.comment_id}" line="${co.line_no}">
 
    <div class="comment-wrapp">
 
      <div class="meta">
 
        <div style="float:left"> <img src="${h.gravatar_url(co.author.email, 20)}" /> </div>
 
          <div class="user">
 
              ${co.author.username}
 
          </div>
 
          <div class="date">
 
              ${h.age(co.modified_at)}
 
          </div>
 

			




	
	
	
		
 
       <div style="float:left;padding:4px 0px 0px 5px">

			




	
	
	
		
 
        <span class="">

			




	
	
	
		
 
         %if co.pull_request:

			




	
	
	
		
 
            <a href="${h.url('pullrequest_show',repo_name=co.pull_request.other_repo.repo_name,pull_request_id=co.pull_request.pull_request_id)}">

			




	
	
	
		
 
            %if co.status_change:

			




	
	
	
		
 
              ${_('Status change on pull request #%s') % co.pull_request.pull_request_id}:

			




	
	
	
		
 
              ${_('Vote on pull request #%s') % co.pull_request.pull_request_id}:

			




	
	
	
		
 
            %else:

			




	
	
	
		
 
              ${_('Comment on pull request #%s') % co.pull_request.pull_request_id}

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
            </a>

			




	
	
	
		
 
         %else:

			




	
	
	
		
 
            %if co.status_change:

			




	
	
	
		
 
              ${_('Status change on changeset')}:

			




	
	
	
		
 
            %else:

			




	
	
	
		
 
              ${_('Comment on changeset')}

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
         %endif

			




	
	
	
		
 
        </span>

			




	
	
	
		
 
       </div>

			




	
	
	
		
 

			




	
	
	
		
 
        %if co.status_change:

			




	
	
	
		
 
           <div  style="float:left" class="changeset-status-container">

			




	
	
	
		
 
             <div style="float:left;padding:10px 2px 0px 2px"></div>

			




	
	
	
		
 
             <div title="${_('Changeset status')}" class="changeset-status-lbl"> ${co.status_change[0].status_lbl}</div>

			




	
	
	
		
 
             <div class="changeset-status-ico"><img src="${h.url(str('/images/icons/flag_status_%s.png' % co.status_change[0].status))}" /></div>

			




	
	
	
		
 
           </div>

			




	
	
	
		
 
        %endif

			




	
	
	
		
 

			




	
	
	
		
 
      <a class="permalink" href="#comment-${co.comment_id}">&para;</a>

			




	
	
	
		
 
      %if h.HasPermissionAny('hg.admin', 'repository.admin')() or co.author.user_id == c.rhodecode_user.user_id:

			




	
	
		
 
@@ -121,74 +121,80 @@

			




	
	
	
		
 

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
## generate inline comments and the main ones

			




	
	
	
		
 
<%def name="generate_comments(include_pr=False)">

			




	
	
	
		
 
<div class="comments">

			




	
	
	
		
 
    <div id="inline-comments-container">

			




	
	
	
		
 
    ## generate inlines for this changeset

			




	
	
	
		
 
     ${inlines()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    %for co in c.comments:

			




	
	
	
		
 
        <div id="comment-tr-${co.comment_id}">

			




	
	
	
		
 
          ## only render comments that are not from pull request, or from

			




	
	
	
		
 
          ## pull request and a status change

			




	
	
	
		
 
          %if not co.pull_request or (co.pull_request and co.status_change) or include_pr:

			




	
	
	
		
 
          ${comment_block(co)}

			




	
	
	
		
 
          %endif

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    %endfor

			




	
	
	
		
 
</div>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
## MAIN COMMENT FORM

			




	
	
	
		
 
<%def name="comments(post_url, cur_status, close_btn=False, change_status=True)">

			




	
	
	
		
 
<%def name="comments(post_url, cur_status, is_pr=False, change_status=True)">

			




	
	
	
		
 

			




	
	
	
		
 
<div class="comments">

			




	
	
	
		
 
    %if c.rhodecode_user.username != 'default':

			




	
	
	
		
 
    <div class="comment-form ac">

			




	
	
	
		
 
        ${h.form(post_url)}

			




	
	
	
		
 
        <div id="edit-container" class="clearfix">

			




	
	
	
		
 
            <div class="comment-help">

			




	
	
	
		
 
                ${(_('Comments parsed using %s syntax with %s support.') % (('<a href="%s">RST</a>' % h.url('rst_help')),

			




	
	
	
		
 
                  '<span style="color:#003367" class="tooltip" title="%s">@mention</span>' %

			




	
	
	
		
 
                  _('Use @username inside this text to send notification to this RhodeCode user')))|n}

			




	
	
	
		
 
              %if change_status:

			




	
	
	
		
 
                | <a id="show_changeset_link" onClick="change_status_show();"> ${_('Change status')}</a>

			




	
	
	
		
 
                | <a id="show_changeset_link" onClick="change_status_show();">

			




	
	
	
		
 
                  %if is_pr:

			




	
	
	
		
 
                    ${_('Vote for pull request status')}

			




	
	
	
		
 
                  %else:

			




	
	
	
		
 
                    ${_('Change changeset status')}

			




	
	
	
		
 
                  %endif

			




	
	
	
		
 
                  </a>

			




	
	
	
		
 
                  <input id="show_changeset_status_box" type="checkbox" name="change_changeset_status" style="display: none;" />

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
              <div id="preview-btn" class="preview-btn ui-btn small">${_('Preview')}</div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            %if change_status:

			




	
	
	
		
 
            <div id="status_block_container" class="status-block" style="display:none">

			




	
	
	
		
 
                %for status,lbl in c.changeset_statuses:

			




	
	
	
		
 
                    <div class="">

			




	
	
	
		
 
                        <img src="${h.url('/images/icons/flag_status_%s.png' % status)}" /> <input ${'checked="checked"' if status == cur_status else ''}" type="radio" class="status_change_radio" name="changeset_status" id="${status}" value="${status}">

			




	
	
	
		
 
                        <label for="${status}">${lbl}</label>

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
                %if close_btn and change_status:

			




	
	
	
		
 
                %if is_pr and change_status:

			




	
	
	
		
 
                <input id="save_close" type="checkbox" name="save_close" disabled="${'1' if cur_status in ['not_reviewed','under_review'] else ''}">

			




	
	
	
		
 
                <label id="save_close_label" for="save_close" class="${'disabled' if cur_status in ['not_reviewed','under_review'] else ''}">${_("Close (when approved or rejected)")}</label>

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
            <div class="mentions-container" id="mentions_container"></div>

			




	
	
	
		
 
             ${h.textarea('text', class_="comment-block-ta")}

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
        <div id="preview-container" class="clearfix" style="display:none">

			




	
	
	
		
 
           <div class="comment-help">

			




	
	
	
		
 
                ${_('Comment preview')}

			




	
	
	
		
 
              <div id="edit-btn" class="edit-btn ui-btn small">${_('Edit')}</div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div id="preview-box" class="preview-box"></div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
        <div class="comment-button">

			




	
	
	
		
 
        ${h.submit('save', _('Comment'), class_="ui-btn large")}

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        ${h.end_form()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
</div>

			




        

    


    
    

    

        

                

                    rhodecode/templates/changeset/changeset_range.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -80,46 +80,45 @@ ${self.repo_context_bar('changelog')}

			




	
	
	
		
 
              <span class="logtags">

			




	
	
	
		
 
                %if len(cs.parents)>1:

			




	
	
	
		
 
                <span class="merge">${_('merge')}</span>

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
                %if h.is_hg(c.rhodecode_repo):

			




	
	
	
		
 
                  %for book in cs.bookmarks:

			




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

			




	
	
	
		
 
                  </span>

			




	
	
	
		
 
                  %endfor

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
                %for tag in cs.tags:

			




	
	
	
		
 
                    <span 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))}</span>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
                %if cs.branch:

			




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

			




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

			




	
	
	
		
 
                </span>

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
              </span>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
           </div>

			




	
	
	
		
 
          ${diff_block.diff_block(c.changes[cs.raw_id])}

			




	
	
	
		
 
          ##${comment.comments(cs)}

			




	
	
	
		
 

			




	
	
	
		
 
     %endfor

			




	
	
	
		
 
     <script type="text/javascript">

			




	
	
	
		
 

			




	
	
	
		
 
      YUE.onDOMReady(function(){

			




	
	
	
		
 

			




	
	
	
		
 
          YUE.on(YUQ('.diff-menu-activate'),'click',function(e){

			




	
	
	
		
 
              var act = e.currentTarget.nextElementSibling;

			




	
	
	
		
 

			




	
	
	
		
 
              if(YUD.hasClass(act,'active')){

			




	
	
	
		
 
                  YUD.removeClass(act,'active');

			




	
	
	
		
 
                  YUD.setStyle(act,'display','none');

			




	
	
	
		
 
              }else{

			




	
	
	
		
 
                  YUD.addClass(act,'active');

			




	
	
	
		
 
                  YUD.setStyle(act,'display','');

			




	
	
	
		
 
              }

			




	
	
	
		
 
          });

			




	
	
	
		
 
      })

			




	
	
	
		
 
    </script>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
</%def>

			




        

    


    
    

    

        

                

                    rhodecode/templates/pullrequests/pullrequest_show.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -192,49 +192,49 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
    </script>

			




	
	
	
		
 

			




	
	
	
		
 
    ## diff block

			




	
	
	
		
 
    <%namespace name="diff_block" file="/changeset/diff_block.html"/>

			




	
	
	
		
 
    %for fid, change, f, stat in c.files:

			




	
	
	
		
 
      ${diff_block.diff_block_simple([c.changes[fid]])}

			




	
	
	
		
 
    %endfor

			




	
	
	
		
 
    % if c.limited_diff:

			




	
	
	
		
 
      <h4>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}" onclick="return confirm('${_("Showing a huge diff might take some time and resources")}')">${_('Show full diff')}</a></h4>

			




	
	
	
		
 
    % endif

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
    ## template for inline comment form

			




	
	
	
		
 
    <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>

			




	
	
	
		
 
    ${comment.comment_inline_form()}

			




	
	
	
		
 

			




	
	
	
		
 
    ## render comments and inlines

			




	
	
	
		
 
    ${comment.generate_comments(include_pr=True)}

			




	
	
	
		
 

			




	
	
	
		
 
    % if not c.pull_request.is_closed():

			




	
	
	
		
 
      ## main comment form and it status

			




	
	
	
		
 
      ${comment.comments(h.url('pullrequest_comment', repo_name=c.repo_name,

			




	
	
	
		
 
                                pull_request_id=c.pull_request.pull_request_id),

			




	
	
	
		
 
                                c.current_changeset_status,

			




	
	
	
		
 
                                close_btn=True, change_status=c.allowed_to_change_status)}

			




	
	
	
		
 
                         is_pr=True, change_status=c.allowed_to_change_status)}

			




	
	
	
		
 
    %endif

			




	
	
	
		
 

			




	
	
	
		
 
    <script type="text/javascript">

			




	
	
	
		
 
      YUE.onDOMReady(function(){

			




	
	
	
		
 
          PullRequestAutoComplete('user', 'reviewers_container', _USERS_AC_DATA, _GROUPS_AC_DATA);

			




	
	
	
		
 

			




	
	
	
		
 
          YUE.on(YUQ('.show-inline-comments'),'change',function(e){

			




	
	
	
		
 
              var show = 'none';

			




	
	
	
		
 
              var target = e.currentTarget;

			




	
	
	
		
 
              if(target.checked){

			




	
	
	
		
 
                  var show = ''

			




	
	
	
		
 
              }

			




	
	
	
		
 
              var boxid = YUD.getAttribute(target,'id_for');

			




	
	
	
		
 
              var comments = YUQ('#{0} .inline-comments'.format(boxid));

			




	
	
	
		
 
              for(c in comments){

			




	
	
	
		
 
                 YUD.setStyle(comments[c],'display',show);

			




	
	
	
		
 
              }

			




	
	
	
		
 
              var btns = YUQ('#{0} .inline-comments-button'.format(boxid));

			




	
	
	
		
 
              for(c in btns){

			




	
	
	
		
 
                  YUD.setStyle(btns[c],'display',show);

			




	
	
	
		
 
               }

			




	
	
	
		
 
          })

			




	
	
	
		
 

			




	
	
	
		
 
          YUE.on(YUQ('.line'),'click',function(e){

			




        

    



    


    



    



      

      





    
    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.