Mercurial > kallithea
diff rhodecode/templates/changeset/changeset.html @ 3727:0cecc22285ef beta
#818: Bookmarks Do Not Display on Changeset View
- made the consistent order of displaying tags iconss
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Tue, 09 Apr 2013 00:40:48 +0200 |
| parents | ec6354949623 |
| children | 5293d4bbb1ea |
line wrap: on
line diff
--- a/rhodecode/templates/changeset/changeset.html Fri Apr 05 00:40:58 2013 +0200 +++ b/rhodecode/templates/changeset/changeset.html Tue Apr 09 00:40:48 2013 +0200 @@ -102,15 +102,22 @@ %if len(c.changeset.parents)>1: <span class="merge">${_('merge')}</span> %endif - %if c.changeset.branch: - <span class="branchtag" title="${_('Branch %s') % c.changeset.branch}"> - ${h.link_to(c.changeset.branch,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))} - </span> - %endif + %if h.is_hg(c.rhodecode_repo): + %for book in c.changeset.bookmarks: + <span class="booktag" title="${_('Bookmark %s') % book}"> + ${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))} + </span> + %endfor + %endif %for tag in c.changeset.tags: <span class="tagtag" title="${_('Tag %s') % tag}"> ${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</span> %endfor + %if c.changeset.branch: + <span class="branchtag" title="${_('Branch %s') % c.changeset.branch}"> + ${h.link_to(c.changeset.branch,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))} + </span> + %endif </span> </div> </div>