annotate pylons_app/templates/files/file_diff.html @ 130:ffddbd80649e

Added differ lib from mercurial.
author Marcin Kuzminski <marcin@python-works.com>
date Tue, 04 May 2010 13:45:17 +0200
parents 42d46deb124d
children ea89ac73bef8
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
129
42d46deb124d implemented simple diffs for history of files.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
1 <%inherit file="/base/base.html"/>
42d46deb124d implemented simple diffs for history of files.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
2
42d46deb124d implemented simple diffs for history of files.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
3 <%def name="title()">
42d46deb124d implemented simple diffs for history of files.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
4 ${_('Repository managment')}
42d46deb124d implemented simple diffs for history of files.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
5 </%def>
42d46deb124d implemented simple diffs for history of files.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
6 <%def name="breadcrumbs()">
42d46deb124d implemented simple diffs for history of files.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
7 ${h.link_to(u'Home',h.url('/'))}
42d46deb124d implemented simple diffs for history of files.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
8 /
42d46deb124d implemented simple diffs for history of files.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
9 ${h.link_to(c.repo_name,h.url('files_home',repo_name=c.repo_name))}
42d46deb124d implemented simple diffs for history of files.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
10 /
42d46deb124d implemented simple diffs for history of files.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
11 ${_('files')}
42d46deb124d implemented simple diffs for history of files.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
12 </%def>
42d46deb124d implemented simple diffs for history of files.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
13 <%def name="page_nav()">
42d46deb124d implemented simple diffs for history of files.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
14 <form action="log">
42d46deb124d implemented simple diffs for history of files.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
15 <dl class="search">
42d46deb124d implemented simple diffs for history of files.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
16 <dt><label>Search: </label></dt>
42d46deb124d implemented simple diffs for history of files.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
17 <dd><input type="text" name="rev" /></dd>
42d46deb124d implemented simple diffs for history of files.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
18 </dl>
42d46deb124d implemented simple diffs for history of files.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
19 </form>
42d46deb124d implemented simple diffs for history of files.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
20
42d46deb124d implemented simple diffs for history of files.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
21 ${self.menu('files')}
42d46deb124d implemented simple diffs for history of files.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
22 </%def>
42d46deb124d implemented simple diffs for history of files.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
23 <%def name="css()">
42d46deb124d implemented simple diffs for history of files.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
24 <link rel="stylesheet" href="/css/monoblue_custom.css" type="text/css" />
42d46deb124d implemented simple diffs for history of files.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
25 <link rel="stylesheet" href="/css/pygments_diff.css" type="text/css" />
42d46deb124d implemented simple diffs for history of files.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
26 </%def>
42d46deb124d implemented simple diffs for history of files.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
27 <div></div>
42d46deb124d implemented simple diffs for history of files.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
28 <%def name="main()">
42d46deb124d implemented simple diffs for history of files.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
29 <h2 class="no-link no-border">${'%s: %s@%s %s %s' % (_('File diff'),c.f_path,c.diff2,'&rarr;',c.diff1)|n}</h2>
42d46deb124d implemented simple diffs for history of files.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
30 <div id="files_data">
42d46deb124d implemented simple diffs for history of files.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
31 <div id="body" class="codeblock">
42d46deb124d implemented simple diffs for history of files.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
32 ${h.pygmentize(c.diff,linenos=True,anchorlinenos=True,cssclass="code-diff")}
42d46deb124d implemented simple diffs for history of files.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
33 </div>
42d46deb124d implemented simple diffs for history of files.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
34 </div>
130
ffddbd80649e Added differ lib from mercurial.
Marcin Kuzminski <marcin@python-works.com>
parents: 129
diff changeset
35 <div style="clear:both"></div>
ffddbd80649e Added differ lib from mercurial.
Marcin Kuzminski <marcin@python-works.com>
parents: 129
diff changeset
36 <div id="files_data">
ffddbd80649e Added differ lib from mercurial.
Marcin Kuzminski <marcin@python-works.com>
parents: 129
diff changeset
37 <div id="body" class="codeblock">
ffddbd80649e Added differ lib from mercurial.
Marcin Kuzminski <marcin@python-works.com>
parents: 129
diff changeset
38 <table class='highlighttable'>
ffddbd80649e Added differ lib from mercurial.
Marcin Kuzminski <marcin@python-works.com>
parents: 129
diff changeset
39 %for x in c.diff_2[0]['chunks']:
ffddbd80649e Added differ lib from mercurial.
Marcin Kuzminski <marcin@python-works.com>
parents: 129
diff changeset
40 %for y in x:
ffddbd80649e Added differ lib from mercurial.
Marcin Kuzminski <marcin@python-works.com>
parents: 129
diff changeset
41 <tr class="line ${y['action']}">
ffddbd80649e Added differ lib from mercurial.
Marcin Kuzminski <marcin@python-works.com>
parents: 129
diff changeset
42 <td class="lineno_new">
ffddbd80649e Added differ lib from mercurial.
Marcin Kuzminski <marcin@python-works.com>
parents: 129
diff changeset
43 <div class="linenodiv">
ffddbd80649e Added differ lib from mercurial.
Marcin Kuzminski <marcin@python-works.com>
parents: 129
diff changeset
44 <pre>
ffddbd80649e Added differ lib from mercurial.
Marcin Kuzminski <marcin@python-works.com>
parents: 129
diff changeset
45 ${y['new_lineno']}
ffddbd80649e Added differ lib from mercurial.
Marcin Kuzminski <marcin@python-works.com>
parents: 129
diff changeset
46 </pre>
ffddbd80649e Added differ lib from mercurial.
Marcin Kuzminski <marcin@python-works.com>
parents: 129
diff changeset
47 </div>
ffddbd80649e Added differ lib from mercurial.
Marcin Kuzminski <marcin@python-works.com>
parents: 129
diff changeset
48 </td>
ffddbd80649e Added differ lib from mercurial.
Marcin Kuzminski <marcin@python-works.com>
parents: 129
diff changeset
49 <td class="lineno_old">
ffddbd80649e Added differ lib from mercurial.
Marcin Kuzminski <marcin@python-works.com>
parents: 129
diff changeset
50 <div class="linenodiv">
ffddbd80649e Added differ lib from mercurial.
Marcin Kuzminski <marcin@python-works.com>
parents: 129
diff changeset
51 <pre>
ffddbd80649e Added differ lib from mercurial.
Marcin Kuzminski <marcin@python-works.com>
parents: 129
diff changeset
52 ${y['old_lineno']}
ffddbd80649e Added differ lib from mercurial.
Marcin Kuzminski <marcin@python-works.com>
parents: 129
diff changeset
53 </pre>
ffddbd80649e Added differ lib from mercurial.
Marcin Kuzminski <marcin@python-works.com>
parents: 129
diff changeset
54 </div>
ffddbd80649e Added differ lib from mercurial.
Marcin Kuzminski <marcin@python-works.com>
parents: 129
diff changeset
55 </td>
ffddbd80649e Added differ lib from mercurial.
Marcin Kuzminski <marcin@python-works.com>
parents: 129
diff changeset
56 <td class="code">
ffddbd80649e Added differ lib from mercurial.
Marcin Kuzminski <marcin@python-works.com>
parents: 129
diff changeset
57 <div class="code-diff">
ffddbd80649e Added differ lib from mercurial.
Marcin Kuzminski <marcin@python-works.com>
parents: 129
diff changeset
58 <pre>
ffddbd80649e Added differ lib from mercurial.
Marcin Kuzminski <marcin@python-works.com>
parents: 129
diff changeset
59 <span>
ffddbd80649e Added differ lib from mercurial.
Marcin Kuzminski <marcin@python-works.com>
parents: 129
diff changeset
60 ${y}
ffddbd80649e Added differ lib from mercurial.
Marcin Kuzminski <marcin@python-works.com>
parents: 129
diff changeset
61 </span>
ffddbd80649e Added differ lib from mercurial.
Marcin Kuzminski <marcin@python-works.com>
parents: 129
diff changeset
62 </pre>
ffddbd80649e Added differ lib from mercurial.
Marcin Kuzminski <marcin@python-works.com>
parents: 129
diff changeset
63 </div>
ffddbd80649e Added differ lib from mercurial.
Marcin Kuzminski <marcin@python-works.com>
parents: 129
diff changeset
64 </td>
ffddbd80649e Added differ lib from mercurial.
Marcin Kuzminski <marcin@python-works.com>
parents: 129
diff changeset
65 </tr>
ffddbd80649e Added differ lib from mercurial.
Marcin Kuzminski <marcin@python-works.com>
parents: 129
diff changeset
66 %endfor$
ffddbd80649e Added differ lib from mercurial.
Marcin Kuzminski <marcin@python-works.com>
parents: 129
diff changeset
67 %endfor
ffddbd80649e Added differ lib from mercurial.
Marcin Kuzminski <marcin@python-works.com>
parents: 129
diff changeset
68 </table>
ffddbd80649e Added differ lib from mercurial.
Marcin Kuzminski <marcin@python-works.com>
parents: 129
diff changeset
69 </div>
ffddbd80649e Added differ lib from mercurial.
Marcin Kuzminski <marcin@python-works.com>
parents: 129
diff changeset
70 </div>
129
42d46deb124d implemented simple diffs for history of files.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
71 </%def>