diff --git a/rhodecode/templates/changelog/changelog.html b/rhodecode/templates/changelog/changelog.html --- a/rhodecode/templates/changelog/changelog.html +++ b/rhodecode/templates/changelog/changelog.html @@ -11,11 +11,11 @@ ${c.repo_name} ${_('Changelog')} - ${c.r » ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))} » - ${_('Changelog')} - ${_('showing ')} ${c.size if c.size <= c.total_cs else c.total_cs} ${_('out of')} ${c.total_cs} ${_('revisions')} + ${_('Changelog')} - ${_('showing ')} ${c.size if c.size <= c.total_cs else c.total_cs} ${_('out of')} ${c.total_cs} ${_('revisions')} <%def name="page_nav()"> - ${self.menu('changelog')} + ${self.menu('changelog')} <%def name="main()"> @@ -42,7 +42,7 @@ ${c.repo_name} ${_('Changelog')} - ${c.r
${h.select('branch_filter',c.branch_name,c.branch_filters)}
- + %for cnt,cs in enumerate(c.pagination):
@@ -61,7 +61,7 @@ ${c.repo_name} ${_('Changelog')} - ${c.r
${h.urlify_commit(h.wrap_paragraphs(cs.message),c.repo_name,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
↓ ${_('show more')} ↓
-
+
${len(cs.affected_files)}
@@ -73,7 +73,7 @@ ${c.repo_name} ${_('Changelog')} - ${c.r
- %endif + %endif
%if cs.parents: @@ -83,10 +83,10 @@ ${c.repo_name} ${_('Changelog')} - ${c.r 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(cs.parents)>1: ${_('merge')} @@ -99,26 +99,26 @@ ${c.repo_name} ${_('Changelog')} - ${c.r ${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))} %endfor - - + + - + %endfor
${c.pagination.pager('$link_previous ~2~ $link_next')} -
+ - + %else: ${_('There are no changes yet')} - %endif + %endif - +