Mercurial > kallithea

comparison rhodecode/templates/files/file_diff.html @ 1789:17caf4efe15c beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
implements #308 rewrote diffs to enable displaying full diff on each file - fixed escaping of html special chars in file editor
author Marcin Kuzminski <marcin@python-works.com>
date Mon, 19 Dec 2011 00:11:20 +0200
parents 64cb9612f9aa
children f91d3f9b7230
comparison
equal deleted inserted replaced
1788:ef0613584ced 1789:17caf4efe15c
19 <div class="box"> 19 <div class="box">
20 <!-- box / title --> 20 <!-- box / title -->
21 <div class="title"> 21 <div class="title">
22 ${self.breadcrumbs()} 22 ${self.breadcrumbs()}
23 </div> 23 </div>
24 <div class="table"> 24 <div>
25 <div id="body" class="diffblock"> 25 ## diff block
26 <div class="code-header"> 26 <%namespace name="diff_block" file="/changeset/diff_block.html"/>
27 <div class="changeset_header"> 27 ${diff_block.diff_block(c.changes)}
28 <span class="changeset_file">${h.link_to(c.f_path,h.url('files_home',repo_name=c.repo_name,
29 revision=c.changeset_2.raw_id,f_path=c.f_path))}</span>
30 &raquo; <span>${h.link_to(_('diff'),
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'),
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'),
35 h.url.current(diff2=c.changeset_2.raw_id,diff1=c.changeset_1.raw_id,diff='download'))}</span>
36 </div>
37 </div>
38 <div class="code-body">
39 %if c.no_changes:
40 ${_('No changes')}
41 %elif c.big_diff:
42 ${_('Diff is to big to display')} ${h.link_to(_('raw diff'),
43 h.url.current(diff2=c.changeset_2.raw_id,diff1=c.changeset_1.raw_id,diff='raw'))}
44 %else:
45 ${c.cur_diff|n}
46 %endif
47 </div>
48 </div>
49 </div> 28 </div>
50 </div> 29 </div>
30 <script>
31 YUE.onDOMReady(function(){
32
33 YUE.on(YUQ('.diff-menu-activate'),'click',function(e){
34 var act = e.currentTarget.nextElementSibling;
35
36 if(YUD.hasClass(act,'active')){
37 YUD.removeClass(act,'active');
38 YUD.setStyle(act,'display','none');
39 }else{
40 YUD.addClass(act,'active');
41 YUD.setStyle(act,'display','');
42 }
43 });
44
45 })
46 </script>
51 </%def> 47 </%def>
52 48
53 49