Mercurial > kallithea
changeset 212:671931f082c3
added merge and parents indicators to changelog
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Mon, 24 May 2010 00:58:40 +0200 |
| parents | a3a7c3e03b76 |
| children | 7a97f0b100cd |
| files | pylons_app/public/css/monoblue_custom.css pylons_app/templates/changelog/changelog.html |
| diffstat | 2 files changed, 30 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/pylons_app/public/css/monoblue_custom.css Mon May 24 00:58:26 2010 +0200 +++ b/pylons_app/public/css/monoblue_custom.css Mon May 24 00:58:40 2010 +0200 @@ -476,6 +476,22 @@ .right .removed{ background: #FF8888; } + +.right .merge{ + float: right; + vertical-align: top; + font-size: 60%; + font-weight: bold; +} +.right .merge img{ + vertical-align: bottom; +} + +.right .parent{ +float:right; +font-size: 90%; +font-family: monospace; +} /** end of canvas **/ /* FILE BROWSER */
--- a/pylons_app/templates/changelog/changelog.html Mon May 24 00:58:26 2010 +0200 +++ b/pylons_app/templates/changelog/changelog.html Mon May 24 00:58:40 2010 +0200 @@ -40,7 +40,7 @@ <div class="author">${cs.author}</div> <div id="chg_${cnt}" class="message"> ${h.link_to(cs.message, - h.url('changeset_home',repo_name=c.repo_name,revision=cs._short), + h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id), title=cs.message)} </div> <span class="logtags"> @@ -55,6 +55,19 @@ <span class="changed" title="${_('changed')}">${len(cs.changed)}</span> <span class="added" title="${_('added')}">${len(cs.added)}</span> </div> + <div class="right"> + %if len(cs.parents)>1: + <div class="merge"> + ${_('merge')} + <img alt="merge" src="/images/icons/arrow_join.png"> + </div> + %endif + %for p_cs in reversed(cs.parents): + <div class="parent">${_('Parrent')} ${p_cs.revision}: ${h.link_to(p_cs.raw_id, + h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id), + title=p_cs.message)}</div> + %endfor + </div> </div> %endfor