# HG changeset patch
# User Marcin Kuzminski <marcin@python-works.com>
# Date 2013-04-08 22:40:48
# Node ID 0cecc22285efb8535bc5612e4224f68e5d963415
# Parent  630c98f52416a6c5333c4912b33a80b6cb127c6c

#818: Bookmarks Do Not Display on Changeset View
- made the consistent order of displaying tags iconss

diff --git a/rhodecode/public/css/style.css b/rhodecode/public/css/style.css
--- a/rhodecode/public/css/style.css
+++ b/rhodecode/public/css/style.css
@@ -2795,7 +2795,8 @@ h3.files_location {
 }
 
 .right .logtags .branchtag,
-.logtags .tagtag,
+.right .logtags .tagtag,
+.right .logtags .booktag,
 .right .merge {
     float: right;
     line-height: 1em;
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
@@ -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>
diff --git a/rhodecode/templates/changeset/changeset_range.html b/rhodecode/templates/changeset/changeset_range.html
--- a/rhodecode/templates/changeset/changeset_range.html
+++ b/rhodecode/templates/changeset/changeset_range.html
@@ -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>