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 @@ -58,7 +58,7 @@
${_('Created on')}: ${h.fmt_date(c.pull_request.created_on)}
-
+
##DIFF
@@ -66,33 +66,41 @@
##CS -
${_('Incoming changesets')}
+
${ungettext('Showing %s commit','Showing %s commits', len(c.cs_ranges)) % len(c.cs_ranges)}
<%include file="/compare/compare_cs.html" /> - + ## FILES -
- % if c.files: -
${_('Files affected')}
-
+
+ + % 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 + +
+
+ %if not c.files: + ${_('No files')} + %endif %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 -
- %else: -
${_('Click to load diff details')}
- %endif
+ % if c.limited_diff: +
${_('Changeset was too big and was cut off...')}
+ % endif
## REVIEWERS

${_('Pull request reviewers')}

-
+
## members goes here ! -
+
    %for member,status in c.pull_request_reviewers:
  • @@ -137,12 +145,14 @@ ## 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: +

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

    + % endif + ## template for inline comment form <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>