Changeset - 3efc47f59639
Parent rev.
Child rev.
[Not reviewed]
beta
0 3 0
Marcin Kuzminski - 14 years ago 2011-11-20 22:53:25
marcin@python-works.com
inline comment form is displayed now under all comments.
3 files changed with 13 insertions and 6 deletions:
rhodecode/public/css/style.css
3
rhodecode/templates/changeset/changeset.html
9
5
rhodecode/templates/changeset/changeset_file_comment.html
1
1
0 comments (0 inline, 0 general)
rhodecode/public/css/style.css
➞
Show inline comments
 
@@ -3363,115 +3363,118 @@ form.comment-form {
 
    border-radius: 4px;
 
    padding: 5px;
 
}
 
 
div.comment-inline-form {
 
    margin-top: 5px;
 
    padding:2px 6px 8px 6px;
 
}
 
 
.comment-inline-form strong {
 
    display: block;
 
    margin-bottom: 15px;
 
}
 
 
.comment-inline-form textarea {
 
    width: 100%;
 
    height: 100px;
 
    font-family: 'Monaco', 'Courier', 'Courier New', monospace;
 
}
 
 
form.comment-inline-form {
 
    margin-top: 10px;
 
    margin-left: 10px;
 
}
 
 
.comment-inline-form-submit {
 
    margin-top: 5px;
 
    margin-left: 525px;
 
}
 
 
.file-comments {
 
    display: none;
 
}
 
 
.comment-inline-form .comment {
 
    margin-left: 10px;
 
}
 
 
.comment-inline-form .comment-help{
 
    padding: 0px 0px 2px 0px;
 
    color: #666666;
 
    font-size: 10px;
 
}
 
 
.comment-inline-form .comment-button{
 
    padding-top:5px;
 
}
 
 
/** comment inline **/
 
.inline-comments {
 
    padding:10px 20px;
 
}
 
 
.inline-comments div.rst-block  {
 
	clear:both;
 
	overflow:hidden;
 
	margin:0;
 
	padding:0 20px 0px;
 
}
 
.inline-comments .comment {
 
    border: 1px solid #ddd;
 
    -webkit-border-radius: 4px;
 
    -moz-border-radius: 4px;
 
    border-radius: 4px;
 
    margin: 3px 3px 5px 5px;
 
}
 
 
.inline-comments .comment .meta {
 
    background: #f8f8f8;
 
    padding: 6px;
 
    border-bottom: 1px solid #ddd;
 
}
 
 
.inline-comments .comment .meta img {
 
    vertical-align: middle;
 
}
 
 
.inline-comments .comment .meta .user {
 
    font-weight: bold;
 
}
 
 
.inline-comments .comment .meta .date {
 
    float: right;
 
}
 
 
.inline-comments .comment .text {
 
    padding: 8px 6px 6px 14px;
 
    background-color: #FAFAFA;
 
}
 
 
.inline-comments .comments-number{
 
    padding:0px 0px 10px 0px;
 
    font-weight: bold;
 
    color: #666;
 
    font-size: 16px;
 
}
 
.inline-comments-button .add-comment{
 
	margin:10px 5px !important;
 
}
 
.notifications{
 
	width:22px;
 
    padding:2px;
 
	float:right;
 
    -webkit-border-radius: 4px;
 
    -moz-border-radius: 4px;
 
    border-radius: 4px;
 
    text-align: center;
 
    margin: -1px -10px 0px 5px;
 
    background-color: #DEDEDE;
 
}
 
.notifications a{
 
	color:#888 !important;
 
	display: block;
 
	font-size: 10px
 
}
 
.notifications a:hover{
 
	text-decoration: none !important;
 
}
 
\ No newline at end of file
rhodecode/templates/changeset/changeset.html
➞
Show inline comments
 
