Mercurial > kallithea
comparison pylons_app/templates/files/file_diff.html @ 152:0c00fbaff55a
Fixed differ to properly extract filenames, and dates from diff file. and swaped order of columns with lines nr in diff html
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Sat, 15 May 2010 19:53:23 +0200 |
| parents | ea89ac73bef8 |
| children | f905f45c457e |
comparison
equal
deleted
inserted
replaced
| 151:988477a05db6 | 152:0c00fbaff55a |
|---|---|
| 37 <table class='code-difftable'> | 37 <table class='code-difftable'> |
| 38 %for diff in c.diff_files: | 38 %for diff in c.diff_files: |
| 39 %for x in diff['chunks']: | 39 %for x in diff['chunks']: |
| 40 %for y in x: | 40 %for y in x: |
| 41 <tr class="line ${y['action']}"> | 41 <tr class="line ${y['action']}"> |
| 42 <td id="#${diff['filename']}_O${y['old_lineno']}" class="lineno old"> | |
| 43 <pre><a href="#${diff['filename']}_O${y['old_lineno']}">${y['old_lineno']}</a></pre> | |
| 44 </td> | |
| 42 <td id="#${diff['filename']}_N${y['new_lineno']}"class="lineno new"> | 45 <td id="#${diff['filename']}_N${y['new_lineno']}"class="lineno new"> |
| 43 <pre><a href="#${diff['filename']}_N${y['new_lineno']}">${y['new_lineno']}</a></pre> | 46 <pre><a href="#${diff['filename']}_N${y['new_lineno']}">${y['new_lineno']}</a></pre> |
| 44 </td> | |
| 45 <td id="#${diff['filename']}_O${y['old_lineno']}" class="lineno old"> | |
| 46 <pre><a href="#${diff['filename']}_O${y['old_lineno']}">${y['old_lineno']}</a></pre> | |
| 47 </td> | 47 </td> |
| 48 <td class="code"> | 48 <td class="code"> |
| 49 <pre>${y['line']|n}</pre> | 49 <pre>${y['line']|n}</pre> |
| 50 </td> | 50 </td> |
| 51 </tr> | 51 </tr> |