##// END OF EJS Templates
changeset ranges use new fileid method.
marcink -
r1688:82e604d3 beta
parent child Browse files
Show More
@@ -16,6 +16,12 b''
16 ${self.menu('changelog')}
16 ${self.menu('changelog')}
17 </%def>
17 </%def>
18
18
19 <%def name="fid(raw_id,path)" filter="strip">
20 <%
21 return 'C-%s-%s' % (h.short_id(raw_id),h.safeid(h.safe_unicode(path)))
22 %>
23 </%def>
24
19 <%def name="main()">
25 <%def name="main()">
20 <div class="box">
26 <div class="box">
21 <!-- box / title -->
27 <!-- box / title -->
@@ -25,13 +31,9 b''
25 <div class="table">
31 <div class="table">
26 <div id="body" class="diffblock">
32 <div id="body" class="diffblock">
27 <div class="code-header">
33 <div class="code-header">
28 <div>
34 <h3>${_('Compare View')}</h3>
35 <div>
29 ${_('Changesets')} - r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)} -> r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].raw_id)}
36 ${_('Changesets')} - r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)} -> r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].raw_id)}
30 <h3>${_('Compare View')}</h3>
31 ##&raquo; <span>${h.link_to(_('raw diff'),
32 ##h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='show'))}</span>
33 ##&raquo; <span>${h.link_to(_('download diff'),
34 ##h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='download'))}</span>
35 </div>
37 </div>
36 </div>
38 </div>
37 </div>
39 </div>
@@ -54,7 +56,7 b''
54 %for cs in c.cs_ranges:
56 %for cs in c.cs_ranges:
55 <div class="cur_cs">r${cs}</div>
57 <div class="cur_cs">r${cs}</div>
56 %for change,filenode,diff,cs1,cs2,st in c.changes[cs.raw_id]:
58 %for change,filenode,diff,cs1,cs2,st in c.changes[cs.raw_id]:
57 <div class="cs_${change}">${h.link_to(h.safe_unicode(filenode.path),h.url.current(anchor=h.repo_name_slug('C%s-%s' % (cs.short_id,h.safe_unicode(filenode.path)))))}</div>
59 <div class="cs_${change}">${h.link_to(h.safe_unicode(filenode.path),h.url.current(anchor=self.fid(cs.raw_id,filenode.path)))}</div>
58 %endfor
60 %endfor
59 %endfor
61 %endfor
60 </div>
62 </div>
@@ -65,8 +67,8 b''
65 %for change,filenode,diff,cs1,cs2,st in c.changes[cs.raw_id]:
67 %for change,filenode,diff,cs1,cs2,st in c.changes[cs.raw_id]:
66 %if change !='removed':
68 %if change !='removed':
67 <div style="clear:both;height:10px"></div>
69 <div style="clear:both;height:10px"></div>
68 <div class="diffblock">
70 <div class="diffblock margined">
69 <div id="${h.repo_name_slug('C%s-%s' % (cs.short_id,h.safe_unicode(filenode.path)))}" class="code-header">
71 <div id="${self.fid(cs.raw_id,filenode.path)}" class="code-header">
70 <div class="changeset_header">
72 <div class="changeset_header">
71 <span class="changeset_file">
73 <span class="changeset_file">
72 ${h.link_to_if(change!='removed',h.safe_unicode(filenode.path),h.url('files_home',repo_name=c.repo_name,
74 ${h.link_to_if(change!='removed',h.safe_unicode(filenode.path),h.url('files_home',repo_name=c.repo_name,
General Comments 0
You need to be logged in to leave comments. Login now