@@ -124,134 +124,138 @@
 
				<div class="changeset_header">
 
					<span 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)))}
 
					</span>
 
					&raquo; <span>${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'))}</span>
 
					&raquo; <span>${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'))}</span>
 
					&raquo; <span>${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'))}</span>
 
                    <span style="float:right">
 
                      <label>
 
                      ${_('show inline comments')}
 
                      ${h.checkbox('',checked="checked",class_="show-inline-comments",id_for=self.fid(filenode.changeset.raw_id,filenode.path))}
 
                      </label>
 
                    </span>
 
				</div>
 
			</div>
 
			<div class="code-body">
 
                <div class="full_f_path" path="${filenode.path}"></div>
 
				%if diff:
 
					${diff|n}
 
				%else:
 
					${_('No changes in this file')}
 
				%endif
 
			</div>
 
		</div>
 
		%endif
 
	%endfor
 
 
    <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
 
    ## template for inline comment form
 
    ${comment.comment_inline_form()}
 
 
    <div class="comments">
 
        <div class="comments-number">${len(c.comments)} comment(s) (${c.inline_cnt} ${_('inline')})</div>
 
 
        %for path, lines in c.inline_comments:
 
            <div style="display:none" class="inline-comment-placeholder" path="${path}" target_id="${self.fid(c.changeset.raw_id,path)}">
 
            % for line,comments in lines.iteritems():
 
                <div class="inline-comment-placeholder-line" line="${line}" target_id="${h.safeid(h.safe_unicode(path))}">
 
                %for co in comments:
 
                    ${comment.comment_block(co)}
 
                %endfor
 
                </div>
 
            %endfor
 
            </div>
 
        %endfor
 
 
        %for co in c.comments:
 
            ${comment.comment_block(co)}
 
        %endfor
 
        %if c.rhodecode_user.username != 'default':
 
        <div class="comment-form">
 
            ${h.form(h.url('changeset_comment', repo_name=c.repo_name, revision=c.changeset.raw_id))}
 
            <strong>${_('Leave a comment')}</strong>
 
            <div class="clearfix">
 
                <div class="comment-help">
 
                    ${_('Comments parsed using')} <a href="${h.url('rst_help')}">RST</a> ${_('syntax')}
 
                </div>
 
                    ${h.textarea('text')}
 
            </div>
 
            <div class="comment-button">
 
            ${h.submit('save', _('Comment'), class_='ui-button')}
 
            </div>
 
            ${h.end_form()}
 
        </div>
 
        %endif
 
    </div>
 
    <script type="text/javascript">
 
      var deleteComment = function(comment_id){
 

			




	
	
	
		
 
          var url = "${url('changeset_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}".replace('__COMMENT_ID__',comment_id);

			




	
	
	
		
 
          var postData = '_method=delete';

			




	
	
	
		
 
          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('.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);

			




	
	
	
		
 
    		  }

			




	
	
	
		
 
    	  })

			




	
	
	
		
 
    	  

			




	
	
	
		
 

			




	
	
	
		
 
          

			




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

			




	
	
	
		
 
        	  var tr = e.currentTarget;

			




	
	
	
		
 
        	  if(YUD.hasClass(tr,'form-open') || YUD.hasClass(tr,'context')){

			




	
	
	
		
 
        		  return

			




	
	
	
		
 
        	  }

			




	
	
	
		
 
        	  YUD.addClass(tr,'form-open');

			




	
	
	
		
 
        	  var node = tr.parentNode.parentNode.parentNode.getElementsByClassName('full_f_path')[0];

			




	
	
	
		
 
        	  var f_path = YUD.getAttribute(node,'path');

			




	
	
	
		
 
        	  var lineno = getLineNo(tr);

			




	
	
	
		
 
        	  var form = createInlineForm(tr, f_path, lineno);

			




	
	
	
		
 
        	  YUD.insertAfter(form,tr);

			




	
	
	
		
 
        	  var target_tr = tr;

			




	
	
	
		
 
        	  if(YUD.hasClass(YUD.getNextSibling(tr),'inline-comments')){

			




	
	
	
		
 
        		  target_tr = YUD.getNextSibling(tr);

			




	
	
	
		
 
        	  }

			




	
	
	
		
 
        	  YUD.insertAfter(form,target_tr);

			




	
	
	
		
 
        	  YUD.get('text_'+lineno).focus()

			




	
	
	
		
 
          });

			




	
	
	
		
 
          

			




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

			




	
	
	
		
 
          		    var lineno = YUD.getAttribute(inlines[i],'line');

			




	
	
	
		
 
          		    var lineid = "{0}_{1}".format(YUD.getAttribute(inline,'target_id'),lineno);

			




	
	
	
		
 
                    var target_line = YUD.get(lineid);

			




	
	
	
		
 
                    var comments = new YAHOO.util.Element(tableTr('inline-comments',inline.innerHTML))

			




	
	
	
		
 
                    YUD.insertAfter(comments,target_line.parentNode);

			




	
	
	
		
 
                    var comment = new YAHOO.util.Element(tableTr('inline-comments',inline.innerHTML))

			




	
	
	
		
 
                    YUD.insertAfter(comment,target_line.parentNode);

			




	
	
	
		
 
        		  }catch(e){}

			




	
	
	
		
 
        	  }

			




	
	
	
		
 
          }

			




	
	
	
		
 
      })

			




	
	
	
		
 
      

			




	
	
	
		
 
    </script> 

			




	
	
	
		
 
  </div>	

			




	
	
	
		
 
