Mercurial > kallithea

comparison rhodecode/templates/changeset/changeset_range.html @ 1688:82e604d3fc46 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changeset ranges use new fileid method.
author Marcin Kuzminski <marcin@python-works.com>
date Tue, 15 Nov 2011 00:15:19 +0200
parents 1915f02f6d62
children 910e3a0d27c0
comparison
equal deleted inserted replaced
1687:e21ec97aca1f 1688:82e604d3fc46
14 14
15 <%def name="page_nav()"> 15 <%def name="page_nav()">
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 -->
22 <div class="title"> 28 <div class="title">
23 ${self.breadcrumbs()} 29 ${self.breadcrumbs()}
24 </div> 30 </div>
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>
38 <div id="changeset_compare_view_content"> 40 <div id="changeset_compare_view_content">
39 <div class="container"> 41 <div class="container">
52 <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Files affected')}</div> 54 <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Files affected')}</div>
53 <div class="cs_files"> 55 <div class="cs_files">
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>
61 </div> 63 </div>
62 64
63 </div> 65 </div>
64 %for cs in c.cs_ranges: 66 %for cs in c.cs_ranges:
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,
73 revision=filenode.changeset.raw_id,f_path=h.safe_unicode(filenode.path)))} 75 revision=filenode.changeset.raw_id,f_path=h.safe_unicode(filenode.path)))}
74 </span> 76 </span>