Files
@ 8b7294a804a0
Branch filter:
Location: kallithea/rhodecode/templates/changeset/changeset_file_comment.html - annotation
8b7294a804a0
10.2 KiB
text/html
Update CONTRIBUTORS with new contributors from RhodeCode v2.2.5
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 | f91d3f9b7230 f91d3f9b7230 f91d3f9b7230 f91d3f9b7230 f91d3f9b7230 f91d3f9b7230 b61e540122f2 f91d3f9b7230 b4f401524060 9265958e33bb b4f401524060 b4f401524060 b4f401524060 b4f401524060 45df84d36b44 b4f401524060 786236aa313e 45df84d36b44 786236aa313e 786236aa313e 786236aa313e 786236aa313e fd4ea41c2dc1 786236aa313e 87b0a652b6b1 786236aa313e 81bbb8086f03 3b5f32aeed36 3b5f32aeed36 3b5f32aeed36 3b5f32aeed36 3b5f32aeed36 3b5f32aeed36 786236aa313e 786236aa313e 786236aa313e 3b5f32aeed36 3b5f32aeed36 3b5f32aeed36 3b5f32aeed36 3b5f32aeed36 3b5f32aeed36 3b5f32aeed36 3b5f32aeed36 3b5f32aeed36 45df84d36b44 f91d3f9b7230 45df84d36b44 f91d3f9b7230 b4f401524060 b4f401524060 b4f401524060 b4f401524060 f91d3f9b7230 f91d3f9b7230 f91d3f9b7230 f91d3f9b7230 f91d3f9b7230 a0adf8db1416 f91d3f9b7230 c2f131502037 f91d3f9b7230 b61e540122f2 a0adf8db1416 45df84d36b44 d2043c703f84 f467c75544af f467c75544af b4f401524060 f467c75544af f467c75544af f467c75544af 7b5bf8e01325 5143b8df576c 5143b8df576c 45df84d36b44 45df84d36b44 45df84d36b44 45df84d36b44 7b5bf8e01325 7b5bf8e01325 45df84d36b44 45df84d36b44 f91d3f9b7230 f91d3f9b7230 f91d3f9b7230 f91d3f9b7230 b61e540122f2 6dd1e4d60720 f91d3f9b7230 f91d3f9b7230 f91d3f9b7230 f91d3f9b7230 f91d3f9b7230 f91d3f9b7230 66fa6c434ce4 f91d3f9b7230 f91d3f9b7230 f91d3f9b7230 f91d3f9b7230 f91d3f9b7230 f91d3f9b7230 f91d3f9b7230 f91d3f9b7230 f91d3f9b7230 f91d3f9b7230 f91d3f9b7230 f91d3f9b7230 ad19dfcdb1cc ad19dfcdb1cc 83e4447077d3 f91d3f9b7230 f91d3f9b7230 b61e540122f2 f91d3f9b7230 f91d3f9b7230 f91d3f9b7230 f91d3f9b7230 f91d3f9b7230 f91d3f9b7230 56e96d4e9f6e b61e540122f2 f91d3f9b7230 58c529332e7e aad51f79d040 b61e540122f2 b61e540122f2 ad19dfcdb1cc ad19dfcdb1cc b61e540122f2 56e96d4e9f6e f91d3f9b7230 3052f90c568a 89931a504fcf 89931a504fcf aad51f79d040 3052f90c568a 89931a504fcf 3052f90c568a f91d3f9b7230 d5e42c00f3c1 58c529332e7e 58c529332e7e 58c529332e7e fd4ea41c2dc1 58c529332e7e 58c529332e7e f91d3f9b7230 5143b8df576c ad19dfcdb1cc 45df84d36b44 f91d3f9b7230 d2043c703f84 b4f401524060 b4f401524060 c77d5c6358eb fd4ea41c2dc1 fd4ea41c2dc1 fd4ea41c2dc1 fd4ea41c2dc1 fd4ea41c2dc1 fd4ea41c2dc1 fd4ea41c2dc1 716ac7659b90 c77d5c6358eb 7b5bf8e01325 f91d3f9b7230 c77d5c6358eb 76947224bf27 76947224bf27 76947224bf27 68f9c216377d 7251b3286077 8eab81115660 76947224bf27 fd4ea41c2dc1 1e7befa639cc 1e7befa639cc 1e7befa639cc 8eab81115660 c77d5c6358eb 91fae60bf2b6 45df84d36b44 f91d3f9b7230 45df84d36b44 45df84d36b44 45df84d36b44 7b5bf8e01325 7b5bf8e01325 45df84d36b44 45df84d36b44 45df84d36b44 45df84d36b44 f91d3f9b7230 58c529332e7e f91d3f9b7230 f91d3f9b7230 f91d3f9b7230 f91d3f9b7230 f91d3f9b7230 5143b8df576c 716ac7659b90 716ac7659b90 716ac7659b90 716ac7659b90 716ac7659b90 716ac7659b90 5143b8df576c c2f131502037 8eab81115660 9314f2645161 9314f2645161 1e7befa639cc 1e7befa639cc b4f401524060 1e7befa639cc 1e7befa639cc b4f401524060 9314f2645161 9314f2645161 9314f2645161 9314f2645161 91492a72b2dc 9314f2645161 9314f2645161 9314f2645161 45df84d36b44 45df84d36b44 45df84d36b44 45df84d36b44 45df84d36b44 45df84d36b44 45df84d36b44 45df84d36b44 45df84d36b44 45df84d36b44 45df84d36b44 45df84d36b44 45df84d36b44 45df84d36b44 45df84d36b44 45df84d36b44 45df84d36b44 45df84d36b44 45df84d36b44 45df84d36b44 45df84d36b44 8eab81115660 5143b8df576c 5143b8df576c f91d3f9b7230 | ## -*- coding: utf-8 -*-
## usage:
## <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
## ${comment.comment_block(co)}
##
<%def name="comment_block(co)">
<div class="comment" id="comment-${co.comment_id}" line="${co.line_no}">
<div class="comment-wrapp">
<div class="meta">
<div style="float:left"> <img src="${h.gravatar_url(co.author.email, 20)}" /> </div>
<div class="user">
${co.author.username}
</div>
<div class="date">
${h.age(co.modified_at)}
</div>
<div style="float:left;padding:4px 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:
${_('Vote on pull request #%s') % co.pull_request.pull_request_id}:
%else:
${_('Comment on pull request #%s') % co.pull_request.pull_request_id}
%endif
</a>
%else:
%if co.status_change:
${_('Status change on changeset')}:
%else:
${_('Comment on changeset')}
%endif
%endif
</span>
</div>
%if co.status_change:
<div style="float:left" class="changeset-status-container">
<div style="float:left;padding:10px 2px 0px 2px"></div>
<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>
</div>
%endif
<a class="permalink" href="#comment-${co.comment_id}">¶</a>
%if h.HasPermissionAny('hg.admin', 'repository.admin')() or co.author.user_id == c.rhodecode_user.user_id:
<div onClick="deleteComment(${co.comment_id})" class="buttons delete-comment ui-btn small">${_('Delete')}</div>
%endif
</div>
<div class="text">
${h.rst_w_mentions(co.text)|n}
</div>
</div>
</div>
</%def>
<%def name="comment_inline_form()">
<div id='comment-inline-form-template' style="display:none">
<div class="comment-inline-form ac">
%if c.rhodecode_user.username != 'default':
<div class="overlay"><div class="overlay-text">${_('Submitting...')}</div></div>
${h.form('#', class_='inline-form')}
<div id="edit-container_{1}" class="clearfix">
<div class="comment-help">${_('Commenting on line {1}.')}
${(_('Comments parsed using %s syntax with %s support.') % (
('<a href="%s">RST</a>' % h.url('rst_help')),
('<span style="color:#003367" class="tooltip" title="%s">@mention</span>' % _('Use @username inside this text to send notification to this RhodeCode user'))
)
)|n
}
<div id="preview-btn_{1}" class="preview-btn ui-btn small">${_('Preview')}</div>
</div>
<div class="mentions-container" id="mentions_container_{1}"></div>
<textarea id="text_{1}" name="text" class="comment-block-ta yui-ac-input"></textarea>
</div>
<div id="preview-container_{1}" class="clearfix" style="display:none">
<div class="comment-help">
${_('Comment preview')}
<div id="edit-btn_{1}" class="edit-btn ui-btn small">${_('Edit')}</div>
</div>
<div id="preview-box_{1}" class="preview-box"></div>
</div>
<div class="comment-button">
<input type="hidden" name="f_path" value="{0}">
<input type="hidden" name="line" value="{1}">
${h.submit('save', _('Comment'), class_='ui-btn save-inline-form')}
${h.reset('hide-inline-form', _('Cancel'), class_='ui-btn hide-inline-form')}
</div>
${h.end_form()}
%else:
${h.form('')}
<div class="clearfix">
<div class="comment-help">
${_('You need to be logged in to comment.')} <a href="${h.url('login_home',came_from=h.url.current())}">${_('Login now')}</a>
</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>
## generates inlines taken from c.comments var
<%def name="inlines()">
<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>
%for path, lines in c.inline_comments:
% for line,comments in lines.iteritems():
<div style="display:none" class="inline-comment-placeholder" path="${path}" target_id="${h.safeid(h.safe_unicode(path))}">
%for co in comments:
${comment_block(co)}
%endfor
</div>
%endfor
%endfor
</%def>
## generate inline comments and the main ones
<%def name="generate_comments(include_pr=False)">
<div class="comments">
<div id="inline-comments-container">
## generate inlines for this changeset
${inlines()}
</div>
%for co in c.comments:
<div id="comment-tr-${co.comment_id}">
## only render comments that are not from pull request, or from
## pull request and a status change
%if not co.pull_request or (co.pull_request and co.status_change) or include_pr:
${comment_block(co)}
%endif
</div>
%endfor
</div>
</%def>
## MAIN COMMENT FORM
<%def name="comments(post_url, cur_status, is_pr=False, change_status=True)">
<div class="comments">
%if c.rhodecode_user.username != 'default':
<div class="comment-form ac">
${h.form(post_url)}
<div id="edit-container" class="clearfix">
<div class="comment-help">
${(_('Comments parsed using %s syntax with %s support.') % (('<a href="%s">RST</a>' % h.url('rst_help')),
'<span style="color:#003367" class="tooltip" title="%s">@mention</span>' %
_('Use @username inside this text to send notification to this RhodeCode user')))|n}
%if change_status:
| <a id="show_changeset_link" onClick="change_status_show();">
%if is_pr:
${_('Vote for pull request status')}
%else:
${_('Change changeset status')}
%endif
</a>
<input id="show_changeset_status_box" type="checkbox" name="change_changeset_status" style="display: none;" />
%endif
<div id="preview-btn" class="preview-btn ui-btn small">${_('Preview')}</div>
</div>
%if change_status:
<div id="status_block_container" class="status-block" style="display:none">
%for status,lbl in c.changeset_statuses:
<div class="">
<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}">
<label for="${status}">${lbl}</label>
</div>
%endfor
%if is_pr and change_status:
<input id="save_close" type="checkbox" name="save_close" disabled="${'1' if cur_status in ['not_reviewed','under_review'] else ''}">
<label id="save_close_label" for="save_close" class="${'disabled' if cur_status in ['not_reviewed','under_review'] else ''}">${_("Close (when approved or rejected)")}</label>
%endif
</div>
%endif
<div class="mentions-container" id="mentions_container"></div>
${h.textarea('text', class_="comment-block-ta")}
</div>
<div id="preview-container" class="clearfix" style="display:none">
<div class="comment-help">
${_('Comment preview')}
<div id="edit-btn" class="edit-btn ui-btn small">${_('Edit')}</div>
</div>
<div id="preview-box" class="preview-box"></div>
</div>
<div class="comment-button">
${h.submit('save', _('Comment'), class_="ui-btn large")}
</div>
${h.end_form()}
</div>
%endif
</div>
<script>
var change_status_show = function(){
var show = ! YUD.get('show_changeset_status_box').checked;
YUD.get('show_changeset_status_box').checked = show;
YUD.setStyle('status_block_container', 'display', show?'':'none');
};
YUE.onDOMReady(function () {
MentionsAutoComplete('text', 'mentions_container', _USERS_AC_DATA, _GROUPS_AC_DATA);
var set_close_button_state = function(cur_val){
if (cur_val == 'approved' || cur_val == 'rejected') {
YUD.removeClass('save_close_label', 'disabled');
YUD.get('save_close').disabled = false;
}else{
YUD.addClass('save_close_label', 'disabled');
YUD.get('save_close').disabled = true;
}
}
YUE.on(YUQ('.status_change_radio'), 'change',function(e){
var val = e.currentTarget.value;
set_close_button_state(val)
})
// if currect checked status is approved or rejected we should unlock the close button
var cur_val = YUQ('.status_change_radio[checked]')[0].value;
set_close_button_state(cur_val)
YUE.on('preview-btn', 'click', function(e){
var _text = YUD.get('text').value;
if(!_text){
return
}
var post_data = {'text': _text};
YUD.addClass('preview-box', 'unloaded');
YUD.get('preview-box').innerHTML = _TM['Loading ...'];
YUD.setStyle('edit-container', 'display', 'none');
YUD.setStyle('preview-container', 'display', '');
var url = pyroutes.url('changeset_comment_preview', {'repo_name': '${c.repo_name}'});
ajaxPOST(url,post_data,function(o){
YUD.get('preview-box').innerHTML = o.responseText;
YUD.removeClass('preview-box', 'unloaded');
})
})
YUE.on('edit-btn', 'click', function(e){
YUD.setStyle('edit-container', 'display', '');
YUD.setStyle('preview-container', 'display', 'none');
})
});
</script>
</%def>
|