Mercurial > kallithea

annotate rhodecode/templates/changeset/changeset_file_comment.html @ 3200:89931a504fcf beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove comments associated to pull request from single changesets, it's too confusing. Left are only ones that are status change so we can indicate where the status of this changeset came from
author Marcin Kuzminski <marcin@python-works.com>
date Wed, 23 Jan 2013 20:54:05 +0100
parents b4f401524060
children 81bbb8086f03
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1888
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
1 ## -*- coding: utf-8 -*-
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
2 ## usage:
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
3 ## <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
4 ## ${comment.comment_block(co)}
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
5 ##
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
6 <%def name="comment_block(co)">
2187
b61e540122f2 #415: Adding comment to changeset causes reload
Marcin Kuzminski <marcin@python-works.com>
parents: 1888
diff changeset
7 <div class="comment" id="comment-${co.comment_id}" line="${co.line_no}">
1888
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
8 <div class="comment-wrapp">
3197
b4f401524060 html: don't use tabs
Mads Kiilerich <madski@unity3d.com>
parents: 3190
diff changeset
9 <div class="meta">
2286
9265958e33bb Show changes of status inside comments
Marcin Kuzminski <marcin@python-works.com>
parents: 2217
diff changeset
10 <div style="float:left"> <img src="${h.gravatar_url(co.author.email, 20)}" /> </div>
3197
b4f401524060 html: don't use tabs
Mads Kiilerich <madski@unity3d.com>
parents: 3190
diff changeset
11 <div class="user">
b4f401524060 html: don't use tabs
Mads Kiilerich <madski@unity3d.com>
parents: 3190
diff changeset
12 ${co.author.username}
b4f401524060 html: don't use tabs
Mads Kiilerich <madski@unity3d.com>
parents: 3190
diff changeset
13 </div>
b4f401524060 html: don't use tabs
Mads Kiilerich <madski@unity3d.com>
parents: 3190
diff changeset
14 <div class="date">
b4f401524060 html: don't use tabs
Mads Kiilerich <madski@unity3d.com>
parents: 3190
diff changeset
15 ${h.age(co.modified_at)} <a class="permalink" href="#comment-${co.comment_id}">&para;</a>
b4f401524060 html: don't use tabs
Mads Kiilerich <madski@unity3d.com>
parents: 3190
diff changeset
16 </div>
2286
9265958e33bb Show changes of status inside comments
Marcin Kuzminski <marcin@python-works.com>
parents: 2217
diff changeset
17 %if co.status_change:
9265958e33bb Show changes of status inside comments
Marcin Kuzminski <marcin@python-works.com>
parents: 2217
diff changeset
18 <div style="float:left" class="changeset-status-container">
9265958e33bb Show changes of status inside comments
Marcin Kuzminski <marcin@python-works.com>
parents: 2217
diff changeset
19 <div style="float:left;padding:0px 2px 0px 2px"><span style="font-size: 18px;">&rsaquo;</span></div>
2677
4fbbc65e8cd5 Forbid changing changset status when it is associated with a closed pull request
Marcin Kuzminski <marcin@python-works.com>
parents: 2673
diff changeset
20 <div title="${_('Changeset status')}" class="changeset-status-lbl"> ${co.status_change[0].status_lbl}</div>
4fbbc65e8cd5 Forbid changing changset status when it is associated with a closed pull request
Marcin Kuzminski <marcin@python-works.com>
parents: 2673
diff changeset
21 <div class="changeset-status-ico"><img src="${h.url(str('/images/icons/flag_status_%s.png' % co.status_change[0].status))}" /></div>
2286
9265958e33bb Show changes of status inside comments
Marcin Kuzminski <marcin@python-works.com>
parents: 2217
diff changeset
22 </div>
2478
8eab81115660 white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 2439
diff changeset
23 %endif
3190
786236aa313e Show pull request link also on regular comments that are now attached to separate changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 3176
diff changeset
24
786236aa313e Show pull request link also on regular comments that are now attached to separate changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 3176
diff changeset
25 <div style="float:left;padding:3px 0px 0px 5px">
786236aa313e Show pull request link also on regular comments that are now attached to separate changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 3176
diff changeset
26 <span class="">
786236aa313e Show pull request link also on regular comments that are now attached to separate changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 3176
diff changeset
27 %if co.pull_request:
786236aa313e Show pull request link also on regular comments that are now attached to separate changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 3176
diff changeset
28 <a href="${h.url('pullrequest_show',repo_name=co.pull_request.other_repo.repo_name,pull_request_id=co.pull_request.pull_request_id)}">
786236aa313e Show pull request link also on regular comments that are now attached to separate changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 3176
diff changeset
29 %if co.status_change:
786236aa313e Show pull request link also on regular comments that are now attached to separate changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 3176
diff changeset
30 ${_('Status from pull request %s') % co.pull_request.pull_request_id}
786236aa313e Show pull request link also on regular comments that are now attached to separate changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 3176
diff changeset
31 %else:
786236aa313e Show pull request link also on regular comments that are now attached to separate changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 3176
diff changeset
32 ${_('Comment from pull request %s') % co.pull_request.pull_request_id}
786236aa313e Show pull request link also on regular comments that are now attached to separate changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 3176
diff changeset
33 %endif
786236aa313e Show pull request link also on regular comments that are now attached to separate changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 3176
diff changeset
34 </a>
786236aa313e Show pull request link also on regular comments that are now attached to separate changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 3176
diff changeset
35 %endif
786236aa313e Show pull request link also on regular comments that are now attached to separate changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 3176
diff changeset
36 </span>
786236aa313e Show pull request link also on regular comments that are now attached to separate changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 3176
diff changeset
37 </div>
786236aa313e Show pull request link also on regular comments that are now attached to separate changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 3176
diff changeset
38
1888
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
39 %if h.HasPermissionAny('hg.admin', 'repository.admin')() or co.author.user_id == c.rhodecode_user.user_id:
2286
9265958e33bb Show changes of status inside comments
Marcin Kuzminski <marcin@python-works.com>
parents: 2217
diff changeset
40 <div class="buttons">
1888
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
41 <span onClick="deleteComment(${co.comment_id})" class="delete-comment ui-btn">${_('Delete')}</span>
2286
9265958e33bb Show changes of status inside comments
Marcin Kuzminski <marcin@python-works.com>
parents: 2217
diff changeset
42 </div>
1888
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
43 %endif
3197
b4f401524060 html: don't use tabs
Mads Kiilerich <madski@unity3d.com>
parents: 3190
diff changeset
44 </div>
b4f401524060 html: don't use tabs
Mads Kiilerich <madski@unity3d.com>
parents: 3190
diff changeset
45 <div class="text">
b4f401524060 html: don't use tabs
Mads Kiilerich <madski@unity3d.com>
parents: 3190
diff changeset
46 ${h.rst_w_mentions(co.text)|n}
b4f401524060 html: don't use tabs
Mads Kiilerich <madski@unity3d.com>
parents: 3190
diff changeset
47 </div>
1888
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
48 </div>
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
49 </div>
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
50 </%def>
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
51
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
52
2489
a0adf8db1416 Enabled inline comments in pull-requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2482
diff changeset
53 <%def name="comment_inline_form()">
1888
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
54 <div id='comment-inline-form-template' style="display:none">
2369
c2f131502037 Autocomplete fixes
Marcin Kuzminski <marcin@python-works.com>
parents: 2368
diff changeset
55 <div class="comment-inline-form ac">
1888
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
56 %if c.rhodecode_user.username != 'default':
2187
b61e540122f2 #415: Adding comment to changeset causes reload
Marcin Kuzminski <marcin@python-works.com>
parents: 1888
diff changeset
57 <div class="overlay"><div class="overlay-text">${_('Submitting...')}</div></div>
2489
a0adf8db1416 Enabled inline comments in pull-requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2482
diff changeset
58 ${h.form('#', class_='inline-form')}
1888
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
59 <div class="clearfix">
2307
d2043c703f84 Fixed i18n of the second comment help block.
Vincent Duvert <vincent@duvert.net>
parents: 2302
diff changeset
60 <div class="comment-help">${_('Commenting on line {1}.')}
2427
f467c75544af Added h.tooltip to all places that tooltip_title is used.
Marcin Kuzminski <marcin@python-works.com>
parents: 2369
diff changeset
61 ${(_('Comments parsed using %s syntax with %s support.') % (
f467c75544af Added h.tooltip to all places that tooltip_title is used.
Marcin Kuzminski <marcin@python-works.com>
parents: 2369
diff changeset
62 ('<a href="%s">RST</a>' % h.url('rst_help')),
3197
b4f401524060 html: don't use tabs
Mads Kiilerich <madski@unity3d.com>
parents: 3190
diff changeset
63 ('<span style="color:#003367" class="tooltip" title="%s">@mention</span>' % _('Use @username inside this text to send notification to this RhodeCode user'))
2427
f467c75544af Added h.tooltip to all places that tooltip_title is used.
Marcin Kuzminski <marcin@python-works.com>
parents: 2369
diff changeset
64 )
f467c75544af Added h.tooltip to all places that tooltip_title is used.
Marcin Kuzminski <marcin@python-works.com>
parents: 2369
diff changeset
65 )|n
f467c75544af Added h.tooltip to all places that tooltip_title is used.
Marcin Kuzminski <marcin@python-works.com>
parents: 2369
diff changeset
66 }
2368
5143b8df576c Added mentions autocomplete into main comments form
Marcin Kuzminski <marcin@python-works.com>
parents: 2310
diff changeset
67 </div>
5143b8df576c Added mentions autocomplete into main comments form
Marcin Kuzminski <marcin@python-works.com>
parents: 2310
diff changeset
68 <div class="mentions-container" id="mentions_container_{1}"></div>
2369
c2f131502037 Autocomplete fixes
Marcin Kuzminski <marcin@python-works.com>
parents: 2368
diff changeset
69 <textarea id="text_{1}" name="text" class="yui-ac-input"></textarea>
1888
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
70 </div>
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
71 <div class="comment-button">
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
72 <input type="hidden" name="f_path" value="{0}">
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
73 <input type="hidden" name="line" value="{1}">
2187
b61e540122f2 #415: Adding comment to changeset causes reload
Marcin Kuzminski <marcin@python-works.com>
parents: 1888
diff changeset
74 ${h.submit('save', _('Comment'), class_='ui-btn save-inline-form')}
1888
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
75 ${h.reset('hide-inline-form', _('Hide'), class_='ui-btn hide-inline-form')}
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
76 </div>
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
77 ${h.end_form()}
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
78 %else:
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
79 ${h.form('')}
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
80 <div class="clearfix">
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
81 <div class="comment-help">
2302
66fa6c434ce4 Improved i18n of the changeset inline comment section.
Vincent Duvert <vincent@duvert.net>
parents: 2189
diff changeset
82 ${_('You need to be logged in to comment.')} <a href="${h.url('login_home',came_from=h.url.current())}">${_('Login now')}</a>
1888
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
83 </div>
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
84 </div>
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
85 <div class="comment-button">
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
86 ${h.reset('hide-inline-form', _('Hide'), class_='ui-btn hide-inline-form')}
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
87 </div>
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
88 ${h.end_form()}
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
89 %endif
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
90 </div>
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
91 </div>
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
92 </%def>
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
93
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
94
2439
ad19dfcdb1cc Refactoring of changeset_file_comments for more generic usage. In both It enables sharing code between changeset, and pull requests discussions
Marcin Kuzminski <marcin@python-works.com>
parents: 2430
diff changeset
95 ## generates inlines taken from c.comments var
ad19dfcdb1cc Refactoring of changeset_file_comments for more generic usage. In both It enables sharing code between changeset, and pull requests discussions
Marcin Kuzminski <marcin@python-works.com>
parents: 2430
diff changeset
96 <%def name="inlines()">
2310
83e4447077d3 Improved i18n for the comment count (use of ngettext for pluralisation).
Vincent Duvert <vincent@duvert.net>
parents: 2307
diff changeset
97 <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>
1888
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
98 %for path, lines in c.inline_comments:
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
99 % for line,comments in lines.iteritems():
2187
b61e540122f2 #415: Adding comment to changeset causes reload
Marcin Kuzminski <marcin@python-works.com>
parents: 1888
diff changeset
100 <div style="display:none" class="inline-comment-placeholder" path="${path}" target_id="${h.safeid(h.safe_unicode(path))}">
1888
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
101 %for co in comments:
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
102 ${comment_block(co)}
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
103 %endfor
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
104 </div>
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
105 %endfor
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
106 %endfor
2188
56e96d4e9f6e white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 2187
diff changeset
107
2187
b61e540122f2 #415: Adding comment to changeset causes reload
Marcin Kuzminski <marcin@python-works.com>
parents: 1888
diff changeset
108 </%def>
1888
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
109
2608
58c529332e7e Added option to close pull requests, in future that will be close & merge
Marcin Kuzminski <marcin@python-works.com>
parents: 2489
diff changeset
110 ## generate inline comments and the main ones
58c529332e7e Added option to close pull requests, in future that will be close & merge
Marcin Kuzminski <marcin@python-works.com>
parents: 2489
diff changeset
111 <%def name="generate_comments()">
2187
b61e540122f2 #415: Adding comment to changeset causes reload
Marcin Kuzminski <marcin@python-works.com>
parents: 1888
diff changeset
112 <div class="comments">
b61e540122f2 #415: Adding comment to changeset causes reload
Marcin Kuzminski <marcin@python-works.com>
parents: 1888
diff changeset
113 <div id="inline-comments-container">
2439
ad19dfcdb1cc Refactoring of changeset_file_comments for more generic usage. In both It enables sharing code between changeset, and pull requests discussions
Marcin Kuzminski <marcin@python-works.com>
parents: 2430
diff changeset
114 ## generate inlines for this changeset
ad19dfcdb1cc Refactoring of changeset_file_comments for more generic usage. In both It enables sharing code between changeset, and pull requests discussions
Marcin Kuzminski <marcin@python-works.com>
parents: 2430
diff changeset
115 ${inlines()}
2187
b61e540122f2 #415: Adding comment to changeset causes reload
Marcin Kuzminski <marcin@python-works.com>
parents: 1888
diff changeset
116 </div>
2188
56e96d4e9f6e white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 2187
diff changeset
117
1888
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
118 %for co in c.comments:
2189
3052f90c568a fixed main comments, prevent from sending inline comments if text is empty
Marcin Kuzminski <marcin@python-works.com>
parents: 2188
diff changeset
119 <div id="comment-tr-${co.comment_id}">
3200
89931a504fcf remove comments associated to pull request from single changesets, it's too confusing.
Marcin Kuzminski <marcin@python-works.com>
parents: 3197
diff changeset
120 ## only render comments that are not from pull request, or from
89931a504fcf remove comments associated to pull request from single changesets, it's too confusing.
Marcin Kuzminski <marcin@python-works.com>
parents: 3197
diff changeset
121 ## pull request and a status change
89931a504fcf remove comments associated to pull request from single changesets, it's too confusing.
Marcin Kuzminski <marcin@python-works.com>
parents: 3197
diff changeset
122 %if not co.pull_request or co.pull_request and co.status_change:
2189
3052f90c568a fixed main comments, prevent from sending inline comments if text is empty
Marcin Kuzminski <marcin@python-works.com>
parents: 2188
diff changeset
123 ${comment_block(co)}
3200
89931a504fcf remove comments associated to pull request from single changesets, it's too confusing.
Marcin Kuzminski <marcin@python-works.com>
parents: 3197
diff changeset
124 %endif
2189
3052f90c568a fixed main comments, prevent from sending inline comments if text is empty
Marcin Kuzminski <marcin@python-works.com>
parents: 2188
diff changeset
125 </div>
1888
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
126 %endfor
2673
d5e42c00f3c1 white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 2608
diff changeset
127 </div>
2608
58c529332e7e Added option to close pull requests, in future that will be close & merge
Marcin Kuzminski <marcin@python-works.com>
parents: 2489
diff changeset
128 </%def>
58c529332e7e Added option to close pull requests, in future that will be close & merge
Marcin Kuzminski <marcin@python-works.com>
parents: 2489
diff changeset
129
58c529332e7e Added option to close pull requests, in future that will be close & merge
Marcin Kuzminski <marcin@python-works.com>
parents: 2489
diff changeset
130 ## MAIN COMMENT FORM
3104
c77d5c6358eb Implemented #670 Implementation of Roles in Pull Request
Marcin Kuzminski <marcin@python-works.com>
parents: 3103
diff changeset
131 <%def name="comments(post_url, cur_status, close_btn=False, change_status=True)">
2608
58c529332e7e Added option to close pull requests, in future that will be close & merge
Marcin Kuzminski <marcin@python-works.com>
parents: 2489
diff changeset
132
58c529332e7e Added option to close pull requests, in future that will be close & merge
Marcin Kuzminski <marcin@python-works.com>
parents: 2489
diff changeset
133 <div class="comments">
1888
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
134 %if c.rhodecode_user.username != 'default':
2368
5143b8df576c Added mentions autocomplete into main comments form
Marcin Kuzminski <marcin@python-works.com>
parents: 2310
diff changeset
135 <div class="comment-form ac">
2439
ad19dfcdb1cc Refactoring of changeset_file_comments for more generic usage. In both It enables sharing code between changeset, and pull requests discussions
Marcin Kuzminski <marcin@python-works.com>
parents: 2430
diff changeset
136 ${h.form(post_url)}
1888
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
137 <strong>${_('Leave a comment')}</strong>
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
138 <div class="clearfix">
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
139 <div class="comment-help">
2307
d2043c703f84 Fixed i18n of the second comment help block.
Vincent Duvert <vincent@duvert.net>
parents: 2302
diff changeset
140 ${(_('Comments parsed using %s syntax with %s support.') % (('<a href="%s">RST</a>' % h.url('rst_help')),
3197
b4f401524060 html: don't use tabs
Mads Kiilerich <madski@unity3d.com>
parents: 3190
diff changeset
141 '<span style="color:#003367" class="tooltip" title="%s">@mention</span>' %
b4f401524060 html: don't use tabs
Mads Kiilerich <madski@unity3d.com>
parents: 3190
diff changeset
142 _('Use @username inside this text to send notification to this RhodeCode user')))|n}
3104
c77d5c6358eb Implemented #670 Implementation of Roles in Pull Request
Marcin Kuzminski <marcin@python-works.com>
parents: 3103
diff changeset
143 %if change_status:
2482
1fd3c043c025 small UI changes for pull-request view
Marcin Kuzminski <marcin@python-works.com>
parents: 2478
diff changeset
144 | <label for="show_changeset_status_box" class="tooltip" title="${_('Check this to change current status of code-review for this changeset')}"> ${_('change status')}</label>
2217
76947224bf27 Implemented initial code-review status of changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2189
diff changeset
145 <input style="vertical-align: bottom;margin-bottom:-2px" id="show_changeset_status_box" type="checkbox" name="change_changeset_status" />
3104
c77d5c6358eb Implemented #670 Implementation of Roles in Pull Request
Marcin Kuzminski <marcin@python-works.com>
parents: 3103
diff changeset
146 %endif
1888
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
147 </div>
3104
c77d5c6358eb Implemented #670 Implementation of Roles in Pull Request
Marcin Kuzminski <marcin@python-works.com>
parents: 3103
diff changeset
148 %if change_status:
2217
76947224bf27 Implemented initial code-review status of changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2189
diff changeset
149 <div id="status_block_container" class="status-block" style="display:none">
76947224bf27 Implemented initial code-review status of changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2189
diff changeset
150 %for status,lbl in c.changeset_statuses:
76947224bf27 Implemented initial code-review status of changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2189
diff changeset
151 <div class="">
3149
68f9c216377d white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 3104
diff changeset
152 <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}">
3102
7251b3286077 fixed changeset status labels, they now select radio buttons
Marcin Kuzminski <marcin@python-works.com>
parents: 2990
diff changeset
153 <label for="${status}">${lbl}</label>
2478
8eab81115660 white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 2439
diff changeset
154 </div>
2217
76947224bf27 Implemented initial code-review status of changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2189
diff changeset
155 %endfor
2478
8eab81115660 white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 2439
diff changeset
156 </div>
3104
c77d5c6358eb Implemented #670 Implementation of Roles in Pull Request
Marcin Kuzminski <marcin@python-works.com>
parents: 3103
diff changeset
157 %endif
2391
91fae60bf2b6 merge with beta
Marcin Kuzminski <marcin@python-works.com>
parents: 2328 2369
diff changeset
158 <div class="mentions-container" id="mentions_container"></div>
91fae60bf2b6 merge with beta
Marcin Kuzminski <marcin@python-works.com>
parents: 2328 2369
diff changeset
159 ${h.textarea('text')}
1888
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
160 </div>
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
161 <div class="comment-button">
2608
58c529332e7e Added option to close pull requests, in future that will be close & merge
Marcin Kuzminski <marcin@python-works.com>
parents: 2489
diff changeset
162 ${h.submit('save', _('Comment'), class_="ui-btn large")}
3104
c77d5c6358eb Implemented #670 Implementation of Roles in Pull Request
Marcin Kuzminski <marcin@python-works.com>
parents: 3103
diff changeset
163 %if close_btn and change_status:
c77d5c6358eb Implemented #670 Implementation of Roles in Pull Request
Marcin Kuzminski <marcin@python-works.com>
parents: 3103
diff changeset
164 ${h.submit('save_close', _('Comment and close'), class_='ui-btn blue large %s' % ('hidden' if cur_status in ['not_reviewed','under_review'] else ''))}
2608
58c529332e7e Added option to close pull requests, in future that will be close & merge
Marcin Kuzminski <marcin@python-works.com>
parents: 2489
diff changeset
165 %endif
1888
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
166 </div>
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
167 ${h.end_form()}
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
168 </div>
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
169 %endif
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
170 </div>
2368
5143b8df576c Added mentions autocomplete into main comments form
Marcin Kuzminski <marcin@python-works.com>
parents: 2310
diff changeset
171 <script>
5143b8df576c Added mentions autocomplete into main comments form
Marcin Kuzminski <marcin@python-works.com>
parents: 2310
diff changeset
172 YUE.onDOMReady(function () {
2369
c2f131502037 Autocomplete fixes
Marcin Kuzminski <marcin@python-works.com>
parents: 2368
diff changeset
173 MentionsAutoComplete('text', 'mentions_container', _USERS_AC_DATA, _GROUPS_AC_DATA);
2478
8eab81115660 white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 2439
diff changeset
174
2439
ad19dfcdb1cc Refactoring of changeset_file_comments for more generic usage. In both It enables sharing code between changeset, and pull requests discussions
Marcin Kuzminski <marcin@python-works.com>
parents: 2430
diff changeset
175 // changeset status box listener
ad19dfcdb1cc Refactoring of changeset_file_comments for more generic usage. In both It enables sharing code between changeset, and pull requests discussions
Marcin Kuzminski <marcin@python-works.com>
parents: 2430
diff changeset
176 YUE.on(YUD.get('show_changeset_status_box'),'change',function(e){
ad19dfcdb1cc Refactoring of changeset_file_comments for more generic usage. In both It enables sharing code between changeset, and pull requests discussions
Marcin Kuzminski <marcin@python-works.com>
parents: 2430
diff changeset
177 if(e.currentTarget.checked){
2478
8eab81115660 white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 2439
diff changeset
178 YUD.setStyle('status_block_container','display','');
2439
ad19dfcdb1cc Refactoring of changeset_file_comments for more generic usage. In both It enables sharing code between changeset, and pull requests discussions
Marcin Kuzminski <marcin@python-works.com>
parents: 2430
diff changeset
179 }
ad19dfcdb1cc Refactoring of changeset_file_comments for more generic usage. In both It enables sharing code between changeset, and pull requests discussions
Marcin Kuzminski <marcin@python-works.com>
parents: 2430
diff changeset
180 else{
ad19dfcdb1cc Refactoring of changeset_file_comments for more generic usage. In both It enables sharing code between changeset, and pull requests discussions
Marcin Kuzminski <marcin@python-works.com>
parents: 2430
diff changeset
181 YUD.setStyle('status_block_container','display','none');
ad19dfcdb1cc Refactoring of changeset_file_comments for more generic usage. In both It enables sharing code between changeset, and pull requests discussions
Marcin Kuzminski <marcin@python-works.com>
parents: 2430
diff changeset
182 }
ad19dfcdb1cc Refactoring of changeset_file_comments for more generic usage. In both It enables sharing code between changeset, and pull requests discussions
Marcin Kuzminski <marcin@python-works.com>
parents: 2430
diff changeset
183 })
3103
91492a72b2dc implements #677: Don't allow to close pull requests when they are under-review state
Marcin Kuzminski <marcin@python-works.com>
parents: 3102
diff changeset
184 YUE.on(YUQ('.status_change_radio'), 'change',function(e){
3197
b4f401524060 html: don't use tabs
Mads Kiilerich <madski@unity3d.com>
parents: 3190
diff changeset
185 var val = e.currentTarget.value;
b4f401524060 html: don't use tabs
Mads Kiilerich <madski@unity3d.com>
parents: 3190
diff changeset
186 if (val == 'approved' || val == 'rejected') {
b4f401524060 html: don't use tabs
Mads Kiilerich <madski@unity3d.com>
parents: 3190
diff changeset
187 YUD.removeClass('save_close', 'hidden');
b4f401524060 html: don't use tabs
Mads Kiilerich <madski@unity3d.com>
parents: 3190
diff changeset
188 }else{
b4f401524060 html: don't use tabs
Mads Kiilerich <madski@unity3d.com>
parents: 3190
diff changeset
189 YUD.addClass('save_close', 'hidden');
b4f401524060 html: don't use tabs
Mads Kiilerich <madski@unity3d.com>
parents: 3190
diff changeset
190 }
3103
91492a72b2dc implements #677: Don't allow to close pull requests when they are under-review state
Marcin Kuzminski <marcin@python-works.com>
parents: 3102
diff changeset
191 })
2478
8eab81115660 white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 2439
diff changeset
192
2368
5143b8df576c Added mentions autocomplete into main comments form
Marcin Kuzminski <marcin@python-works.com>
parents: 2310
diff changeset
193 });
5143b8df576c Added mentions autocomplete into main comments form
Marcin Kuzminski <marcin@python-works.com>
parents: 2310
diff changeset
194 </script>
1888
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1860
diff changeset
195 </%def>