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,7 +1,10 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('%s Pull Request #%s') % (c.repo_name, c.pull_request.pull_request_id)} · ${c.rhodecode_name} + ${_('%s Pull Request #%s') % (c.repo_name, c.pull_request.pull_request_id)} + %if c.rhodecode_name: + · ${c.rhodecode_name} + %endif <%def name="breadcrumbs_links()"> @@ -20,14 +23,13 @@ ${self.repo_context_bar('showpullrequest ${self.breadcrumbs()} -
- ${_('Title')}: ${c.pull_request.title} - %if c.pull_request.is_closed(): - (${_('Closed')}) - %endif -
- -
+
+
+ ${_('Title')}: ${c.pull_request.title} + %if c.pull_request.is_closed(): + (${_('Closed')}) + %endif +
@@ -36,7 +38,8 @@ ${self.repo_context_bar('showpullrequest
%if c.current_changeset_status: -
+
+
%if c.pull_request.is_closed(): ${_('Closed')}, @@ -66,11 +69,6 @@ ${self.repo_context_bar('showpullrequest
- ##%if h.is_hg(c.pull_request.org_repo): - ## ${_('Mercurial repository')} - ##%elif h.is_git(c.pull_request.org_repo): - ## ${_('Git repository')} - ##%endif ## branch link is only valid if it is a branch ${c.pull_request.org_ref_parts[0]}: ${c.pull_request.org_ref_parts[1]} @@ -78,7 +76,7 @@ ${self.repo_context_bar('showpullrequest %if h.is_hg(c.pull_request.org_repo): | ${_('Pull changes')} hg pull -r ${h.short_id(c.cs_ranges[-1].raw_id)} ${c.pull_request.org_repo.clone_url()} %elif h.is_git(c.pull_request.org_repo): - | ${_('Pull changes')} + | ${_('Pull changes')} git pull ${c.pull_request.org_repo.clone_url()} ${c.pull_request.org_ref_parts[1]} %endif
@@ -88,7 +86,7 @@ ${self.repo_context_bar('showpullrequest
-
${h.urlify_commit(c.pull_request.description)}
+
${h.urlify_commit(c.pull_request.description, c.repo_name)}
@@ -101,8 +99,50 @@ ${self.repo_context_bar('showpullrequest
+ ## REVIEWERS +
+
${_('Pull request reviewers')}
+
+ ## members goes here ! +
+
    + %for member,status in c.pull_request_reviewers: +
  • +
    +
    + +
    +
    gravatar
    +
    ${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')() or h.HasRepoPermissionAny('repository.admin')(c.repo_name) or c.pull_request.user_id == c.rhodecode_user.user_id): +
    + +
    + %endif +
    +
  • + %endfor +
+
+ %if not c.pull_request.is_closed(): +
+ %if h.HasPermissionAny('hg.admin')() or h.HasRepoPermissionAny('repository.admin')(c.repo_name) or c.pull_request.author.user_id == c.rhodecode_user.user_id: +
+ ${h.text('user', class_='yui-ac-input')} + ${_('Add or remove reviewer to this pull request.')} +
+
+
+ ${_('Save Changes')} +
+ %endif +
+ %endif +
+
-
+
##DIFF
@@ -139,50 +179,10 @@ ${self.repo_context_bar('showpullrequest % endif
- ## REVIEWERS -
-

${_('Pull request reviewers')}

-
- ## members goes here ! -
-
    - %for member,status in c.pull_request_reviewers: -
  • -
    -
    - -
    -
    gravatar
    -
    ${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 -
    -
  • - %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 or remove reviewer to this pull request.')} -
-
-
- ${_('Save changes')} -
- %endif -
- %endif -
-