Mercurial > public > src > rhodecode
annotate pylons_app/templates/changeset/changeset.html @ 277:5db466f19b8d
added proposal from mercurial mailing list, to display options for raw diffs, and diffs directly from within changesets view
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Tue, 08 Jun 2010 23:52:01 +0200 |
parents | 0d809e72b357 |
children | 237470e64bb8 |
rev | line source |
---|---|
193
50a39f923f31
Added file annotation template. Bumped version to 0.6.8. Changelog and changeset are now cleaned with js, it's still very beta.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
1 <%! |
50a39f923f31
Added file annotation template. Bumped version to 0.6.8. Changelog and changeset are now cleaned with js, it's still very beta.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
2 from pylons_app.lib import filters |
50a39f923f31
Added file annotation template. Bumped version to 0.6.8. Changelog and changeset are now cleaned with js, it's still very beta.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
3 %> |
50a39f923f31
Added file annotation template. Bumped version to 0.6.8. Changelog and changeset are now cleaned with js, it's still very beta.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
4 <%inherit file="/base/base.html"/> |
50a39f923f31
Added file annotation template. Bumped version to 0.6.8. Changelog and changeset are now cleaned with js, it's still very beta.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
5 |
50a39f923f31
Added file annotation template. Bumped version to 0.6.8. Changelog and changeset are now cleaned with js, it's still very beta.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
6 <%def name="title()"> |
50a39f923f31
Added file annotation template. Bumped version to 0.6.8. Changelog and changeset are now cleaned with js, it's still very beta.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
7 ${_('Changeset')} |
50a39f923f31
Added file annotation template. Bumped version to 0.6.8. Changelog and changeset are now cleaned with js, it's still very beta.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
8 </%def> |
50a39f923f31
Added file annotation template. Bumped version to 0.6.8. Changelog and changeset are now cleaned with js, it's still very beta.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
9 <%def name="breadcrumbs()"> |
50a39f923f31
Added file annotation template. Bumped version to 0.6.8. Changelog and changeset are now cleaned with js, it's still very beta.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
10 ${h.link_to(u'Home',h.url('/'))} |
50a39f923f31
Added file annotation template. Bumped version to 0.6.8. Changelog and changeset are now cleaned with js, it's still very beta.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
11 / |
50a39f923f31
Added file annotation template. Bumped version to 0.6.8. Changelog and changeset are now cleaned with js, it's still very beta.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
12 ${h.link_to(c.repo_name,h.url('changeset_home',repo_name=c.repo_name))} |
50a39f923f31
Added file annotation template. Bumped version to 0.6.8. Changelog and changeset are now cleaned with js, it's still very beta.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
13 / |
50a39f923f31
Added file annotation template. Bumped version to 0.6.8. Changelog and changeset are now cleaned with js, it's still very beta.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
14 ${_('changeset')} |
50a39f923f31
Added file annotation template. Bumped version to 0.6.8. Changelog and changeset are now cleaned with js, it's still very beta.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
15 </%def> |
50a39f923f31
Added file annotation template. Bumped version to 0.6.8. Changelog and changeset are now cleaned with js, it's still very beta.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
16 <%def name="page_nav()"> |
50a39f923f31
Added file annotation template. Bumped version to 0.6.8. Changelog and changeset are now cleaned with js, it's still very beta.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
17 ${self.menu('changelog')} |
50a39f923f31
Added file annotation template. Bumped version to 0.6.8. Changelog and changeset are now cleaned with js, it's still very beta.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
18 </%def> |
218
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
19 <%def name="css()"> |
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
20 <link rel="stylesheet" href="/css/monoblue_custom.css" type="text/css" /> |
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
21 <link rel="stylesheet" href="/css/diff.css" type="text/css" /> |
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
22 </%def> |
193
50a39f923f31
Added file annotation template. Bumped version to 0.6.8. Changelog and changeset are now cleaned with js, it's still very beta.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
23 <%def name="main()"> |
218
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
24 <h2 class="no-link no-border">${_('Changeset')} - r${c.changeset.revision}:${c.changeset.raw_id}</h2> |
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
25 |
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
26 <div id="changeset_content"> |
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
27 <div class="container"> |
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
28 <div class="left"> |
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
29 <div class="date">${_('Date')}: ${c.changeset.date}</div> |
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
30 <div class="author">${_('Author')}: ${c.changeset.author}</div> |
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
31 <div class="message"> |
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
32 ${c.changeset.message} |
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
33 </div> |
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
34 </div> |
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
35 <div class="right"> |
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
36 <span class="logtags"> |
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
37 <span class="branchtag">${c.changeset.branch}</span> |
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
38 %for tag in c.changeset.tags: |
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
39 <span class="tagtag">${tag}</span> |
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
40 %endfor |
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
41 </span> |
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
42 %if len(c.changeset.parents)>1: |
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
43 <div class="merge"> |
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
44 ${_('merge')} |
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
45 <img alt="merge" src="/images/icons/arrow_join.png"> |
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
46 </div> |
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
47 %endif |
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
48 %for p_cs in reversed(c.changeset.parents): |
274 | 49 <div class="parent">${_('Parent')} ${p_cs.revision}: ${h.link_to(p_cs.raw_id, |
218
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
50 h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)} |
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
51 </div> |
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
52 %endfor |
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
53 </div> |
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
54 </div> |
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
55 </div> |
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
56 |
225
710e7a75bb6b
templating update, improved look & feel, version bump
Marcin Kuzminski <marcin@python-works.com>
parents:
218
diff
changeset
|
57 <div style="clear:both;height:10px"></div> |
193
50a39f923f31
Added file annotation template. Bumped version to 0.6.8. Changelog and changeset are now cleaned with js, it's still very beta.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
58 <div class="cs_files"> |
277
5db466f19b8d
added proposal from mercurial mailing list, to display options for raw diffs, and diffs directly from within changesets view
Marcin Kuzminski <marcin@python-works.com>
parents:
274
diff
changeset
|
59 %for change,filenode,diff,cs1,cs2 in c.changes: |
218
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
60 <div class="cs_${change}">${h.link_to(filenode.path,h.url.current(anchor='CHANGE-%s'%filenode.path))}</div> |
193
50a39f923f31
Added file annotation template. Bumped version to 0.6.8. Changelog and changeset are now cleaned with js, it's still very beta.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
61 %endfor |
218
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
62 </div> |
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
63 |
277
5db466f19b8d
added proposal from mercurial mailing list, to display options for raw diffs, and diffs directly from within changesets view
Marcin Kuzminski <marcin@python-works.com>
parents:
274
diff
changeset
|
64 %for change,filenode,diff,cs1,cs2 in c.changes: |
218
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
65 %if change !='removed': |
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
66 <div style="clear:both;height:10px"></div> |
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
67 <div id="body" class="diffblock"> |
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
68 <div id="${'CHANGE-%s'%filenode.path}" class="code-header"> |
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
69 <div> |
225
710e7a75bb6b
templating update, improved look & feel, version bump
Marcin Kuzminski <marcin@python-works.com>
parents:
218
diff
changeset
|
70 <span> |
710e7a75bb6b
templating update, improved look & feel, version bump
Marcin Kuzminski <marcin@python-works.com>
parents:
218
diff
changeset
|
71 ${h.link_to_if(change!='removed',filenode.path,h.url('files_home',repo_name=c.repo_name, |
710e7a75bb6b
templating update, improved look & feel, version bump
Marcin Kuzminski <marcin@python-works.com>
parents:
218
diff
changeset
|
72 revision=filenode.changeset.raw_id,f_path=filenode.path))} |
710e7a75bb6b
templating update, improved look & feel, version bump
Marcin Kuzminski <marcin@python-works.com>
parents:
218
diff
changeset
|
73 </span> |
277
5db466f19b8d
added proposal from mercurial mailing list, to display options for raw diffs, and diffs directly from within changesets view
Marcin Kuzminski <marcin@python-works.com>
parents:
274
diff
changeset
|
74 %if 1: |
5db466f19b8d
added proposal from mercurial mailing list, to display options for raw diffs, and diffs directly from within changesets view
Marcin Kuzminski <marcin@python-works.com>
parents:
274
diff
changeset
|
75 » <span style="font-size:77%">${h.link_to(_('diff'), |
5db466f19b8d
added proposal from mercurial mailing list, to display options for raw diffs, and diffs directly from within changesets view
Marcin Kuzminski <marcin@python-works.com>
parents:
274
diff
changeset
|
76 h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path,diff2=cs2,diff1=cs1,diff='diff'))}</span> |
5db466f19b8d
added proposal from mercurial mailing list, to display options for raw diffs, and diffs directly from within changesets view
Marcin Kuzminski <marcin@python-works.com>
parents:
274
diff
changeset
|
77 » <span style="font-size:77%">${h.link_to(_('raw diff'), |
5db466f19b8d
added proposal from mercurial mailing list, to display options for raw diffs, and diffs directly from within changesets view
Marcin Kuzminski <marcin@python-works.com>
parents:
274
diff
changeset
|
78 h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path,diff2=cs2,diff1=cs1,diff='raw'))}</span> |
5db466f19b8d
added proposal from mercurial mailing list, to display options for raw diffs, and diffs directly from within changesets view
Marcin Kuzminski <marcin@python-works.com>
parents:
274
diff
changeset
|
79 » <span style="font-size:77%">${h.link_to(_('download diff'), |
5db466f19b8d
added proposal from mercurial mailing list, to display options for raw diffs, and diffs directly from within changesets view
Marcin Kuzminski <marcin@python-works.com>
parents:
274
diff
changeset
|
80 h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path,diff2=cs2,diff1=cs1,diff='download'))}</span> |
5db466f19b8d
added proposal from mercurial mailing list, to display options for raw diffs, and diffs directly from within changesets view
Marcin Kuzminski <marcin@python-works.com>
parents:
274
diff
changeset
|
81 %endif |
218
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
82 </div> |
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
83 </div> |
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
84 <div class="code-body"> |
225
710e7a75bb6b
templating update, improved look & feel, version bump
Marcin Kuzminski <marcin@python-works.com>
parents:
218
diff
changeset
|
85 %if diff: |
710e7a75bb6b
templating update, improved look & feel, version bump
Marcin Kuzminski <marcin@python-works.com>
parents:
218
diff
changeset
|
86 ${diff|n} |
710e7a75bb6b
templating update, improved look & feel, version bump
Marcin Kuzminski <marcin@python-works.com>
parents:
218
diff
changeset
|
87 %else: |
710e7a75bb6b
templating update, improved look & feel, version bump
Marcin Kuzminski <marcin@python-works.com>
parents:
218
diff
changeset
|
88 ${_('No changes in this file')} |
710e7a75bb6b
templating update, improved look & feel, version bump
Marcin Kuzminski <marcin@python-works.com>
parents:
218
diff
changeset
|
89 %endif |
218
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
90 </div> |
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
91 </div> |
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
92 %endif |
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
93 %endfor |
58b46f9194c3
version bump. Made changesets work as should, but vcs had to be fixed for that.
Marcin Kuzminski <marcin@python-works.com>
parents:
193
diff
changeset
|
94 |
193
50a39f923f31
Added file annotation template. Bumped version to 0.6.8. Changelog and changeset are now cleaned with js, it's still very beta.
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
95 </%def> |