Mercurial > kallithea
diff rhodecode/templates/changelog/changelog.html @ 1856:0855c64c571f beta
css: merge/branch/tag blurbs
| author | Aras Pranckevicius <aras@unity3d.com> |
|---|---|
| date | Fri, 06 Jan 2012 21:55:18 +0200 |
| parents | 8fe1a141de02 |
| children | 3f5be4dbbd57 |
line wrap: on
line diff
--- a/rhodecode/templates/changelog/changelog.html Fri Jan 06 21:31:26 2012 +0200 +++ b/rhodecode/templates/changelog/changelog.html Fri Jan 06 21:55:18 2012 +0200 @@ -65,10 +65,7 @@ <div id="${cs.raw_id}_changes_info" class="changes"> <span id="${cs.raw_id}" class="changed_total tooltip" title="${_('Affected number of files, click to show more details')}">${len(cs.affected_files)}</span> </div> - %if len(cs.parents)>1: - <div class="merge">${_('merge')}</div> - %endif - %if cs.parents: + %if cs.parents: %for p_cs in reversed(cs.parents): <div class="parent">${_('Parent')} <span class="changeset_id">${p_cs.revision}:<span class="changeset_hash">${h.link_to(h.short_id(p_cs.raw_id), @@ -80,6 +77,9 @@ %endif <span class="logtags"> + %if len(cs.parents)>1: + <span class="merge">${_('merge')}</span> + %endif %if cs.branch: <span class="branchtag" title="${'%s %s' % (_('branch'),cs.branch)}"> ${h.link_to(cs.branch,h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}</span>