Mercurial > kallithea
comparison rhodecode/templates/compare/compare_diff.html @ 3179:cd50d1b5f35b
merged with beta
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Mon, 21 Jan 2013 00:03:44 +0100 |
parents | ed11764eb81a |
children | 91f4e30da32d |
comparison
equal
deleted
inserted
replaced
3113:a0737406ce26 | 3179:cd50d1b5f35b |
---|---|
1 ## -*- coding: utf-8 -*- | 1 ## -*- coding: utf-8 -*- |
2 <%inherit file="/base/base.html"/> | 2 <%inherit file="/base/base.html"/> |
3 | 3 |
4 <%def name="title()"> | 4 <%def name="title()"> |
5 ${c.repo_name} ${_('Compare')} ${'%s@%s' % (c.org_repo.repo_name, c.org_ref)} -> ${'%s@%s' % (c.other_repo.repo_name, c.other_ref)} | 5 ${c.repo_name} ${_('Compare')} ${'%s@%s' % (c.org_repo.repo_name, c.org_ref)} -> ${'%s@%s' % (c.other_repo.repo_name, c.other_ref)} |
6 </%def> | 6 </%def> |
7 | 7 |
8 <%def name="breadcrumbs_links()"> | 8 <%def name="breadcrumbs_links()"> |
9 ${h.link_to(_(u'Home'),h.url('/'))} | 9 ${h.link_to(_(u'Home'),h.url('/'))} |
10 » | 10 » |
26 <div class="table"> | 26 <div class="table"> |
27 <div id="body" class="diffblock"> | 27 <div id="body" class="diffblock"> |
28 <div class="code-header cv"> | 28 <div class="code-header cv"> |
29 <h3 class="code-header-title">${_('Compare View')}</h3> | 29 <h3 class="code-header-title">${_('Compare View')}</h3> |
30 <div> | 30 <div> |
31 ${'%s@%s' % (c.org_repo.repo_name, c.org_ref)} -> ${'%s@%s' % (c.other_repo.repo_name, c.other_ref)} <a href="${c.swap_url}">[swap]</a> | 31 ${'%s@%s' % (c.org_repo.repo_name, c.org_ref)} -> ${'%s@%s' % (c.other_repo.repo_name, c.other_ref)} <a href="${c.swap_url}">[swap]</a> |
32 </div> | 32 </div> |
33 </div> | 33 </div> |
34 </div> | 34 </div> |
35 <div id="changeset_compare_view_content"> | 35 <div id="changeset_compare_view_content"> |
36 ##CS | 36 ##CS |