Mercurial > kallithea
annotate rhodecode/templates/changeset/diff_block.html @ 2050:6aa328b903a5 beta
version bump
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Mon, 27 Feb 2012 05:13:40 +0200 |
parents | 2112bcbcb346 |
children | e8c016815ab9 |
rev | line source |
---|---|
1787
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
1 ## -*- coding: utf-8 -*- |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
2 ##usage: |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
3 ## <%namespace name="diff_block" file="/changeset/diff_block.html"/> |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
4 ## ${diff_block.diff_block(changes)} |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
5 ## |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
6 <%def name="diff_block(changes)"> |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
7 |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
8 %for change,filenode,diff,cs1,cs2,stat in changes: |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
9 %if change !='removed': |
1845
a048d0c6da3c
fixed show inline comments, broken after some html refactoring
Marcin Kuzminski <marcin@python-works.com>
parents:
1789
diff
changeset
|
10 <div id="${h.FID(filenode.changeset.raw_id,filenode.path)}_target" style="clear:both;height:90px;margin-top:-60px"></div> |
a048d0c6da3c
fixed show inline comments, broken after some html refactoring
Marcin Kuzminski <marcin@python-works.com>
parents:
1789
diff
changeset
|
11 <div id="${h.FID(filenode.changeset.raw_id,filenode.path)}" class="diffblock margined comm"> |
1787
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
12 <div class="code-header"> |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
13 <div class="changeset_header"> |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
14 <div class="changeset_file"> |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
15 ${h.link_to_if(change!='removed',h.safe_unicode(filenode.path),h.url('files_home',repo_name=c.repo_name, |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
16 revision=filenode.changeset.raw_id,f_path=h.safe_unicode(filenode.path)))} |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
17 </div> |
1865 | 18 <div class="diff-actions"> |
1902
2112bcbcb346
added tooltips into diff icons
Marcin Kuzminski <marcin@python-works.com>
parents:
1888
diff
changeset
|
19 <a href="${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)}" title="${_('diff')}" class="tooltip"><img class="icon" src="${h.url('/images/icons/page_white_go.png')}"/></a> |
2112bcbcb346
added tooltips into diff icons
Marcin Kuzminski <marcin@python-works.com>
parents:
1888
diff
changeset
|
20 <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='raw')}" title="${_('raw diff')}" class="tooltip"><img class="icon" src="${h.url('/images/icons/page_white.png')}"/></a> |
2112bcbcb346
added tooltips into diff icons
Marcin Kuzminski <marcin@python-works.com>
parents:
1888
diff
changeset
|
21 <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='download')}" title="${_('download diff')}" class="tooltip"><img class="icon" src="${h.url('/images/icons/page_white_get.png')}"/></a> |
1859
929fc8d926d5
changeset: replace diff/whitespace/context popup menu with icons
Aras Pranckevicius <aras@unity3d.com>
parents:
1789
diff
changeset
|
22 ${c.ignorews_url(h.FID(filenode.changeset.raw_id,filenode.path))} |
929fc8d926d5
changeset: replace diff/whitespace/context popup menu with icons
Aras Pranckevicius <aras@unity3d.com>
parents:
1789
diff
changeset
|
23 ${c.context_url(h.FID(filenode.changeset.raw_id,filenode.path))} |
1865 | 24 </div> |
1787
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
25 <span style="float:right;margin-top:-3px"> |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
26 <label> |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
27 ${_('show inline comments')} |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
28 ${h.checkbox('',checked="checked",class_="show-inline-comments",id_for=h.FID(filenode.changeset.raw_id,filenode.path))} |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
29 </label> |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
30 </span> |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
31 </div> |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
32 </div> |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
33 <div class="code-body"> |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1865
diff
changeset
|
34 <div class="full_f_path" path="${h.safe_unicode(filenode.path)}"></div> |
1789
17caf4efe15c
implements #308 rewrote diffs to enable displaying full diff on each file
Marcin Kuzminski <marcin@python-works.com>
parents:
1787
diff
changeset
|
35 ${diff|n} |
1787
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
36 </div> |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
37 </div> |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
38 %endif |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
39 %endfor |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
40 |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1865
diff
changeset
|
41 </%def> |