diff --git a/rhodecode/templates/pullrequests/pullrequest_show.html b/rhodecode/templates/pullrequests/pullrequest_show.html new file mode 100644 --- /dev/null +++ b/rhodecode/templates/pullrequests/pullrequest_show.html @@ -0,0 +1,195 @@ +<%inherit file="/base/base.html"/> + +<%def name="title()"> + ${c.repo_name} ${_('Pull request #%s') % c.pull_request.pull_request_id} + + +<%def name="breadcrumbs_links()"> + ${h.link_to(_(u'Home'),h.url('/'))} + » + ${h.link_to(c.repo_name,h.url('changelog_home',repo_name=c.repo_name))} + » + ${_('Pull request #%s') % c.pull_request.pull_request_id} + + +<%def name="main()"> + +
+ +
+ ${self.breadcrumbs()} +
+ %if c.pull_request.is_closed(): +
${_('Closed %s') % (h.age(c.pull_request.updated_on))}
+ %endif +

${_('Title')}: ${c.pull_request.title}

+ +
+
+
+
+ +
+
+
+ %if c.current_changeset_status: +
[${h.changeset_status_lbl(c.current_changeset_status)}]
+
+ %endif +
+
+
+
+
+ +
+
+
${ungettext('%d reviewer', '%d reviewers',len(c.pull_request_pending_reviewers)) % len(c.pull_request_pending_reviewers)}
+
+
+
+
+
${h.literal(c.pull_request.description)}
+
+
${_('Created on')}: ${h.fmt_date(c.pull_request.created_on)}
+
+ +
+ ##DIFF +
+
+
${_('Compare view')}
+
+
+ ##CS +
${_('Incoming changesets')}
+ <%include file="/compare/compare_cs.html" /> + + ## FILES +
${_('Files affected')}
+
+ %for fid, change, f, stat in c.files: +
+
${h.link_to(h.safe_unicode(f),h.url.current(anchor=fid))}
+
${h.fancy_file_stats(stat)}
+
+ %endfor +
+
+
+ ## REVIEWERS +
+

${_('Pull request reviewers')}

+
+ ## members goes here ! +
+
    + %for member,status in c.pull_request_reviewers: +
  • +
    +
    + +
    +
    gravatar
    +
    ${member.full_name} (${_('owner')})
    + + %if not c.pull_request.is_closed() and (h.HasPermissionAny('hg.admin', 'repository.admin')() or c.pull_request.author.user_id == c.rhodecode_user.user_id): + + %endif +
    +
    • + %endfor +
+
+ %if not c.pull_request.is_closed(): +
+ %if h.HasPermissionAny('hg.admin', 'repository.admin')() or c.pull_request.author.user_id == c.rhodecode_user.user_id: +
+ ${h.text('user', class_='yui-ac-input')} + ${_('Add reviewer to this pull request.')} +
+
+
+ ${_('save')} +
+ %endif +
+ %endif +
+
+
+ + + ## 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 + + ## 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_changeset_status, + close_btn=True)} + %endif + + + +
+ +