##// END OF EJS Templates
removed deprecated self.fid function
marcink -
r1777:910e3a0d beta
parent child Browse files
Show More
@@ -1,99 +1,93 b''
1 1 <%inherit file="/base/base.html"/>
2 2
3 3 <%def name="title()">
4 4 ${c.repo_name} ${_('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)} - ${c.rhodecode_name}
5 5 </%def>
6 6
7 7 <%def name="breadcrumbs_links()">
8 8 ${h.link_to(u'Home',h.url('/'))}
9 9 &raquo;
10 10 ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
11 11 &raquo;
12 12 ${_('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)}
13 13 </%def>
14 14
15 15 <%def name="page_nav()">
16 16 ${self.menu('changelog')}
17 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
25 19 <%def name="main()">
26 20 <div class="box">
27 21 <!-- box / title -->
28 22 <div class="title">
29 23 ${self.breadcrumbs()}
30 24 </div>
31 25 <div class="table">
32 26 <div id="body" class="diffblock">
33 27 <div class="code-header">
34 28 <h3>${_('Compare View')}</h3>
35 29 <div>
36 30 ${_('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)}
37 31 </div>
38 32 </div>
39 33 </div>
40 34 <div id="changeset_compare_view_content">
41 35 <div class="container">
42 36 <table class="compare_view_commits noborder">
43 37 %for cs in c.cs_ranges:
44 38 <tr>
45 39 <td><div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(h.email(cs.author),14)}"/></div></td>
46 40 <td>${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</td>
47 41 <td><div class="author">${h.person(cs.author)}</div></td>
48 42 <td><span class="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td>
49 43 <td><div class="message">${h.link_to(h.wrap_paragraphs(cs.message),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div></td>
50 44 </tr>
51 45 %endfor
52 46 </table>
53 47 </div>
54 48 <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Files affected')}</div>
55 49 <div class="cs_files">
56 50 %for cs in c.cs_ranges:
57 51 <div class="cur_cs">r${cs}</div>
58 52 %for change,filenode,diff,cs1,cs2,st in c.changes[cs.raw_id]:
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>
53 <div class="cs_${change}">${h.link_to(h.safe_unicode(filenode.path),h.url.current(anchor=h.FID(cs.raw_id,filenode.path)))}</div>
60 54 %endfor
61 55 %endfor
62 56 </div>
63 57 </div>
64 58
65 59 </div>
66 60 %for cs in c.cs_ranges:
67 61 %for change,filenode,diff,cs1,cs2,st in c.changes[cs.raw_id]:
68 62 %if change !='removed':
69 63 <div style="clear:both;height:10px"></div>
70 64 <div class="diffblock margined">
71 <div id="${self.fid(cs.raw_id,filenode.path)}" class="code-header">
65 <div id="${h.FID(cs.raw_id,filenode.path)}" class="code-header">
72 66 <div class="changeset_header">
73 67 <span class="changeset_file">
74 68 ${h.link_to_if(change!='removed',h.safe_unicode(filenode.path),h.url('files_home',repo_name=c.repo_name,
75 69 revision=filenode.changeset.raw_id,f_path=h.safe_unicode(filenode.path)))}
76 70 </span>
77 71 %if 1:
78 72 &raquo; <span>${h.link_to(_('diff'),
79 73 h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='diff'))}</span>
80 74 &raquo; <span>${h.link_to(_('raw diff'),
81 75 h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='raw'))}</span>
82 76 &raquo; <span>${h.link_to(_('download diff'),
83 77 h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='download'))}</span>
84 78 %endif
85 79 </div>
86 80 </div>
87 81 <div class="code-body">
88 82 %if diff:
89 83 ${diff|n}
90 84 %else:
91 85 ${_('No changes in this file')}
92 86 %endif
93 87 </div>
94 88 </div>
95 89 %endif
96 90 %endfor
97 91 %endfor
98 92 </div>
99 93 </%def> No newline at end of file
General Comments 0
You need to be logged in to leave comments. Login now