Files
@ a21668fe545b
Branch filter:
Location: kallithea/kallithea/templates/pullrequests/pullrequest_show.html
a21668fe545b
17.1 KiB
text/html
comments: make preview button more obvious - show it next to other buttons
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 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 | <%inherit file="/base/base.html"/>
<%def name="title()">
${_('%s Pull Request #%s') % (c.repo_name, c.pull_request.pull_request_id)}
%if c.site_name:
· ${c.site_name}
%endif
</%def>
<%def name="breadcrumbs_links()">
${_('Pull request #%s from %s#%s') % (c.pull_request.pull_request_id, c.pull_request.org_repo.repo_name, c.org_branch_name)}
</%def>
<%def name="page_nav()">
${self.menu('repositories')}
</%def>
<%def name="main()">
${self.repo_context_bar('showpullrequest')}
<div class="box">
<!-- box / title -->
<div class="title">
${self.breadcrumbs()}
</div>
<div class="form pr-box" style="float: left">
<div class="pr-details-title ${'closed' if c.pull_request.is_closed() else ''}">
${_('Title')}: ${c.pull_request.title}
%if c.pull_request.is_closed():
(${_('Closed')})
%endif
</div>
<div id="pr-summary" class="fields">
<div class="field pr-not-edit" style="min-height:37px">
<div class="label-summary">
<label>${_('Description')}:</label>
%if not c.pull_request.is_closed() and (h.HasPermissionAny('hg.admin', 'repository.admin')() or c.pull_request.author.user_id == c.authuser.user_id):
<div style="margin: 5px">
<a class="btn btn-mini" onclick="YUD.setStyle('pr-edit-form','display','');YUD.setStyle(YUD.getElementsByClassName('pr-not-edit'),'display','none')">${_("Edit")}</a>
</div>
%endif
</div>
<div class="input">
<div style="white-space:pre-wrap; line-height: 14px">${h.urlify_commit(c.pull_request.description, c.pull_request.org_repo.repo_name)}</div>
</div>
</div>
%if not c.pull_request.is_closed() and (h.HasPermissionAny('hg.admin', 'repository.admin')() or c.pull_request.author.user_id == c.authuser.user_id):
<div id="pr-edit-form" style="display:none">
${h.form(url('pullrequest_post', repo_name=c.repo_name, pull_request_id=c.pull_request.pull_request_id), method='post', id='pull_request_form')}
<div class="field">
<div class="label-summary">
<label for="pullrequest_title">${_('Title')}:</label>
</div>
<div class="input">
${h.text('pullrequest_title',class_="large",value=c.pull_request.title,placeholder=_('Summarize the changes'))}
</div>
</div>
<div class="field">
<div class="label-summary label-textarea">
<label for="pullrequest_desc">${_('Description')}:</label>
</div>
<div class="textarea text-area editor">
${h.textarea('pullrequest_desc',size=30,content=c.pull_request.description,placeholder=_('Write a short description on this pull request'))}
</div>
<div class="buttons">
${h.submit('save',_('Save'),class_="btn btn-mini")}
${h.reset('reset',_('Cancel'),class_="btn btn-mini",onclick="YUD.setStyle('pr-edit-form','display','none');YUD.setStyle(YUD.getElementsByClassName('pr-not-edit'),'display','')")}
</div>
</div>
${h.end_form()}
</div>
%endif
<div class="field">
<div class="label-summary">
<label>${_('Reviewer voting result')}:</label>
</div>
<div class="input">
<div class="changeset-status-container" style="float:none;clear:both">
%if c.current_voting_result:
<div class="changeset-status-ico" style="padding:0px 4px 0px 0px">
<img src="${h.url('/images/icons/flag_status_%s.png' % c.current_voting_result)}" title="${_('Pull request status calculated from votes')}"/></div>
<div class="changeset-status-lbl tooltip" title="${_('Pull request status calculated from votes')}">
%if c.pull_request.is_closed():
${_('Closed')},
%endif
${h.changeset_status_lbl(c.current_voting_result)}
</div>
%endif
</div>
</div>
</div>
<div class="field">
<div class="label-summary">
<label>${_('Still not reviewed by')}:</label>
</div>
<div class="input">
% if len(c.pull_request_pending_reviewers) > 0:
<div class="tooltip" title="${h.tooltip(', '.join([x.username for x in c.pull_request_pending_reviewers]))}">${ungettext('%d reviewer', '%d reviewers',len(c.pull_request_pending_reviewers)) % len(c.pull_request_pending_reviewers)}</div>
% elif len(c.pull_request_reviewers) > 0:
<div>${_('Pull request was reviewed by all reviewers')}</div>
%else:
<div>${_('There are no reviewers')}</div>
%endif
</div>
</div>
<div class="field">
<div class="label-summary">
<label>${_('Origin')}:</label>
</div>
<div class="input">
<div>
${h.link_to_ref(c.pull_request.org_repo.repo_name, c.org_ref_type, c.org_ref_name, c.org_rev)}
%if c.org_ref_type != 'branch':
${_('on')} ${h.link_to_ref(c.pull_request.org_repo.repo_name, 'branch', c.org_branch_name)}
%endif
</div>
</div>
</div>
<div class="field">
<div class="label-summary">
<label>${_('Target')}:</label>
</div>
<div class="input">
<div>
${h.link_to_ref(c.pull_request.other_repo.repo_name, c.other_ref_type, c.other_ref_name)}
## we don't know other rev - c.other_rev is ancestor and not necessarily on other_name_branch branch
</div>
</div>
</div>
<div class="field">
<div class="label-summary">
<label>${_('Pull changes')}:</label>
</div>
<div class="input">
<div>
## TODO: use cs_ranges[-1] or org_ref_parts[1] in both cases?
%if h.is_hg(c.pull_request.org_repo):
<span style="font-family: monospace">hg pull ${c.pull_request.org_repo.clone_url()} -r ${h.short_id(c.cs_ranges[-1].raw_id)}</span>
%elif h.is_git(c.pull_request.org_repo):
<span style="font-family: monospace">git pull ${c.pull_request.org_repo.clone_url()} ${c.pull_request.org_ref_parts[1]}</span>
%endif
</div>
</div>
</div>
<div class="field">
<div class="label-summary">
<label>${_('Created on')}:</label>
</div>
<div class="input">
<div>${h.fmt_date(c.pull_request.created_on)}</div>
</div>
</div>
<div class="field">
<div class="label-summary">
<label>${_('Created by')}:</label>
</div>
<div class="input">
<div class="author">
<div class="gravatar">
<img alt="gravatar" src="${h.gravatar_url(c.pull_request.author.email,20)}"/>
</div>
<span>${c.pull_request.author.username_and_name}</span><br/>
<span><a href="mailto:${c.pull_request.author.email}">${c.pull_request.author.email}</a></span><br/>
</div>
</div>
</div>
${h.form(url('pullrequest_copy_update',repo_name=c.repo_name,pull_request_id=c.pull_request.pull_request_id), method='post')}
<div class="field">
<div class="label-summary">
<label>${_('Update')}:</label>
</div>
%if c.available:
<div class="input" style="max-height:200px; overflow-y:auto; overflow-x:hidden">
${_("Changesets on %s not included in this pull request:") % c.org_branch_name}
<table class="noborder">
%for cnt, cs in enumerate(reversed(c.available)):
<tr>
<td>${h.radio(name='updaterev', value=cs.raw_id)}</td>
<td>${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.org_repo.repo_name,revision=cs.raw_id))}</td>
<td><div class="message" style="white-space:normal; height:1.1em; max-width: 500px; padding:0">${h.urlify_commit(cs.message, c.repo_name)}</div></td>
</tr>
%endfor
</table>
</div>
<div class="buttons">
${h.submit('copy_update',_('Create pull request update'),class_="btn btn-small")}
</div>
%else:
<div class="input">
${_("No changesets found for updating this pull request.")}
</div>
%endif
</div>
${h.end_form()}
</div>
</div>
## REVIEWERS
<div style="float:left; border-left:1px dashed #eee">
<div class="pr-details-title">${_('Pull request reviewers')}</div>
<div id="reviewers" style="padding:0px 0px 5px 10px">
## members goes here !
<div>
<ul id="review_members" class="group_members">
%for member,status in c.pull_request_reviewers:
<li id="reviewer_${member.user_id}">
<div class="reviewers_member">
<div class="reviewer_status tooltip" title="${h.tooltip(h.changeset_status_lbl(status.status if status else 'not_reviewed'))}">
<img src="${h.url(str('/images/icons/flag_status_%s.png' % (status.status if status else 'not_reviewed')))}"/>
</div>
<div class="reviewer_gravatar gravatar"><img alt="gravatar" src="${h.gravatar_url(member.email,14)}"/> </div>
<div style="float:left;">${member.full_name} (${_('owner') if c.pull_request.user_id == member.user_id else _('reviewer')})</div>
<input type="hidden" value="${member.user_id}" name="review_members" />
%if not c.pull_request.is_closed() and (h.HasPermissionAny('hg.admin')() or h.HasRepoPermissionAny('repository.admin')(c.repo_name) or c.pull_request.user_id == c.authuser.user_id):
<div class="reviewer_member_remove action_button" onclick="removeReviewMember(${member.user_id})" title="${_('Remove reviewer')}">
<i class="icon-remove-sign" style="color: #FF4444;"></i>
</div>
%endif
</div>
</li>
%endfor
</ul>
</div>
%if not c.pull_request.is_closed():
<div class='ac'>
%if h.HasPermissionAny('hg.admin')() or h.HasRepoPermissionAny('repository.admin')(c.repo_name) or c.pull_request.author.user_id == c.authuser.user_id:
<div class="reviewer_ac">
${h.text('user', class_='yui-ac-input',placeholder=_('Type name of reviewer to add'))}
<div id="reviewers_container"></div>
</div>
<div style="padding:0px 10px">
<span id="update_pull_request" class="btn btn-mini">${_('Save Changes')}</span>
</div>
%endif
</div>
%endif
</div>
</div>
<div style="overflow: auto; clear: both">
##DIFF
<div class="table" style="float:left;clear:none">
<div class="diffblock">
<div style="padding:5px">
${_('Compare view')}
</div>
</div>
<div id="changeset_compare_view_content">
##CS
<div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${ungettext('Showing %s commit','Showing %s commits', len(c.cs_ranges)) % len(c.cs_ranges)}</div>
<%include file="/compare/compare_cs.html" />
<div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">
${_('Common ancestor')}:
${h.link_to(h.short_id(c.other_rev),h.url('changeset_home',repo_name=c.other_repo.repo_name,revision=c.other_rev))}
</div>
## FILES
<div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">
% if c.limited_diff:
${ungettext('%s file changed', '%s files changed', len(c.files)) % len(c.files)}
% else:
${ungettext('%s file changed with %s insertions and %s deletions','%s files changed with %s insertions and %s deletions', len(c.files)) % (len(c.files),c.lines_added,c.lines_deleted)}:
%endif
</div>
<div class="cs_files">
%if not c.files:
<span class="empty_data">${_('No files')}</span>
%endif
%for fid, change, f, stat in c.files:
<div class="cs_${change}">
<div class="node">${h.link_to(h.safe_unicode(f),'#' + fid)}</div>
<div class="changes">${h.fancy_file_stats(stat)}</div>
</div>
%endfor
</div>
<div class="comments-number pr-comments-number">${ungettext("%d comment", "%d comments", len(c.comments)) % len(c.comments)} ${ungettext("(%d inline)", "(%d inline)", c.inline_cnt) % c.inline_cnt} <span class="firstlink"></span> </div>
% if c.limited_diff:
<h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff anyway')}</a></h5>
% endif
</div>
</div>
</div>
<script>
var _USERS_AC_DATA = ${c.users_array|n};
var _GROUPS_AC_DATA = ${c.user_groups_array|n};
// TODO: switch this to pyroutes
AJAX_COMMENT_URL = "${url('pullrequest_comment',repo_name=c.repo_name,pull_request_id=c.pull_request.pull_request_id)}";
AJAX_COMMENT_DELETE_URL = "${url('pullrequest_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}";
pyroutes.register('pullrequest_comment', "${url('pullrequest_comment',repo_name='%(repo_name)s',pull_request_id='%(pull_request_id)s')}", ['repo_name', 'pull_request_id']);
pyroutes.register('pullrequest_comment_delete', "${url('pullrequest_comment_delete',repo_name='%(repo_name)s',comment_id='%(comment_id)s')}", ['repo_name', 'comment_id']);
pyroutes.register('pullrequest_update', "${url('pullrequest_update',repo_name='%(repo_name)s',pull_request_id='%(pull_request_id)s')}", ['repo_name', 'pull_request_id']);
</script>
## diff block
<%namespace name="diff_block" file="/changeset/diff_block.html"/>
%for fid, change, f, stat in c.files:
${diff_block.diff_block_simple([c.changes[fid]])}
%endfor
% if c.limited_diff:
<h4>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff anyway')}</a></h4>
% endif
## template for inline comment form
<%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
${comment.comment_inline_form()}
## render comments and inlines
${comment.generate_comments()}
% if not c.pull_request.is_closed():
## main comment form and it status
${comment.comments(h.url('pullrequest_comment', repo_name=c.repo_name,
pull_request_id=c.pull_request.pull_request_id),
c.current_voting_result,
is_pr=True, change_status=c.allowed_to_change_status)}
%endif
<script type="text/javascript">
YUE.onDOMReady(function(){
PullRequestAutoComplete('user', 'reviewers_container', _USERS_AC_DATA, _GROUPS_AC_DATA);
YUE.on(YUQ('.show-inline-comments'),'change',function(e){
var show = 'none';
var target = e.currentTarget;
if(target.checked){
var show = ''
}
var boxid = YUD.getAttribute(target,'id_for');
var comments = YUQ('#{0} .inline-comments'.format(boxid));
for(c in comments){
YUD.setStyle(comments[c],'display',show);
}
var btns = YUQ('#{0} .inline-comments-button'.format(boxid));
for(c in btns){
YUD.setStyle(btns[c],'display',show);
}
})
YUE.on(YUQ('.line'),'click',function(e){
var tr = e.currentTarget;
injectInlineForm(tr);
});
// inject comments into they proper positions
var file_comments = YUQ('.inline-comment-placeholder');
renderInlineComments(file_comments);
linkInlineComments(document.getElementsByClassName('firstlink'), document.getElementsByClassName("inline-comment"));
YUE.on(YUD.get('update_pull_request'),'click',function(e){
updateReviewers(undefined, "${c.repo_name}", "${c.pull_request.pull_request_id}");
})
// hack: re-navigate to target after JS is done ... if a target is set and setting href thus won't reload
if (window.location.hash != "") {
window.location.href = window.location.href;
}
})
</script>
</div>
</%def>
|