Mercurial > kallithea
changeset 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 | 630c98f52416 |
| children | 49e5d4fa01e9 |
| files | rhodecode/public/css/style.css rhodecode/templates/changeset/changeset.html rhodecode/templates/changeset/changeset_range.html |
| diffstat | 3 files changed, 19 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/public/css/style.css Fri Apr 05 00:40:58 2013 +0200 +++ b/rhodecode/public/css/style.css Tue Apr 09 00:40:48 2013 +0200 @@ -2795,7 +2795,8 @@ } .right .logtags .branchtag, -.logtags .tagtag, +.right .logtags .tagtag, +.right .logtags .booktag, .right .merge { float: right; line-height: 1em;
--- 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>
--- a/rhodecode/templates/changeset/changeset_range.html Fri Apr 05 00:40:58 2013 +0200 +++ b/rhodecode/templates/changeset/changeset_range.html Tue Apr 09 00:40:48 2013 +0200 @@ -76,11 +76,6 @@ %if len(cs.parents)>1: <span class="merge">${_('merge')}</span> %endif - %if cs.branch: - <span class="branchtag" title="${_('Branch %s') % cs.branch}"> - ${h.link_to(h.shorter(cs.branch),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))} - </span> - %endif %if h.is_hg(c.rhodecode_repo): %for book in cs.bookmarks: <span class="booktag" title="${_('Bookmark %s') % book}"> @@ -92,6 +87,11 @@ <span class="tagtag" title="${_('Tag %s') % tag}"> ${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}</span> %endfor + %if cs.branch: + <span class="branchtag" title="${_('Branch %s') % cs.branch}"> + ${h.link_to(h.shorter(cs.branch),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))} + </span> + %endif </span> </div> </div>