Mercurial > kallithea
changeset 1704:3efc47f59639 beta
inline comment form is displayed now under all comments.
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Sun, 20 Nov 2011 23:53:25 +0200 |
parents | f23828b00b21 |
children | 5e4827a8e942 |
files | rhodecode/public/css/style.css rhodecode/templates/changeset/changeset.html rhodecode/templates/changeset/changeset_file_comment.html |
diffstat | 3 files changed, 13 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/public/css/style.css Sun Nov 20 22:26:55 2011 +0200 +++ b/rhodecode/public/css/style.css Sun Nov 20 23:53:25 2011 +0200 @@ -3456,6 +3456,9 @@ color: #666; font-size: 16px; } +.inline-comments-button .add-comment{ + margin:10px 5px !important; +} .notifications{ width:22px; padding:2px;
--- a/rhodecode/templates/changeset/changeset.html Sun Nov 20 22:26:55 2011 +0200 +++ b/rhodecode/templates/changeset/changeset.html Sun Nov 20 23:53:25 2011 +0200 @@ -217,8 +217,6 @@ YUD.setStyle(comments[c],'display',show); } }) - - YUE.on(YUQ('.line'),'click',function(e){ var tr = e.currentTarget; @@ -230,7 +228,12 @@ 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 @@ -241,12 +244,13 @@ 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){} } }
--- a/rhodecode/templates/changeset/changeset_file_comment.html Sun Nov 20 22:26:55 2011 +0200 +++ b/rhodecode/templates/changeset/changeset_file_comment.html Sun Nov 20 23:53:25 2011 +0200 @@ -40,7 +40,7 @@ <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}">