##// END OF EJS Templates
show only open pull requests in the counter, and use repo context bar in pull requests view
show only open pull requests in the counter, and use repo context bar in pull requests view

File last commit:

r3311:2c192469 beta
r3580:7b9d4f6b beta
Show More
changeset_file_comment.html
195 lines | 7.9 KiB | text/html | HtmlLexer
/ rhodecode / templates / changeset / changeset_file_comment.html
White-space cleanup
r1888 ## -*- coding: utf-8 -*-
## usage:
## <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
## ${comment.comment_block(co)}
##
<%def name="comment_block(co)">
#415: Adding comment to changeset causes reload...
r2187 <div class="comment" id="comment-${co.comment_id}" line="${co.line_no}">
White-space cleanup
r1888 <div class="comment-wrapp">
Mads Kiilerich
html: don't use tabs
r3197 <div class="meta">
Show changes of status inside comments...
r2286 <div style="float:left"> <img src="${h.gravatar_url(co.author.email, 20)}" /> </div>
Mads Kiilerich
html: don't use tabs
r3197 <div class="user">
${co.author.username}
</div>
<div class="date">
${h.age(co.modified_at)} <a class="permalink" href="#comment-${co.comment_id}">&para;</a>
</div>
Show changes of status inside comments...
r2286 %if co.status_change:
<div style="float:left" class="changeset-status-container">
<div style="float:left;padding:0px 2px 0px 2px"><span style="font-size: 18px;">&rsaquo;</span></div>
Forbid changing changset status when it is associated with a closed pull request...
r2677 <div title="${_('Changeset status')}" class="changeset-status-lbl"> ${co.status_change[0].status_lbl}</div>
<div class="changeset-status-ico"><img src="${h.url(str('/images/icons/flag_status_%s.png' % co.status_change[0].status))}" /></div>
Show changes of status inside comments...
r2286 </div>
white space cleanup
r2478 %endif
Show pull request link also on regular comments that are now attached to separate changesets
r3190
<div style="float:left;padding:3px 0px 0px 5px">
<span class="">
%if co.pull_request:
<a href="${h.url('pullrequest_show',repo_name=co.pull_request.other_repo.repo_name,pull_request_id=co.pull_request.pull_request_id)}">
%if co.status_change:
Mads Kiilerich
changeset comments: use #pr
r3249 ${_('Status change from pull request #%s') % co.pull_request.pull_request_id}
Show pull request link also on regular comments that are now attached to separate changesets
r3190 %else:
Mads Kiilerich
changeset comments: use #pr
r3249 ${_('Comment from pull request #%s') % co.pull_request.pull_request_id}
Show pull request link also on regular comments that are now attached to separate changesets
r3190 %endif
whitespace cleanup
r3216 </a>
Show pull request link also on regular comments that are now attached to separate changesets
r3190 %endif
</span>
</div>
whitespace cleanup
r3216
White-space cleanup
r1888 %if h.HasPermissionAny('hg.admin', 'repository.admin')() or co.author.user_id == c.rhodecode_user.user_id:
Show changes of status inside comments...
r2286 <div class="buttons">
White-space cleanup
r1888 <span onClick="deleteComment(${co.comment_id})" class="delete-comment ui-btn">${_('Delete')}</span>
Show changes of status inside comments...
r2286 </div>
White-space cleanup
r1888 %endif
Mads Kiilerich
html: don't use tabs
r3197 </div>
<div class="text">
${h.rst_w_mentions(co.text)|n}
</div>
White-space cleanup
r1888 </div>
</div>
</%def>
Enabled inline comments in pull-requests
r2489 <%def name="comment_inline_form()">
White-space cleanup
r1888 <div id='comment-inline-form-template' style="display:none">
Autocomplete fixes...
r2369 <div class="comment-inline-form ac">
White-space cleanup
r1888 %if c.rhodecode_user.username != 'default':
#415: Adding comment to changeset causes reload...
r2187 <div class="overlay"><div class="overlay-text">${_('Submitting...')}</div></div>
Enabled inline comments in pull-requests
r2489 ${h.form('#', class_='inline-form')}
White-space cleanup
r1888 <div class="clearfix">
Vincent Duvert
Fixed i18n of the second comment help block.
r2307 <div class="comment-help">${_('Commenting on line {1}.')}
Added h.tooltip to all places that tooltip_title is used....
r2427 ${(_('Comments parsed using %s syntax with %s support.') % (
('<a href="%s">RST</a>' % h.url('rst_help')),
Mads Kiilerich
html: don't use tabs
r3197 ('<span style="color:#003367" class="tooltip" title="%s">@mention</span>' % _('Use @username inside this text to send notification to this RhodeCode user'))
Added h.tooltip to all places that tooltip_title is used....
r2427 )
)|n
}
Added mentions autocomplete into main comments form...
r2368 </div>
<div class="mentions-container" id="mentions_container_{1}"></div>
Autocomplete fixes...
r2369 <textarea id="text_{1}" name="text" class="yui-ac-input"></textarea>
White-space cleanup
r1888 </div>
<div class="comment-button">
<input type="hidden" name="f_path" value="{0}">
<input type="hidden" name="line" value="{1}">
#415: Adding comment to changeset causes reload...
r2187 ${h.submit('save', _('Comment'), class_='ui-btn save-inline-form')}
Mads Kiilerich
changeset comment: new uncommitted comments can be cancelled - not just hidden
r3254 ${h.reset('hide-inline-form', _('Cancel'), class_='ui-btn hide-inline-form')}
White-space cleanup
r1888 </div>
${h.end_form()}
%else:
${h.form('')}
<div class="clearfix">
<div class="comment-help">
Vincent Duvert
Improved i18n of the changeset inline comment section.
r2302 ${_('You need to be logged in to comment.')} <a href="${h.url('login_home',came_from=h.url.current())}">${_('Login now')}</a>
White-space cleanup
r1888 </div>
</div>
<div class="comment-button">
${h.reset('hide-inline-form', _('Hide'), class_='ui-btn hide-inline-form')}
</div>
${h.end_form()}
%endif
</div>
</div>
</%def>
Refactoring of changeset_file_comments for more generic usage. In both It enables sharing code between changeset, and pull requests discussions
r2439 ## generates inlines taken from c.comments var
<%def name="inlines()">
Vincent Duvert
Improved i18n for the comment count (use of ngettext for pluralisation).
r2310 <div class="comments-number">${ungettext("%d comment", "%d comments", len(c.comments)) % len(c.comments)} ${ungettext("(%d inline)", "(%d inline)", c.inline_cnt) % c.inline_cnt}</div>
White-space cleanup
r1888 %for path, lines in c.inline_comments:
% for line,comments in lines.iteritems():
#415: Adding comment to changeset causes reload...
r2187 <div style="display:none" class="inline-comment-placeholder" path="${path}" target_id="${h.safeid(h.safe_unicode(path))}">
White-space cleanup
r1888 %for co in comments:
${comment_block(co)}
%endfor
</div>
%endfor
%endfor
white space cleanup
r2188
#415: Adding comment to changeset causes reload...
r2187 </%def>
White-space cleanup
r1888
Added option to close pull requests, in future that will be close & merge
r2608 ## generate inline comments and the main ones
added a flag for generating pull-request comments, and force display on pull-requests
r3229 <%def name="generate_comments(include_pr=False)">
#415: Adding comment to changeset causes reload...
r2187 <div class="comments">
<div id="inline-comments-container">
Refactoring of changeset_file_comments for more generic usage. In both It enables sharing code between changeset, and pull requests discussions
r2439 ## generate inlines for this changeset
${inlines()}
#415: Adding comment to changeset causes reload...
r2187 </div>
white space cleanup
r2188
White-space cleanup
r1888 %for co in c.comments:
fixed main comments, prevent from sending inline comments if text is empty
r2189 <div id="comment-tr-${co.comment_id}">
remove comments associated to pull request from single changesets, it's too confusing....
r3200 ## only render comments that are not from pull request, or from
## pull request and a status change
added a flag for generating pull-request comments, and force display on pull-requests
r3229 %if not co.pull_request or (co.pull_request and co.status_change) or include_pr:
fixed main comments, prevent from sending inline comments if text is empty
r2189 ${comment_block(co)}
remove comments associated to pull request from single changesets, it's too confusing....
r3200 %endif
fixed main comments, prevent from sending inline comments if text is empty
r2189 </div>
White-space cleanup
r1888 %endfor
white space cleanup
r2673 </div>
Added option to close pull requests, in future that will be close & merge
r2608 </%def>
## MAIN COMMENT FORM
Implemented #670 Implementation of Roles in Pull Request...
r3104 <%def name="comments(post_url, cur_status, close_btn=False, change_status=True)">
Added option to close pull requests, in future that will be close & merge
r2608
<div class="comments">
White-space cleanup
r1888 %if c.rhodecode_user.username != 'default':
Added mentions autocomplete into main comments form...
r2368 <div class="comment-form ac">
Refactoring of changeset_file_comments for more generic usage. In both It enables sharing code between changeset, and pull requests discussions
r2439 ${h.form(post_url)}
be more explicit how to change status of changeset
r3311 <strong>${_('Leave a comment or change status by checking `change status` checkbox')}</strong>
White-space cleanup
r1888 <div class="clearfix">
<div class="comment-help">
Vincent Duvert
Fixed i18n of the second comment help block.
r2307 ${(_('Comments parsed using %s syntax with %s support.') % (('<a href="%s">RST</a>' % h.url('rst_help')),
Mads Kiilerich
html: don't use tabs
r3197 '<span style="color:#003367" class="tooltip" title="%s">@mention</span>' %
_('Use @username inside this text to send notification to this RhodeCode user')))|n}
Implemented #670 Implementation of Roles in Pull Request...
r3104 %if change_status:
small UI changes for pull-request view
r2482 | <label for="show_changeset_status_box" class="tooltip" title="${_('Check this to change current status of code-review for this changeset')}"> ${_('change status')}</label>
Implemented initial code-review status of changesets
r2217 <input style="vertical-align: bottom;margin-bottom:-2px" id="show_changeset_status_box" type="checkbox" name="change_changeset_status" />
Implemented #670 Implementation of Roles in Pull Request...
r3104 %endif
White-space cleanup
r1888 </div>
Implemented #670 Implementation of Roles in Pull Request...
r3104 %if change_status:
Implemented initial code-review status of changesets
r2217 <div id="status_block_container" class="status-block" style="display:none">
%for status,lbl in c.changeset_statuses:
<div class="">
white space cleanup
r3149 <img src="${h.url('/images/icons/flag_status_%s.png' % status)}" /> <input ${'checked="checked"' if status == cur_status else ''}" type="radio" class="status_change_radio" name="changeset_status" id="${status}" value="${status}">
fixed changeset status labels, they now select radio buttons
r3102 <label for="${status}">${lbl}</label>
white space cleanup
r2478 </div>
Implemented initial code-review status of changesets
r2217 %endfor
white space cleanup
r2478 </div>
Implemented #670 Implementation of Roles in Pull Request...
r3104 %endif
merge with beta
r2391 <div class="mentions-container" id="mentions_container"></div>
${h.textarea('text')}
White-space cleanup
r1888 </div>
<div class="comment-button">
Added option to close pull requests, in future that will be close & merge
r2608 ${h.submit('save', _('Comment'), class_="ui-btn large")}
Implemented #670 Implementation of Roles in Pull Request...
r3104 %if close_btn and change_status:
${h.submit('save_close', _('Comment and close'), class_='ui-btn blue large %s' % ('hidden' if cur_status in ['not_reviewed','under_review'] else ''))}
Added option to close pull requests, in future that will be close & merge
r2608 %endif
White-space cleanup
r1888 </div>
${h.end_form()}
</div>
%endif
</div>
Added mentions autocomplete into main comments form...
r2368 <script>
YUE.onDOMReady(function () {
Autocomplete fixes...
r2369 MentionsAutoComplete('text', 'mentions_container', _USERS_AC_DATA, _GROUPS_AC_DATA);
white space cleanup
r2478
Refactoring of changeset_file_comments for more generic usage. In both It enables sharing code between changeset, and pull requests discussions
r2439 // changeset status box listener
YUE.on(YUD.get('show_changeset_status_box'),'change',function(e){
if(e.currentTarget.checked){
white space cleanup
r2478 YUD.setStyle('status_block_container','display','');
Refactoring of changeset_file_comments for more generic usage. In both It enables sharing code between changeset, and pull requests discussions
r2439 }
else{
YUD.setStyle('status_block_container','display','none');
}
})
implements #677: Don't allow to close pull requests when they are under-review state
r3103 YUE.on(YUQ('.status_change_radio'), 'change',function(e){
Mads Kiilerich
html: don't use tabs
r3197 var val = e.currentTarget.value;
if (val == 'approved' || val == 'rejected') {
YUD.removeClass('save_close', 'hidden');
}else{
YUD.addClass('save_close', 'hidden');
}
implements #677: Don't allow to close pull requests when they are under-review state
r3103 })
white space cleanup
r2478
Added mentions autocomplete into main comments form...
r2368 });
</script>
White-space cleanup
r1888 </%def>