comparison rhodecode/templates/changeset/changeset_file_comment.html @ 1772:c83d3d42ab92 beta

- diff.css merge to main style.css - css fixes for diffs - JS fixes for diff and inline comments
author Marcin Kuzminski <marcin@python-works.com>
date Sat, 10 Dec 2011 00:48:05 +0200
parents 025f3333c769
children d4a7b6c82efe
comparison
equal deleted inserted replaced
1771:5948ab03e639 1772:c83d3d42ab92
2 ## <%namespace name="comment" file="/changeset/changeset_file_comment.html"/> 2 ## <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
3 ## ${comment.comment_block(co)} 3 ## ${comment.comment_block(co)}
4 ## 4 ##
5 <%def name="comment_block(co)"> 5 <%def name="comment_block(co)">
6 <div class="comment" id="comment-${co.comment_id}"> 6 <div class="comment" id="comment-${co.comment_id}">
7 <div class="comment-wrapp">
7 <div class="meta"> 8 <div class="meta">
8 <span class="user"> 9 <span class="user">
9 <img src="${h.gravatar_url(co.author.email, 20)}" /> 10 <img src="${h.gravatar_url(co.author.email, 20)}" />
10 ${co.author.username} 11 ${co.author.username}
11 </span> 12 </span>
25 <span onClick="deleteComment(${co.comment_id})" class="delete-comment ui-btn">${_('Delete')}</span> 26 <span onClick="deleteComment(${co.comment_id})" class="delete-comment ui-btn">${_('Delete')}</span>
26 </div> 27 </div>
27 %endif 28 %endif
28 ${h.rst_w_mentions(co.text)|n} 29 ${h.rst_w_mentions(co.text)|n}
29 </div> 30 </div>
31 </div>
30 </div> 32 </div>
31 </%def> 33 </%def>
32 34
33 35
34 36
36 <div id='comment-inline-form-template' style="display:none"> 38 <div id='comment-inline-form-template' style="display:none">
37 <div class="comment-inline-form"> 39 <div class="comment-inline-form">
38 %if c.rhodecode_user.username != 'default': 40 %if c.rhodecode_user.username != 'default':
39 ${h.form(h.url('changeset_comment', repo_name=c.repo_name, revision=c.changeset.raw_id))} 41 ${h.form(h.url('changeset_comment', repo_name=c.repo_name, revision=c.changeset.raw_id))}
40 <div class="clearfix"> 42 <div class="clearfix">
41 <div class="comment-help">${_('Commenting on line')} {1} ${_('comments parsed using')} 43 <div class="comment-help">${_('Commenting on line')} {1}. ${_('Comments parsed using')}
42 <a href="${h.url('rst_help')}">RST</a> ${_('syntax')}</div> 44 <a href="${h.url('rst_help')}">RST</a> ${_('syntax')} ${_('with')}
43 <textarea id="text_{1}" name="text"></textarea> 45 <span style="color:#003367" class="tooltip" title="${_('Use @username inside this text to send notification to this RhodeCode user')}">@mention</span> ${_('support')}
46 </div>
47 <textarea id="text_{1}" name="text"></textarea>
44 </div> 48 </div>
45 <div class="comment-button"> 49 <div class="comment-button">
46 <input type="hidden" name="f_path" value="{0}"> 50 <input type="hidden" name="f_path" value="{0}">
47 <input type="hidden" name="line" value="{1}"> 51 <input type="hidden" name="line" value="{1}">
48 ${h.submit('save', _('Comment'), class_='ui-btn')} 52 ${h.submit('save', _('Comment'), class_='ui-btn')}