Mercurial > public > src > rhodecode
annotate pylons_app/templates/changeset/changeset.html @ 559:d945c95ba4ac
refactoring for new vcs implementation
renamed all ._short and .raw_id into .short_id
updated dependency for vcs to 0.1.6
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Tue, 28 Sep 2010 20:25:58 +0000 |
parents | 9dd372c7166c |
children | 6d0d5e7d7356 |
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 <%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
|
2 |
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 <%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
|
4 ${_('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
|
5 </%def> |
388
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
353
diff
changeset
|
6 |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
353
diff
changeset
|
7 <%def name="breadcrumbs_links()"> |
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
|
8 ${h.link_to(u'Home',h.url('/'))} |
388
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
353
diff
changeset
|
9 » |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
353
diff
changeset
|
10 ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))} |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
353
diff
changeset
|
11 » |
559
d945c95ba4ac
refactoring for new vcs implementation
Marcin Kuzminski <marcin@python-works.com>
parents:
511
diff
changeset
|
12 ${_('Changeset')} - r${c.changeset.revision}:${c.changeset.short_id} |
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
|
13 </%def> |
388
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
353
diff
changeset
|
14 |
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
|
15 <%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
|
16 ${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
|
17 </%def> |
388
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
353
diff
changeset
|
18 |
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
|
19 <%def name="main()"> |
388
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
353
diff
changeset
|
20 <div class="box"> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
353
diff
changeset
|
21 <!-- box / title --> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
353
diff
changeset
|
22 <div class="title"> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
353
diff
changeset
|
23 ${self.breadcrumbs()} |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
353
diff
changeset
|
24 </div> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
353
diff
changeset
|
25 <div class="table"> |
511
9dd372c7166c
added menu for changeset raw diff and download diff
Marcin Kuzminski <marcin@python-works.com>
parents:
420
diff
changeset
|
26 <div id="body" class="diffblock"> |
9dd372c7166c
added menu for changeset raw diff and download diff
Marcin Kuzminski <marcin@python-works.com>
parents:
420
diff
changeset
|
27 <div class="code-header"> |
9dd372c7166c
added menu for changeset raw diff and download diff
Marcin Kuzminski <marcin@python-works.com>
parents:
420
diff
changeset
|
28 <div> |
559
d945c95ba4ac
refactoring for new vcs implementation
Marcin Kuzminski <marcin@python-works.com>
parents:
511
diff
changeset
|
29 ${_('Changeset')} - r${c.changeset.revision}:${c.changeset.short_id} |
511
9dd372c7166c
added menu for changeset raw diff and download diff
Marcin Kuzminski <marcin@python-works.com>
parents:
420
diff
changeset
|
30 » <span>${h.link_to(_('raw diff'), |
559
d945c95ba4ac
refactoring for new vcs implementation
Marcin Kuzminski <marcin@python-works.com>
parents:
511
diff
changeset
|
31 h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.short_id,diff='show'))}</span> |
511
9dd372c7166c
added menu for changeset raw diff and download diff
Marcin Kuzminski <marcin@python-works.com>
parents:
420
diff
changeset
|
32 » <span>${h.link_to(_('download diff'), |
559
d945c95ba4ac
refactoring for new vcs implementation
Marcin Kuzminski <marcin@python-works.com>
parents:
511
diff
changeset
|
33 h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.short_id,diff='download'))}</span> |
511
9dd372c7166c
added menu for changeset raw diff and download diff
Marcin Kuzminski <marcin@python-works.com>
parents:
420
diff
changeset
|
34 </div> |
9dd372c7166c
added menu for changeset raw diff and download diff
Marcin Kuzminski <marcin@python-works.com>
parents:
420
diff
changeset
|
35 </div> |
9dd372c7166c
added menu for changeset raw diff and download diff
Marcin Kuzminski <marcin@python-works.com>
parents:
420
diff
changeset
|
36 </div> |
9dd372c7166c
added menu for changeset raw diff and download diff
Marcin Kuzminski <marcin@python-works.com>
parents:
420
diff
changeset
|
37 |
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
|
38 <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
|
39 <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
|
40 <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
|
41 <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
|
42 <div class="author">${_('Author')}: ${c.changeset.author}</div> |
353
40b409af53a5
litle html updates for changeset
Marcin Kuzminski <marcin@python-works.com>
parents:
294
diff
changeset
|
43 <div class="message">${h.wrap_paragraphs(c.changeset.message)}</div> |
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
|
44 </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
|
45 <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
|
46 <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
|
47 <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
|
48 %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
|
49 <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
|
50 %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
|
51 </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
|
52 %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
|
53 <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
|
54 ${_('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
|
55 <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
|
56 </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
|
57 %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
|
58 %for p_cs in reversed(c.changeset.parents): |
559
d945c95ba4ac
refactoring for new vcs implementation
Marcin Kuzminski <marcin@python-works.com>
parents:
511
diff
changeset
|
59 <div class="parent">${_('Parent')} ${p_cs.revision}: ${h.link_to(p_cs.short_id, |
d945c95ba4ac
refactoring for new vcs implementation
Marcin Kuzminski <marcin@python-works.com>
parents:
511
diff
changeset
|
60 h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.short_id),title=p_cs.message)} |
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
|
61 </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
|
62 %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
|
63 </div> |
353
40b409af53a5
litle html updates for changeset
Marcin Kuzminski <marcin@python-works.com>
parents:
294
diff
changeset
|
64 </div> |
40b409af53a5
litle html updates for changeset
Marcin Kuzminski <marcin@python-works.com>
parents:
294
diff
changeset
|
65 <span style="font-size:1.1em;font-weight: bold">${_('Files affected')}</span> |
40b409af53a5
litle html updates for changeset
Marcin Kuzminski <marcin@python-works.com>
parents:
294
diff
changeset
|
66 <div class="cs_files"> |
40b409af53a5
litle html updates for changeset
Marcin Kuzminski <marcin@python-works.com>
parents:
294
diff
changeset
|
67 %for change,filenode,diff,cs1,cs2 in c.changes: |
40b409af53a5
litle html updates for changeset
Marcin Kuzminski <marcin@python-works.com>
parents:
294
diff
changeset
|
68 <div class="cs_${change}">${h.link_to(filenode.path,h.url.current(anchor='CHANGE-%s'%filenode.path))}</div> |
40b409af53a5
litle html updates for changeset
Marcin Kuzminski <marcin@python-works.com>
parents:
294
diff
changeset
|
69 %endfor |
40b409af53a5
litle html updates for changeset
Marcin Kuzminski <marcin@python-works.com>
parents:
294
diff
changeset
|
70 </div> |
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
|
71 </div> |
353
40b409af53a5
litle html updates for changeset
Marcin Kuzminski <marcin@python-works.com>
parents:
294
diff
changeset
|
72 |
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
|
73 %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
|
74 %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
|
75 <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
|
76 <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
|
77 <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
|
78 <div> |
225
710e7a75bb6b
templating update, improved look & feel, version bump
Marcin Kuzminski <marcin@python-works.com>
parents:
218
diff
changeset
|
79 <span> |
710e7a75bb6b
templating update, improved look & feel, version bump
Marcin Kuzminski <marcin@python-works.com>
parents:
218
diff
changeset
|
80 ${h.link_to_if(change!='removed',filenode.path,h.url('files_home',repo_name=c.repo_name, |
559
d945c95ba4ac
refactoring for new vcs implementation
Marcin Kuzminski <marcin@python-works.com>
parents:
511
diff
changeset
|
81 revision=filenode.changeset.short_id,f_path=filenode.path))} |
225
710e7a75bb6b
templating update, improved look & feel, version bump
Marcin Kuzminski <marcin@python-works.com>
parents:
218
diff
changeset
|
82 </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
|
83 %if 1: |
420
2a18192fbd1e
templating updates (font sizes)
Marcin Kuzminski <marcin@python-works.com>
parents:
388
diff
changeset
|
84 » <span>${h.link_to(_('diff'), |
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
|
85 h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path,diff2=cs2,diff1=cs1,diff='diff'))}</span> |
420
2a18192fbd1e
templating updates (font sizes)
Marcin Kuzminski <marcin@python-works.com>
parents:
388
diff
changeset
|
86 » <span>${h.link_to(_('raw diff'), |
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
|
87 h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path,diff2=cs2,diff1=cs1,diff='raw'))}</span> |
420
2a18192fbd1e
templating updates (font sizes)
Marcin Kuzminski <marcin@python-works.com>
parents:
388
diff
changeset
|
88 » <span>${h.link_to(_('download diff'), |
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
|
89 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
|
90 %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
|
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 </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
|
93 <div class="code-body"> |
225
710e7a75bb6b
templating update, improved look & feel, version bump
Marcin Kuzminski <marcin@python-works.com>
parents:
218
diff
changeset
|
94 %if diff: |
710e7a75bb6b
templating update, improved look & feel, version bump
Marcin Kuzminski <marcin@python-works.com>
parents:
218
diff
changeset
|
95 ${diff|n} |
710e7a75bb6b
templating update, improved look & feel, version bump
Marcin Kuzminski <marcin@python-works.com>
parents:
218
diff
changeset
|
96 %else: |
710e7a75bb6b
templating update, improved look & feel, version bump
Marcin Kuzminski <marcin@python-works.com>
parents:
218
diff
changeset
|
97 ${_('No changes in this file')} |
710e7a75bb6b
templating update, improved look & feel, version bump
Marcin Kuzminski <marcin@python-works.com>
parents:
218
diff
changeset
|
98 %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
|
99 </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
|
100 </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
|
101 %endif |
388
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
353
diff
changeset
|
102 %endfor |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
353
diff
changeset
|
103 </div> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
353
diff
changeset
|
104 </div> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
353
diff
changeset
|
105 |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
353
diff
changeset
|
106 </%def> |