Mercurial > kallithea
changeset 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 | 381eea235ae7 |
children | 58bb350bfef8 |
files | rhodecode/public/css/style.css rhodecode/templates/changeset/changeset_range.html |
diffstat | 2 files changed, 38 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/public/css/style.css Mon Oct 15 22:49:59 2012 +0200 +++ b/rhodecode/public/css/style.css Mon Oct 15 23:17:02 2012 +0200 @@ -61,32 +61,33 @@ text-decoration: underline; } -h1,h2,h3,h4,h5,h6 { +h1,h2,h3,h4,h5,h6, +div.h1,div.h2,div.h3,div.h4,div.h5,div.h6 { color: #292929; font-weight: 700; } -h1 { +h1,div.h1 { font-size: 22px; } -h2 { +h2,div.h2 { font-size: 20px; } -h3 { +h3,div.h3 { font-size: 18px; } -h4 { +h4,div.h4 { font-size: 16px; } -h5 { +h5,div.h5 { font-size: 14px; } -h6 { +h6,div.h6 { font-size: 11px; } @@ -1143,7 +1144,9 @@ text-decoration: none; } -#content div.box h1,#content div.box h2,#content div.box h3,#content div.box h4,#content div.box h5,#content div.box h6 +#content div.box h1,#content div.box h2,#content div.box h3,#content div.box h4,#content div.box h5,#content div.box h6, +#content div.box div.h1,#content div.box div.h2,#content div.box div.h3,#content div.box div.h4,#content div.box div.h5,#content div.box div.h6 + { clear: both; overflow: hidden;
--- 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)}