Mercurial > kallithea
comparison rhodecode/templates/changeset/changeset.html @ 1232:0dc8d578ff49
merges for stable
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Sat, 09 Apr 2011 18:38:18 +0200 |
parents | 4fa80e0484ef |
children | bf263968da47 |
comparison
equal
deleted
inserted
replaced
1231:9f6560667743 | 1232:0dc8d578ff49 |
---|---|
1 ## -*- coding: utf-8 -*- | |
2 | |
1 <%inherit file="/base/base.html"/> | 3 <%inherit file="/base/base.html"/> |
2 | 4 |
3 <%def name="title()"> | 5 <%def name="title()"> |
4 ${c.repo_name} ${_('Changeset')} - r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)} - ${c.rhodecode_name} | 6 ${c.repo_name} ${_('Changeset')} - r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)} - ${c.rhodecode_name} |
5 </%def> | 7 </%def> |
79 </div> | 81 </div> |
80 </div> | 82 </div> |
81 <span style="font-size:1.1em;font-weight: bold">${_('Files affected')}</span> | 83 <span style="font-size:1.1em;font-weight: bold">${_('Files affected')}</span> |
82 <div class="cs_files"> | 84 <div class="cs_files"> |
83 %for change,filenode,diff,cs1,cs2 in c.changes: | 85 %for change,filenode,diff,cs1,cs2 in c.changes: |
84 <div class="cs_${change}">${h.link_to(filenode.path,h.url.current(anchor='CHANGE-%s'%filenode.path))}</div> | 86 <div class="cs_${change}">${h.link_to(h.safe_unicode(filenode.path),h.url.current(anchor=h.repo_name_slug('CHANGE-%s' % h.safe_unicode(filenode.path))))}</div> |
85 %endfor | 87 %endfor |
86 </div> | 88 </div> |
87 </div> | 89 </div> |
88 | 90 |
89 </div> | 91 </div> |
90 | 92 |
91 %for change,filenode,diff,cs1,cs2 in c.changes: | 93 %for change,filenode,diff,cs1,cs2 in c.changes: |
92 %if change !='removed': | 94 %if change !='removed': |
93 <div style="clear:both;height:10px"></div> | 95 <div style="clear:both;height:10px"></div> |
94 <div id="body" class="diffblock"> | 96 <div id="body" class="diffblock"> |
95 <div id="${'CHANGE-%s'%filenode.path}" class="code-header"> | 97 <div id="${h.repo_name_slug('CHANGE-%s' % h.safe_unicode(filenode.path))}" class="code-header"> |
96 <div class="changeset_header"> | 98 <div class="changeset_header"> |
97 <span class="changeset_file"> | 99 <span class="changeset_file"> |
98 ${h.link_to_if(change!='removed',filenode.path,h.url('files_home',repo_name=c.repo_name, | 100 ${h.link_to_if(change!='removed',h.safe_unicode(filenode.path),h.url('files_home',repo_name=c.repo_name, |
99 revision=filenode.changeset.raw_id,f_path=filenode.path))} | 101 revision=filenode.changeset.raw_id,f_path=h.safe_unicode(filenode.path)))} |
100 </span> | 102 </span> |
101 %if 1: | 103 %if 1: |
102 » <span>${h.link_to(_('diff'), | 104 » <span>${h.link_to(_('diff'), |
103 h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path,diff2=cs2,diff1=cs1,diff='diff'))}</span> | 105 h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='diff'))}</span> |
104 » <span>${h.link_to(_('raw diff'), | 106 » <span>${h.link_to(_('raw diff'), |
105 h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path,diff2=cs2,diff1=cs1,diff='raw'))}</span> | 107 h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='raw'))}</span> |
106 » <span>${h.link_to(_('download diff'), | 108 » <span>${h.link_to(_('download diff'), |
107 h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path,diff2=cs2,diff1=cs1,diff='download'))}</span> | 109 h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='download'))}</span> |
108 %endif | 110 %endif |
109 </div> | 111 </div> |
110 </div> | 112 </div> |
111 <div class="code-body"> | 113 <div class="code-body"> |
112 %if diff: | 114 %if diff: |