diff --git a/rhodecode/templates/changeset/changeset.html b/rhodecode/templates/changeset/changeset.html --- a/rhodecode/templates/changeset/changeset.html +++ b/rhodecode/templates/changeset/changeset.html @@ -15,7 +15,7 @@ <%def name="page_nav()"> - ${self.menu('changelog')} + ${self.menu('changelog')} <%def name="main()"> @@ -53,17 +53,17 @@
- % if len(c.changeset.affected_files) <= c.affected_files_cut_off: + % if len(c.changeset.affected_files) <= c.affected_files_cut_off: ${len(c.changeset.removed)} ${len(c.changeset.changed)} ${len(c.changeset.added)} % else: ! ! - ! - % endif -
- + ! + % endif +
+ %if c.changeset.parents: %for p_cs in reversed(c.changeset.parents):
${_('Parent')} @@ -71,9 +71,9 @@ h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)}
%endfor - %else: -
${_('No parents')}
- %endif + %else: +
${_('No parents')}
+ %endif %if len(c.changeset.parents)>1: ${_('merge')} @@ -84,8 +84,8 @@ ${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))} %endfor - - + + ${_('%s files affected with %s additions and %s deletions:') % (len(c.changeset.affected_files),c.lines_added,c.lines_deleted)} @@ -106,21 +106,21 @@ % if c.cut_off: ${_('Changeset was too big and was cut off...')} % endif - + - + - - ## diff block + + ## diff block <%namespace name="diff_block" file="/changeset/diff_block.html"/> ${diff_block.diff_block(c.changes)} - + ## template for inline comment form <%namespace name="comment" file="/changeset/changeset_file_comment.html"/> ${comment.comment_inline_form(c.changeset)} - + ${comment.comments(c.changeset)} - + - + + +