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 @@ -31,7 +31,7 @@ AJAX_COMMENT_DELETE_URL = "${url('changeset_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}";
-
+
%if c.changeset.parents: %for n, p_cs in enumerate(reversed(c.changeset.parents)): @@ -52,7 +52,7 @@ ${_('No children')} %endif
- -
-
-
-
-
- gravatar -
- ${h.person(c.changeset.author)}
- ${h.email_or_none(c.changeset.author)}
-
-
${h.urlify_commit(c.changeset.message, c.repo_name)}
-
-
-
+
+
+
+
+
+
+ gravatar +
+ ${h.person(c.changeset.author)}
+ ${h.email_or_none(c.changeset.author)}
+
+
${h.urlify_commit(c.changeset.message, c.repo_name)}
+
+
+
% if (len(c.changeset.affected_files) <= c.affected_files_cut_off) or c.fulldiff: - ${len(c.changeset.removed)} - ${len(c.changeset.changed)} - ${len(c.changeset.added)} - % else: + ${len(c.changeset.removed)} + ${len(c.changeset.changed)} + ${len(c.changeset.added)} + % else: ! ! ! - % endif -
+ % endif +
- + %if len(c.changeset.parents)>1: ${_('merge')} %endif - %if c.changeset.branch: + %if c.changeset.branch: - ${h.link_to(c.changeset.branch,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))} + ${h.link_to(c.changeset.branch,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))} %endif - %for tag in c.changeset.tags: - - ${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))} - %endfor - -
-
- + %for tag in c.changeset.tags: + + ${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))} + %endfor + +
+
+ % if c.limited_diff: ${ungettext('%s file changed','%s files changed',len(c.changeset.affected_files)) % (len(c.changeset.affected_files))}: % else: - ${ungettext('%s file changed with %s insertions and %s deletions','%s files changed with %s insertions and %s deletions', len(c.changeset.affected_files)) % (len(c.changeset.affected_files),c.lines_added,c.lines_deleted)}: - %endif + ${ungettext('%s file changed with %s insertions and %s deletions','%s files changed with %s insertions and %s deletions', len(c.changeset.affected_files)) % (len(c.changeset.affected_files),c.lines_added,c.lines_deleted)}: + %endif -
+
%for FID, (cs1, cs2, change, path, diff, stats) in c.changes[c.changeset.raw_id].iteritems():
@@ -136,8 +136,8 @@ % if c.limited_diff:
${_('Changeset was too big and was cut off...')}
% endif -
-
+
+