Mercurial > kallithea

comparison pylons_app/templates/files/file_diff.html @ 160:0f7f93df5802

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
implemented rawdiff and diff download into diff view. Few css changes
author Marcin Kuzminski <marcin@python-works.com>
date Wed, 19 May 2010 00:18:48 +0200
parents f905f45c457e
children 410101210923
comparison
equal deleted inserted replaced
159:96285f905073 160:0f7f93df5802
26 </%def> 26 </%def>
27 <%def name="main()"> 27 <%def name="main()">
28 <h2 class="no-link no-border">${'%s: %s %s %s' % (_('File diff'),c.diff2,'&rarr;',c.diff1)|n}</h2> 28 <h2 class="no-link no-border">${'%s: %s %s %s' % (_('File diff'),c.diff2,'&rarr;',c.diff1)|n}</h2>
29 <div id="body" class="diffblock"> 29 <div id="body" class="diffblock">
30 <div class="code-header"> 30 <div class="code-header">
31 <span>${h.link_to(c.f_path,h.url('files_home',repo_name=c.repo_name,revision=c.diff2.split(':')[1],f_path=c.f_path))}</span> 31 <div>
32 <span>${h.link_to(c.f_path,h.url('files_home',repo_name=c.repo_name,
33 revision=c.diff2.split(':')[1],f_path=c.f_path))}</span>
34 &raquo; <span style="font-size:77%">${h.link_to(_('diff'),
35 h.url.current(diff2=c.diff2.split(':')[-1],diff1=c.diff1.split(':')[-1],diff='diff'))}</span>
36 &raquo; <span style="font-size:77%">${h.link_to(_('raw diff'),
37 h.url.current(diff2=c.diff2.split(':')[-1],diff1=c.diff1.split(':')[-1],diff='raw'))}</span>
38 &raquo; <span style="font-size:77%">${h.link_to(_('download diff'),
39 h.url.current(diff2=c.diff2.split(':')[-1],diff1=c.diff1.split(':')[-1],diff='download'))}</span>
40 </div>
32 </div> 41 </div>
33 <div class="code-body"> 42 <div class="code-body">
34 %if c.no_changes: 43 %if c.no_changes:
35 ${_('No changes')} 44 ${_('No changes')}
36 %else: 45 %else:
37 ${c.differ.as_HTML()|n} 46 ${c.cur_diff|n}
38 %endif 47 %endif
39 </div> 48 </div>
40 </div> 49 </div>
41 </%def> 50 </%def>