diff rhodecode/templates/changeset/changeset_range.html @ 2926:3555c56694b5 beta

Changeset range shows branch/tags/bookmarks
author Marcin Kuzminski <marcin@python-works.com>
date Mon, 15 Oct 2012 23:17:02 +0200
parents c25cc1c7c65f
children 9937afa7f093
line wrap: on
line diff
--- a/rhodecode/templates/changeset/changeset_range.html	Mon Oct 15 22:49:59 2012 +0200
+++ b/rhodecode/templates/changeset/changeset_range.html	Mon Oct 15 23:17:02 2012 +0200
@@ -68,12 +68,35 @@
      %for cs in c.cs_ranges:
           ##${comment.comment_inline_form(cs)}
           ## diff block
-          <h3 style="padding-top:8px;">
+          <div class="h3">
           <a class="tooltip" title="${h.tooltip(cs.message)}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}">${'r%s:%s' % (cs.revision,h.short_id(cs.raw_id))}</a>
-           <div class="gravatar">
-               <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),20)}"/>
+             <div class="gravatar">
+                 <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),20)}"/>
+             </div>
+             <div class="right">
+              <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(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="bookbook" title="${'%s %s' % (_('bookmark'),book)}">
+                     ${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
+                  </span>
+                  %endfor
+                %endif
+                %for tag in cs.tags:
+                    <span class="tagtag"  title="${'%s %s' % (_('tag'),tag)}">
+                    ${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}</span>
+                %endfor
+              </span>        
+            </div>   
            </div>
-           </h3>
           ${diff_block.diff_block(c.changes[cs.raw_id])}
           ##${comment.comments(cs)}