Mercurial > kallithea
diff rhodecode/templates/changeset/changeset_file_comment.html @ 1787:d4a7b6c82efe beta
code garden for changeset ranges and comments
- disabled (for now) comments on changeset ranges
- code reuse by mako namespaces
- added flag for enabling comments in diffs
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Sun, 18 Dec 2011 04:24:53 +0200 |
parents | c83d3d42ab92 |
children | ef0613584ced |
line wrap: on
line diff
--- a/rhodecode/templates/changeset/changeset_file_comment.html Sun Dec 18 00:12:58 2011 +0200 +++ b/rhodecode/templates/changeset/changeset_file_comment.html Sun Dec 18 04:24:53 2011 +0200 @@ -1,4 +1,5 @@ -##usage: +## -*- coding: utf-8 -*- +## usage: ## <%namespace name="comment" file="/changeset/changeset_file_comment.html"/> ## ${comment.comment_block(co)} ## @@ -33,12 +34,11 @@ </%def> - -<%def name="comment_inline_form()"> +<%def name="comment_inline_form(changeset)"> <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))} + ${h.form(h.url('changeset_comment', repo_name=c.repo_name, revision=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')} ${_('with')} @@ -67,4 +67,45 @@ %endif </div> </div> -</%def> \ No newline at end of file +</%def> + + +<%def name="comments(changeset)"> + +<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="${h.FID(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_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=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')} + ${_('with')} <span style="color:#003367" class="tooltip" title="${_('Use @username inside this text to send notification to this RhodeCode user')}">@mention</span> ${_('support')} + </div> + ${h.textarea('text')} + </div> + <div class="comment-button"> + ${h.submit('save', _('Comment'), class_='ui-button')} + </div> + ${h.end_form()} + </div> + %endif +</div> +</%def>