Mercurial > kallithea
comparison rhodecode/templates/changeset/diff_block.html @ 1789:17caf4efe15c beta
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 | d4a7b6c82efe |
children | a048d0c6da3c 929fc8d926d5 |
comparison
equal
deleted
inserted
replaced
1788:ef0613584ced | 1789:17caf4efe15c |
---|---|
17 </div> | 17 </div> |
18 <div class="diff-menu-wrapper"> | 18 <div class="diff-menu-wrapper"> |
19 <img class="diff-menu-activate" style="margin-bottom:-6px;cursor: pointer" alt="diff-menu" src="${h.url('/images/icons/script_gear.png')}" /> | 19 <img class="diff-menu-activate" style="margin-bottom:-6px;cursor: pointer" alt="diff-menu" src="${h.url('/images/icons/script_gear.png')}" /> |
20 <div class="diff-menu" style="display:none"> | 20 <div class="diff-menu" style="display:none"> |
21 <ul> | 21 <ul> |
22 <li>${h.link_to(_('diff'),h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='diff'))}</li> | 22 <li>${h.link_to(_('diff'),h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='diff',fulldiff=1))}</li> |
23 <li>${h.link_to(_('raw diff'),h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='raw'))}</li> | 23 <li>${h.link_to(_('raw diff'),h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='raw'))}</li> |
24 <li>${h.link_to(_('download diff'),h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='download'))}</li> | 24 <li>${h.link_to(_('download diff'),h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='download'))}</li> |
25 <li>${c.ignorews_url(h.FID(filenode.changeset.raw_id,filenode.path))}</li> | 25 <li>${c.ignorews_url(h.FID(filenode.changeset.raw_id,filenode.path))}</li> |
26 <li>${c.context_url(h.FID(filenode.changeset.raw_id,filenode.path))}</li> | 26 <li>${c.context_url(h.FID(filenode.changeset.raw_id,filenode.path))}</li> |
27 </ul> | 27 </ul> |
35 </span> | 35 </span> |
36 </div> | 36 </div> |
37 </div> | 37 </div> |
38 <div class="code-body"> | 38 <div class="code-body"> |
39 <div class="full_f_path" path="${h.safe_unicode(filenode.path)}"></div> | 39 <div class="full_f_path" path="${h.safe_unicode(filenode.path)}"></div> |
40 %if diff: | 40 ${diff|n} |
41 ${diff|n} | |
42 %else: | |
43 ${_('No changes in this file')} | |
44 %endif | |
45 </div> | 41 </div> |
46 </div> | 42 </div> |
47 %endif | 43 %endif |
48 %endfor | 44 %endfor |
49 | 45 |