</%def>

			




        

    


    
    

    

        

                

                    rhodecode/templates/changeset/changeset_file_comment.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
##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}">

			




	
	
	
		
 
  	<div class="meta">

			




	
	
	
		
 
  		<span class="user">

			




	
	
	
		
 
  			<img src="${h.gravatar_url(co.author.email, 20)}" />

			




	
	
	
		
 
  			${co.author.username}

			




	
	
	
		
 
  		</span>

			




	
	
	
		
 
  		<a href="${h.url.current(anchor='comment-%s' % co.comment_id)}"> ${_('commented on')} </a>

			




	
	
	
		
 
  		${h.short_id(co.revision)}

			




	
	
	
		
 
  		%if co.f_path:

			




	
	
	
		
 
  			${_(' in file ')}

			




	
	
	
		
 
  			${co.f_path}:L ${co.line_no}

			




	
	
	
		
 
  		%endif

			




	
	
	
		
 
  		<span class="date">

			




	
	
	
		
 
  			${h.age(co.modified_at)}

			




	
	
	
		
 
  		</span>

			




	
	
	
		
 
  	</div>

			




	
	
	
		
 
  	<div class="text">

			




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

			




	
	
	
		
 
  			<div class="buttons">

			




	
	
	
		
 
  				<span onClick="deleteComment(${co.comment_id})" class="delete-comment ui-button-small">${_('Delete')}</span>

			




	
	
	
		
 
  			</div>

			




	
	
	
		
 
  		%endif

			




	
	
	
		
 
  		${h.rst(co.text)|n}

			




	
	
	
		
 
  	</div>

			




	
	
	
		
 
  </div>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="comment_inline_form()">

			




	
	
	
		
 
<div id='comment-inline-form-template' style="display:none">

			




	
	
	
		
 
  <div class="comment-inline-form">

			




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

			




	
	
	
		
 
      ${h.form(h.url('changeset_comment', repo_name=c.repo_name, revision=c.changeset.raw_id))}

			




	
	
	
		
 
      <div class="clearfix">

			




	
	
	
		
 
          <div class="comment-help">${_('Commenting on line')} {1} ${_('comments parsed using')} 

			




	
	
	
		
 
          <a href="${h.url('rst_help')}">RST</a> ${_('syntax')}</div>

			




	
	
	
		
 
              ${h.textarea('text')}

			




	
	
	
		
 
              <textarea id="text_{1}" name="text"></textarea>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      <div class="comment-button">

			




	
	
	
		
 
      <input type="hidden" name="f_path" value="{0}">

			




	
	
	
		
 
      <input type="hidden" name="line" value="{1}">            

			




	
	
	
		
 
      ${h.submit('save', _('Comment'), class_='ui-button-small')}

			




	
	
	
		
 
      ${h.reset('hide-inline-form', _('Hide'), class_='ui-button-small hide-inline-form')}

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      ${h.end_form()}

			




	
	
	
		
 
  %else:

			




	
	
	
		
 
      ${h.form('')}

			




	
	
	
		
 
      <div class="clearfix">

			




	
	
	
		
 
          <div class="comment-help">

			




	
	
	
		
 
            ${'You need to be logged in to comment.'} <a href="${h.url('login_home',came_from=h.url.current())}">${_('Login now')}</a>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      <div class="comment-button">

			




	
	
	
		
 
      ${h.reset('hide-inline-form', _('Hide'), class_='ui-button-small hide-inline-form')}

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      ${h.end_form()}  

			




	
	
	
		
 
  %endif      

			




	
	
	
		
 
  </div>

			




	
	
	
		
 
</div>  

			




	
	
	
		
 
</%def>

			




	
	
		
 
\ No newline at end of file

			




        

    



    


    



    



      

      





    
    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.