comparison rhodecode/templates/files/file_diff.html @ 636:ffd07396d315 beta

Fixes for raw_id, needed for git Renamed hg controller to home css html changes
author Marcin Kuzminski <marcin@python-works.com>
date Tue, 26 Oct 2010 03:20:32 +0200
parents a1ec653f5f95
children 555b68f94c45
comparison
equal deleted inserted replaced
635:fd63782c4426 636:ffd07396d315
7 <%def name="breadcrumbs_links()"> 7 <%def name="breadcrumbs_links()">
8 ${h.link_to(u'Home',h.url('/'))} 8 ${h.link_to(u'Home',h.url('/'))}
9 &raquo; 9 &raquo;
10 ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))} 10 ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
11 &raquo; 11 &raquo;
12 ${'%s: %s %s %s' % (_('File diff'),c.diff2,'&rarr;',c.diff1)|n} 12 ${_('File diff')} r${c.changeset_1.revision}:${h.short_id(c.changeset_1.raw_id)} &rarr; r${c.changeset_2.revision}:${h.short_id(c.changeset_2.raw_id)}
13 </%def> 13 </%def>
14 14
15 <%def name="page_nav()"> 15 <%def name="page_nav()">
16 ${self.menu('files')} 16 ${self.menu('files')}
17 </%def> 17 </%def>
24 <div class="table"> 24 <div class="table">
25 <div id="body" class="diffblock"> 25 <div id="body" class="diffblock">
26 <div class="code-header"> 26 <div class="code-header">
27 <div> 27 <div>
28 <span>${h.link_to(c.f_path,h.url('files_home',repo_name=c.repo_name, 28 <span>${h.link_to(c.f_path,h.url('files_home',repo_name=c.repo_name,
29 revision=c.diff2.split(':')[1],f_path=c.f_path))}</span> 29 revision=c.changeset_2.raw_id,f_path=c.f_path))}</span>
30 &raquo; <span>${h.link_to(_('diff'), 30 &raquo; <span>${h.link_to(_('diff'),
31 h.url.current(diff2=c.diff2.split(':')[-1],diff1=c.diff1.split(':')[-1],diff='diff'))}</span> 31 h.url.current(diff2=c.changeset_2.raw_id,diff1=c.changeset_1.raw_id,diff='diff'))}</span>
32 &raquo; <span>${h.link_to(_('raw diff'), 32 &raquo; <span>${h.link_to(_('raw diff'),
33 h.url.current(diff2=c.diff2.split(':')[-1],diff1=c.diff1.split(':')[-1],diff='raw'))}</span> 33 h.url.current(diff2=c.changeset_2.raw_id,diff1=c.changeset_1.raw_id,diff='raw'))}</span>
34 &raquo; <span>${h.link_to(_('download diff'), 34 &raquo; <span>${h.link_to(_('download diff'),
35 h.url.current(diff2=c.diff2.split(':')[-1],diff1=c.diff1.split(':')[-1],diff='download'))}</span> 35 h.url.current(diff2=c.changeset_2.raw_id,diff1=c.changeset_1.raw_id,diff='download'))}</span>
36 </div> 36 </div>
37 </div> 37 </div>
38 <div class="code-body"> 38 <div class="code-body">
39 %if c.no_changes: 39 %if c.no_changes:
40 ${_('No changes')} 40 ${_('No changes')}