Changeset - a048d0c6da3c
Parent rev.
Child rev.
[Not reviewed]
beta
0 2 0
Marcin Kuzminski - 14 years ago 2012-01-07 21:22:16
marcin@python-works.com
fixed show inline comments, broken after some html refactoring
2 files changed with 7 insertions and 3 deletions:
rhodecode/templates/changeset/changeset.html
5
1
rhodecode/templates/changeset/diff_block.html
2
2
0 comments (0 inline, 0 general)
rhodecode/templates/changeset/changeset.html
➞
Show inline comments
 
@@ -78,49 +78,49 @@
 
		                     h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)}
 
		                 </div>
 
		             %endfor
 
                    %else:
 
                        <div class="parent">${_('No parents')}</div>
 
                    %endif
 
		         <span class="logtags">
 
		             <span class="branchtag" title="${'%s %s' % (_('branch'),c.changeset.branch)}">
 
		             ${h.link_to(c.changeset.branch,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</span>
 
		             %for tag in c.changeset.tags:
 
		                 <span class="tagtag"  title="${'%s %s' % (_('tag'),tag)}">
 
		                 ${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</span>
 
		             %endfor
 
		         </span>
 
	                </div>
 
	        </div>
 
	        <span style="font-size:1.1em;font-weight: bold">
 
	        ${_('%s files affected with %s additions and %s deletions.') % (len(c.changeset.affected_files),c.lines_added,c.lines_deleted)}
 
	        </span>
 
	        <div class="cs_files">
 
	                %for change,filenode,diff,cs1,cs2,stat in c.changes:
 
	                    <div class="cs_${change}">
 
                            <div class="node">
 
                            %if change != 'removed':
 
                                ${h.link_to(h.safe_unicode(filenode.path),c.anchor_url(filenode.changeset.raw_id,filenode.path))}
 
                                ${h.link_to(h.safe_unicode(filenode.path),c.anchor_url(filenode.changeset.raw_id,filenode.path)+"_target")}
 
                            %else:
 
                                ${h.link_to(h.safe_unicode(filenode.path),h.url.current(anchor=h.FID('',filenode.path)))}
 
                            %endif
 
                            </div>
 
		                    <div class="changes">${h.fancy_file_stats(stat)}</div>
 
	                    </div>
 
	                %endfor
 
	                % if c.cut_off:
 
	                  ${_('Changeset was too big and was cut off...')}
 
	                % endif
 
	        </div>
 
	    </div>
 
 
    </div>
 
 
    ## diff block
 
    <%namespace name="diff_block" file="/changeset/diff_block.html"/>
 
    ${diff_block.diff_block(c.changes)}
 
 
    ## template for inline comment form
 
    <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
 
    ${comment.comment_inline_form(c.changeset)}
 
 
    ${comment.comments(c.changeset)}
 
@@ -133,53 +133,57 @@
 
          var success = function(o){
 
              var n = YUD.get('comment-'+comment_id);
 
              n.parentNode.removeChild(n);
 
          }
 
          ajaxPOST(url,postData,success);
 
      }
 

			




	
	
	
		
 
      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','');

			




	
	
	
		
 
              }

			




	
	
	
		
 
          });

			




	
	
	
		
 
                  

			




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

			




	
	
	
		
 
              var show = 'none';

			




	
	
	
		
 
              var target = e.currentTarget;

			




	
	
	
		
 
              console.log(target);

			




	
	
	
		
 
              if(target.checked){

			




	
	
	
		
 
                  var show = ''

			




	
	
	
		
 
              }

			




	
	
	
		
 
              console.log('aa')

			




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

			




	
	
	
		
 
              console.log(boxid);

			




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

			




	
	
	
		
 
              console.log(comments)

			




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

			




	
	
	
		
 
              var tr = e.currentTarget;

			




	
	
	
		
 
              injectInlineForm(tr);

			




	
	
	
		
 
          });

			




	
	
	
		
 
          

			




	
	
	
		
 
          // inject comments into they proper positions

			




	
	
	
		
 
          var file_comments = YUQ('.inline-comment-placeholder');

			




	
	
	
		
 
          

			




	
	
	
		
 
          for (f in file_comments){

			




	
	
	
		
 
              var box = file_comments[f];

			




	
	
	
		
 
              var inlines = box.children;

			




	
	
	
		
 
              for(var i=0; i<inlines.length; i++){

			




	
	
	
		
 
                  try{

			




	
	
	
		
 

			




	
	
	
		
 
                    var inline = inlines[i];

			




        

    


    
    

    

        

                

                    rhodecode/templates/changeset/diff_block.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



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

			




	
	
	
		
 
##usage:

			




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

			




	
	
	
		
 
## ${diff_block.diff_block(changes)}

			




	
	
	
		
 
##

			




	
	
	
		
 
<%def name="diff_block(changes)">

			




	
	
	
		
 

			




	
	
	
		
 
%for change,filenode,diff,cs1,cs2,stat in changes:

			




	
	
	
		
 
    %if change !='removed':

			




	
	
	
		
 
    <div id="${h.FID(filenode.changeset.raw_id,filenode.path)}" style="clear:both;height:90px;margin-top:-60px"></div>

			




	
	
	
		
 
    <div class="diffblock  margined comm">

			




	
	
	
		
 
    <div id="${h.FID(filenode.changeset.raw_id,filenode.path)}_target" style="clear:both;height:90px;margin-top:-60px"></div>

			




	
	
	
		
 
    <div id="${h.FID(filenode.changeset.raw_id,filenode.path)}" class="diffblock  margined comm">

			




	
	
	
		
 
        <div class="code-header">

			




	
	
	
		
 
            <div class="changeset_header">

			




	
	
	
		
 
                <div class="changeset_file">

			




	
	
	
		
 
                    ${h.link_to_if(change!='removed',h.safe_unicode(filenode.path),h.url('files_home',repo_name=c.repo_name,

			




	
	
	
		
 
                    revision=filenode.changeset.raw_id,f_path=h.safe_unicode(filenode.path)))}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="diff-menu-wrapper">

			




	
	
	
		
 
                    <img class="diff-menu-activate" style="margin-bottom:-6px;cursor: pointer" alt="diff-menu" src="${h.url('/images/icons/script_gear.png')}" />

			




	
	
	
		
 
                    <div class="diff-menu" style="display:none">

			




	
	
	
		
 
                        <ul>

			




	
	
	
		
 
                          <li>${h.link_to(_('diff'),h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='diff',fulldiff=1))}</li>

			




	
	
	
		
 
                          <li>${h.link_to(_('raw diff'),h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='raw'))}</li>

			




	
	
	
		
 
                          <li>${h.link_to(_('download diff'),h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='download'))}</li>

			




	
	
	
		
 
                          <li>${c.ignorews_url(h.FID(filenode.changeset.raw_id,filenode.path))}</li>

			




	
	
	
		
 
                          <li>${c.context_url(h.FID(filenode.changeset.raw_id,filenode.path))}</li>

			




	
	
	
		
 
                        </ul>

			




	
	
	
		
 
                    </div>                        

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <span style="float:right;margin-top:-3px">

			




	
	
	
		
 
                  <label>

			




	
	
	
		
 
                  ${_('show inline comments')}

			




	
	
	
		
 
                  ${h.checkbox('',checked="checked",class_="show-inline-comments",id_for=h.FID(filenode.changeset.raw_id,filenode.path))}

			




	
	
	
		
 
                  </label>

			




	
	
	
		
 
                </span>

			




        

    



    


    



    



      

      





    
    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.