diff --git a/rhodecode/templates/pullrequests/pullrequest_show.html b/rhodecode/templates/pullrequests/pullrequest_show.html --- a/rhodecode/templates/pullrequests/pullrequest_show.html +++ b/rhodecode/templates/pullrequests/pullrequest_show.html @@ -1,39 +1,48 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${c.repo_name} ${_('Pull request #%s') % c.pull_request.pull_request_id} + ${_('%s Pull Request #%s') % (c.repo_name, c.pull_request.pull_request_id)} · ${c.rhodecode_name} <%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="page_nav()"> + ${self.menu('repositories')} + + <%def name="main()"> - +${self.context_bar('showpullrequest')}
${self.breadcrumbs()}
+ +

+ + ${_('Title')}: ${c.pull_request.title} %if c.pull_request.is_closed(): -
${_('Closed %s') % (h.age(c.pull_request.updated_on))} ${_('with status %s') % h.changeset_status_lbl(c.current_changeset_status)}
+ (${_('Closed')}) %endif -

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

+
- +
%if c.current_changeset_status: -
[${h.changeset_status_lbl(c.current_changeset_status)}]
+
+ %if c.pull_request.is_closed(): + ${_('Closed')}, + %endif + ${h.changeset_status_lbl(c.current_changeset_status)} +
%endif
@@ -47,7 +56,7 @@ % if len(c.pull_request_pending_reviewers) > 0:
${ungettext('%d reviewer', '%d reviewers',len(c.pull_request_pending_reviewers)) % len(c.pull_request_pending_reviewers)}
%else: -
${_('pull request was reviewed by all reviewers')}
+
${_('Pull request was reviewed by all reviewers')}
%endif
@@ -62,19 +71,29 @@ ##%elif h.is_git(c.pull_request.org_repo): ## ${_('Git repository')} ##%endif - ${c.pull_request.org_ref_parts[0]} - : - ${c.pull_request.org_ref_parts[1]} - ${c.pull_request.org_repo.clone_url()} + ${c.pull_request.org_ref_parts[0]}: ${c.pull_request.org_ref_parts[1]} + ${c.pull_request.org_repo.clone_url()}
-
+ +
+
+ +
+
+
${h.literal(c.pull_request.description)}
+
+
+
+
+ +
+
+
${h.fmt_date(c.pull_request.created_on)}
+
+
-
${h.literal(c.pull_request.description)}
-
-
${_('Created on')}: ${h.fmt_date(c.pull_request.created_on)}
-
##DIFF @@ -109,7 +128,7 @@ %endfor
% if c.limited_diff: -
${_('Changeset was too big and was cut off...')}
+
${_('Changeset was too big and was cut off...')} ${_('Show full diff')}
% endif @@ -130,7 +149,7 @@
${member.full_name} (${_('owner') if c.pull_request.user_id == member.user_id else _('reviewer')})
%if not c.pull_request.is_closed() and (h.HasPermissionAny('hg.admin', 'repository.admin')() or c.pull_request.user_id == c.rhodecode_user.user_id): - + %endif @@ -142,11 +161,11 @@ %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.')} + ${_('Add or remove reviewer to this pull request.')}
- ${_('save')} + ${_('Save changes')}
%endif @@ -157,9 +176,14 @@ ## diff block @@ -168,7 +192,7 @@ ${diff_block.diff_block_simple([c.changes[fid]])} %endfor % if c.limited_diff: -

${_('Changeset was too big and was cut off...')}

+

${_('Changeset was too big and was cut off...')} ${_('Show full diff')}

% endif @@ -177,7 +201,7 @@ ${comment.comment_inline_form()} ## render comments and inlines - ${comment.generate_comments()} + ${comment.generate_comments(include_pr=True)} % if not c.pull_request.is_closed(): ## main comment form and it status @@ -189,7 +213,7 @@