Mercurial > kallithea
annotate rhodecode/templates/changeset/changeset.html @ 2307:d2043c703f84 beta
Fixed i18n of the second comment help block.
author | Vincent Duvert <vincent@duvert.net> |
---|---|
date | Sun, 20 May 2012 10:14:08 +0200 |
parents | 2cfaf199a5a7 |
children | 09fd90d91b6a a437a986d399 83e4447077d3 |
rev | line source |
---|---|
1130
1cecc7db3106
fixed some limits in changesets and changelogs
Marcin Kuzminski <marcin@python-works.com>
parents:
1100
diff
changeset
|
1 ## -*- coding: utf-8 -*- |
1cecc7db3106
fixed some limits in changesets and changelogs
Marcin Kuzminski <marcin@python-works.com>
parents:
1100
diff
changeset
|
2 |
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
|
3 <%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
|
4 |
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 name="title()"> |
636
ffd07396d315
Fixes for raw_id, needed for git
Marcin Kuzminski <marcin@python-works.com>
parents:
619
diff
changeset
|
6 ${c.repo_name} ${_('Changeset')} - r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)} - ${c.rhodecode_name} |
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
|
7 </%def> |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
332
diff
changeset
|
8 |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
332
diff
changeset
|
9 <%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
|
10 ${h.link_to(u'Home',h.url('/'))} |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
332
diff
changeset
|
11 » |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
332
diff
changeset
|
12 ${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:
332
diff
changeset
|
13 » |
1956
fe64fecda0fd
changeset: do not uppercase the hash in breadcrumbs
Aras Pranckevicius <aras@unity3d.com>
parents:
1955
diff
changeset
|
14 ${_('Changeset')} - <span class='hash'>r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)}</span> |
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> |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
332
diff
changeset
|
16 |
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
|
17 <%def name="page_nav()"> |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
18 ${self.menu('changelog')} |
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> |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
332
diff
changeset
|
20 |
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
|
21 <%def name="main()"> |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
332
diff
changeset
|
22 <div class="box"> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
332
diff
changeset
|
23 <!-- box / title --> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
332
diff
changeset
|
24 <div class="title"> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
332
diff
changeset
|
25 ${self.breadcrumbs()} |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
332
diff
changeset
|
26 </div> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
332
diff
changeset
|
27 <div class="table"> |
977
28524453bb76
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
Marcin Kuzminski <marcin@python-works.com>
parents:
816
diff
changeset
|
28 <div class="diffblock"> |
468
9dd372c7166c
added menu for changeset raw diff and download diff
Marcin Kuzminski <marcin@python-works.com>
parents:
387
diff
changeset
|
29 <div class="code-header"> |
1949
0471cbe8b4a7
user lowercase (copy safe) hash in changeset
Marcin Kuzminski <marcin@python-works.com>
parents:
1902
diff
changeset
|
30 <div class="hash"> |
0471cbe8b4a7
user lowercase (copy safe) hash in changeset
Marcin Kuzminski <marcin@python-works.com>
parents:
1902
diff
changeset
|
31 r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)} |
0471cbe8b4a7
user lowercase (copy safe) hash in changeset
Marcin Kuzminski <marcin@python-works.com>
parents:
1902
diff
changeset
|
32 </div> |
1963
9bbde54232dc
white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1956
diff
changeset
|
33 <div class="date"> |
1949
0471cbe8b4a7
user lowercase (copy safe) hash in changeset
Marcin Kuzminski <marcin@python-works.com>
parents:
1902
diff
changeset
|
34 ${c.changeset.date} |
0471cbe8b4a7
user lowercase (copy safe) hash in changeset
Marcin Kuzminski <marcin@python-works.com>
parents:
1902
diff
changeset
|
35 </div> |
1865 | 36 <div class="diff-actions"> |
1902
2112bcbcb346
added tooltips into diff icons
Marcin Kuzminski <marcin@python-works.com>
parents:
1888
diff
changeset
|
37 <a href="${h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='show')}" 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
|
38 <a href="${h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='download')}" title="${_('download diff')}" class="tooltip"><img class="icon" src="${h.url('/images/icons/page_white_get.png')}"/></a> |
2161
e8c016815ab9
added hidden fulldiff GET param for disabling big diff cut off limit.
Marcin Kuzminski <marcin@python-works.com>
parents:
1963
diff
changeset
|
39 ${c.ignorews_url(request.GET)} |
e8c016815ab9
added hidden fulldiff GET param for disabling big diff cut off limit.
Marcin Kuzminski <marcin@python-works.com>
parents:
1963
diff
changeset
|
40 ${c.context_url(request.GET)} |
1865 | 41 </div> |
1776
22333ddd1a40
implements #307, configurable diffs
Marcin Kuzminski <marcin@python-works.com>
parents:
1775
diff
changeset
|
42 <div class="comments-number" style="float:right;padding-right:5px">${len(c.comments)} comment(s) (${c.inline_cnt} ${_('inline')})</div> |
468
9dd372c7166c
added menu for changeset raw diff and download diff
Marcin Kuzminski <marcin@python-works.com>
parents:
387
diff
changeset
|
43 </div> |
9dd372c7166c
added menu for changeset raw diff and download diff
Marcin Kuzminski <marcin@python-works.com>
parents:
387
diff
changeset
|
44 </div> |
529
3a567e329fb6
updated whoosh deps,
Marcin Kuzminski <marcin@python-works.com>
parents:
528
diff
changeset
|
45 <div id="changeset_content"> |
3a567e329fb6
updated whoosh deps,
Marcin Kuzminski <marcin@python-works.com>
parents:
528
diff
changeset
|
46 <div class="container"> |
3a567e329fb6
updated whoosh deps,
Marcin Kuzminski <marcin@python-works.com>
parents:
528
diff
changeset
|
47 <div class="left"> |
3a567e329fb6
updated whoosh deps,
Marcin Kuzminski <marcin@python-works.com>
parents:
528
diff
changeset
|
48 <div class="author"> |
3a567e329fb6
updated whoosh deps,
Marcin Kuzminski <marcin@python-works.com>
parents:
528
diff
changeset
|
49 <div class="gravatar"> |
3a567e329fb6
updated whoosh deps,
Marcin Kuzminski <marcin@python-works.com>
parents:
528
diff
changeset
|
50 <img alt="gravatar" src="${h.gravatar_url(h.email(c.changeset.author),20)}"/> |
3a567e329fb6
updated whoosh deps,
Marcin Kuzminski <marcin@python-works.com>
parents:
528
diff
changeset
|
51 </div> |
3a567e329fb6
updated whoosh deps,
Marcin Kuzminski <marcin@python-works.com>
parents:
528
diff
changeset
|
52 <span>${h.person(c.changeset.author)}</span><br/> |
3a567e329fb6
updated whoosh deps,
Marcin Kuzminski <marcin@python-works.com>
parents:
528
diff
changeset
|
53 <span><a href="mailto:${h.email_or_none(c.changeset.author)}">${h.email_or_none(c.changeset.author)}</a></span><br/> |
3a567e329fb6
updated whoosh deps,
Marcin Kuzminski <marcin@python-works.com>
parents:
528
diff
changeset
|
54 </div> |
1868
f26acc1b27e2
added repository name into issue tracker link to support different projects issues tracker mapping
Marcin Kuzminski <marcin@python-works.com>
parents:
1866
diff
changeset
|
55 <div class="message">${h.urlify_commit(h.wrap_paragraphs(c.changeset.message),c.repo_name)}</div> |
529
3a567e329fb6
updated whoosh deps,
Marcin Kuzminski <marcin@python-works.com>
parents:
528
diff
changeset
|
56 </div> |
3a567e329fb6
updated whoosh deps,
Marcin Kuzminski <marcin@python-works.com>
parents:
528
diff
changeset
|
57 <div class="right"> |
3a567e329fb6
updated whoosh deps,
Marcin Kuzminski <marcin@python-works.com>
parents:
528
diff
changeset
|
58 <div class="changes"> |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
59 % if len(c.changeset.affected_files) <= c.affected_files_cut_off: |
529
3a567e329fb6
updated whoosh deps,
Marcin Kuzminski <marcin@python-works.com>
parents:
528
diff
changeset
|
60 <span class="removed" title="${_('removed')}">${len(c.changeset.removed)}</span> |
3a567e329fb6
updated whoosh deps,
Marcin Kuzminski <marcin@python-works.com>
parents:
528
diff
changeset
|
61 <span class="changed" title="${_('changed')}">${len(c.changeset.changed)}</span> |
3a567e329fb6
updated whoosh deps,
Marcin Kuzminski <marcin@python-works.com>
parents:
528
diff
changeset
|
62 <span class="added" title="${_('added')}">${len(c.changeset.added)}</span> |
1130
1cecc7db3106
fixed some limits in changesets and changelogs
Marcin Kuzminski <marcin@python-works.com>
parents:
1100
diff
changeset
|
63 % else: |
1cecc7db3106
fixed some limits in changesets and changelogs
Marcin Kuzminski <marcin@python-works.com>
parents:
1100
diff
changeset
|
64 <span class="removed" title="${_('affected %s files') % len(c.changeset.affected_files)}">!</span> |
1cecc7db3106
fixed some limits in changesets and changelogs
Marcin Kuzminski <marcin@python-works.com>
parents:
1100
diff
changeset
|
65 <span class="changed" title="${_('affected %s files') % len(c.changeset.affected_files)}">!</span> |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
66 <span class="added" title="${_('affected %s files') % len(c.changeset.affected_files)}">!</span> |
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
67 % endif |
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
68 </div> |
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
69 |
551
f57aaf673743
fixed initial commit missing parents div,
Marcin Kuzminski <marcin@python-works.com>
parents:
547
diff
changeset
|
70 %if c.changeset.parents: |
529
3a567e329fb6
updated whoosh deps,
Marcin Kuzminski <marcin@python-works.com>
parents:
528
diff
changeset
|
71 %for p_cs in reversed(c.changeset.parents): |
1857
c577e8211d69
changeset: styling parents
Aras Pranckevicius <aras@unity3d.com>
parents:
1856
diff
changeset
|
72 <div class="parent">${_('Parent')} |
c577e8211d69
changeset: styling parents
Aras Pranckevicius <aras@unity3d.com>
parents:
1856
diff
changeset
|
73 <span class="changeset_id">${p_cs.revision}:<span class="changeset_hash">${h.link_to(h.short_id(p_cs.raw_id), |
c577e8211d69
changeset: styling parents
Aras Pranckevicius <aras@unity3d.com>
parents:
1856
diff
changeset
|
74 h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)}</span></span> |
529
3a567e329fb6
updated whoosh deps,
Marcin Kuzminski <marcin@python-works.com>
parents:
528
diff
changeset
|
75 </div> |
3a567e329fb6
updated whoosh deps,
Marcin Kuzminski <marcin@python-works.com>
parents:
528
diff
changeset
|
76 %endfor |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
77 %else: |
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
78 <div class="parent">${_('No parents')}</div> |
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
79 %endif |
529
3a567e329fb6
updated whoosh deps,
Marcin Kuzminski <marcin@python-works.com>
parents:
528
diff
changeset
|
80 <span class="logtags"> |
1856
0855c64c571f
css: merge/branch/tag blurbs
Aras Pranckevicius <aras@unity3d.com>
parents:
1851
diff
changeset
|
81 %if len(c.changeset.parents)>1: |
0855c64c571f
css: merge/branch/tag blurbs
Aras Pranckevicius <aras@unity3d.com>
parents:
1851
diff
changeset
|
82 <span class="merge">${_('merge')}</span> |
0855c64c571f
css: merge/branch/tag blurbs
Aras Pranckevicius <aras@unity3d.com>
parents:
1851
diff
changeset
|
83 %endif |
2231
2cfaf199a5a7
Fixed empty git commit message issue
Marcin Kuzminski <marcin@python-works.com>
parents:
2187
diff
changeset
|
84 %if c.changeset.branch: |
2cfaf199a5a7
Fixed empty git commit message issue
Marcin Kuzminski <marcin@python-works.com>
parents:
2187
diff
changeset
|
85 <span class="branchtag" title="${'%s %s' % (_('branch'),c.changeset.branch)}"> |
2cfaf199a5a7
Fixed empty git commit message issue
Marcin Kuzminski <marcin@python-works.com>
parents:
2187
diff
changeset
|
86 ${h.link_to(c.changeset.branch,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))} |
2cfaf199a5a7
Fixed empty git commit message issue
Marcin Kuzminski <marcin@python-works.com>
parents:
2187
diff
changeset
|
87 </span> |
2cfaf199a5a7
Fixed empty git commit message issue
Marcin Kuzminski <marcin@python-works.com>
parents:
2187
diff
changeset
|
88 %endif |
529
3a567e329fb6
updated whoosh deps,
Marcin Kuzminski <marcin@python-works.com>
parents:
528
diff
changeset
|
89 %for tag in c.changeset.tags: |
3a567e329fb6
updated whoosh deps,
Marcin Kuzminski <marcin@python-works.com>
parents:
528
diff
changeset
|
90 <span class="tagtag" title="${'%s %s' % (_('tag'),tag)}"> |
636
ffd07396d315
Fixes for raw_id, needed for git
Marcin Kuzminski <marcin@python-works.com>
parents:
619
diff
changeset
|
91 ${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</span> |
529
3a567e329fb6
updated whoosh deps,
Marcin Kuzminski <marcin@python-works.com>
parents:
528
diff
changeset
|
92 %endfor |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
93 </span> |
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
94 </div> |
529
3a567e329fb6
updated whoosh deps,
Marcin Kuzminski <marcin@python-works.com>
parents:
528
diff
changeset
|
95 </div> |
1858
609ec28bd2d1
changeset: styling a bit
Aras Pranckevicius <aras@unity3d.com>
parents:
1857
diff
changeset
|
96 <span> |
2161
e8c016815ab9
added hidden fulldiff GET param for disabling big diff cut off limit.
Marcin Kuzminski <marcin@python-works.com>
parents:
1963
diff
changeset
|
97 ${_('%s files affected with %s insertions and %s deletions:') % (len(c.changeset.affected_files),c.lines_added,c.lines_deleted)} |
1257
0a2a10a1912f
Implemented --stat for changelog
Marcin Kuzminski <marcin@python-works.com>
parents:
1176
diff
changeset
|
98 </span> |
529
3a567e329fb6
updated whoosh deps,
Marcin Kuzminski <marcin@python-works.com>
parents:
528
diff
changeset
|
99 <div class="cs_files"> |
1257
0a2a10a1912f
Implemented --stat for changelog
Marcin Kuzminski <marcin@python-works.com>
parents:
1176
diff
changeset
|
100 %for change,filenode,diff,cs1,cs2,stat in c.changes: |
0a2a10a1912f
Implemented --stat for changelog
Marcin Kuzminski <marcin@python-works.com>
parents:
1176
diff
changeset
|
101 <div class="cs_${change}"> |
1687
e21ec97aca1f
fixed issue with new files and removed files with using inline comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1686
diff
changeset
|
102 <div class="node"> |
e21ec97aca1f
fixed issue with new files and removed files with using inline comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1686
diff
changeset
|
103 %if change != 'removed': |
2161
e8c016815ab9
added hidden fulldiff GET param for disabling big diff cut off limit.
Marcin Kuzminski <marcin@python-works.com>
parents:
1963
diff
changeset
|
104 ${h.link_to(h.safe_unicode(filenode.path),c.anchor_url(filenode.changeset.raw_id,filenode.path,request.GET)+"_target")} |
1687
e21ec97aca1f
fixed issue with new files and removed files with using inline comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1686
diff
changeset
|
105 %else: |
1776
22333ddd1a40
implements #307, configurable diffs
Marcin Kuzminski <marcin@python-works.com>
parents:
1775
diff
changeset
|
106 ${h.link_to(h.safe_unicode(filenode.path),h.url.current(anchor=h.FID('',filenode.path)))} |
1687
e21ec97aca1f
fixed issue with new files and removed files with using inline comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1686
diff
changeset
|
107 %endif |
e21ec97aca1f
fixed issue with new files and removed files with using inline comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1686
diff
changeset
|
108 </div> |
1257
0a2a10a1912f
Implemented --stat for changelog
Marcin Kuzminski <marcin@python-works.com>
parents:
1176
diff
changeset
|
109 <div class="changes">${h.fancy_file_stats(stat)}</div> |
0a2a10a1912f
Implemented --stat for changelog
Marcin Kuzminski <marcin@python-works.com>
parents:
1176
diff
changeset
|
110 </div> |
529
3a567e329fb6
updated whoosh deps,
Marcin Kuzminski <marcin@python-works.com>
parents:
528
diff
changeset
|
111 %endfor |
1130
1cecc7db3106
fixed some limits in changesets and changelogs
Marcin Kuzminski <marcin@python-works.com>
parents:
1100
diff
changeset
|
112 % if c.cut_off: |
1472
aaec08ad9daf
Added pt_BR localization, added i18n wrappers on some places missing, fixed css in settings screen for longer labels.
Augusto Herrmann <augusto.herrmann@planejamento.gov.br>
parents:
1257
diff
changeset
|
113 ${_('Changeset was too big and was cut off...')} |
1130
1cecc7db3106
fixed some limits in changesets and changelogs
Marcin Kuzminski <marcin@python-works.com>
parents:
1100
diff
changeset
|
114 % endif |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
115 </div> |
529
3a567e329fb6
updated whoosh deps,
Marcin Kuzminski <marcin@python-works.com>
parents:
528
diff
changeset
|
116 </div> |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
117 |
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
|
118 </div> |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
119 |
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
120 ## diff block |
1787
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1776
diff
changeset
|
121 <%namespace name="diff_block" file="/changeset/diff_block.html"/> |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1776
diff
changeset
|
122 ${diff_block.diff_block(c.changes)} |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
123 |
1787
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1776
diff
changeset
|
124 ## template for inline comment form |
1670
d2de0c2f02cd
#77 code review
Marcin Kuzminski <marcin@python-works.com>
parents:
1472
diff
changeset
|
125 <%namespace name="comment" file="/changeset/changeset_file_comment.html"/> |
1787
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1776
diff
changeset
|
126 ${comment.comment_inline_form(c.changeset)} |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
127 |
2187
b61e540122f2
#415: Adding comment to changeset causes reload
Marcin Kuzminski <marcin@python-works.com>
parents:
2161
diff
changeset
|
128 ## render comments |
1787
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1776
diff
changeset
|
129 ${comment.comments(c.changeset)} |
1674
6f0143e5efe5
#71 code review
Marcin Kuzminski <marcin@python-works.com>
parents:
1670
diff
changeset
|
130 <script type="text/javascript"> |
1677
7276b170ce8b
#71 code-review
Marcin Kuzminski <marcin@python-works.com>
parents:
1676
diff
changeset
|
131 YUE.onDOMReady(function(){ |
2187
b61e540122f2
#415: Adding comment to changeset causes reload
Marcin Kuzminski <marcin@python-works.com>
parents:
2161
diff
changeset
|
132 AJAX_COMMENT_URL = "${url('changeset_comment',repo_name=c.repo_name,revision=c.changeset.raw_id)}"; |
b61e540122f2
#415: Adding comment to changeset causes reload
Marcin Kuzminski <marcin@python-works.com>
parents:
2161
diff
changeset
|
133 AJAX_COMMENT_DELETE_URL = "${url('changeset_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}" |
1787
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1776
diff
changeset
|
134 YUE.on(YUQ('.show-inline-comments'),'change',function(e){ |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1776
diff
changeset
|
135 var show = 'none'; |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1776
diff
changeset
|
136 var target = e.currentTarget; |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1776
diff
changeset
|
137 if(target.checked){ |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1776
diff
changeset
|
138 var show = '' |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1776
diff
changeset
|
139 } |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1776
diff
changeset
|
140 var boxid = YUD.getAttribute(target,'id_for'); |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1776
diff
changeset
|
141 var comments = YUQ('#{0} .inline-comments'.format(boxid)); |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
142 for(c in comments){ |
1787
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1776
diff
changeset
|
143 YUD.setStyle(comments[c],'display',show); |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1776
diff
changeset
|
144 } |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1776
diff
changeset
|
145 var btns = YUQ('#{0} .inline-comments-button'.format(boxid)); |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
146 for(c in btns){ |
1772
c83d3d42ab92
- diff.css merge to main style.css
Marcin Kuzminski <marcin@python-works.com>
parents:
1705
diff
changeset
|
147 YUD.setStyle(btns[c],'display',show); |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
148 } |
1787
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1776
diff
changeset
|
149 }) |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
150 |
1677
7276b170ce8b
#71 code-review
Marcin Kuzminski <marcin@python-works.com>
parents:
1676
diff
changeset
|
151 YUE.on(YUQ('.line'),'click',function(e){ |
1787
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1776
diff
changeset
|
152 var tr = e.currentTarget; |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1776
diff
changeset
|
153 injectInlineForm(tr); |
1682
1f2ba96de73e
#71 code review
Marcin Kuzminski <marcin@python-works.com>
parents:
1681
diff
changeset
|
154 }); |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
155 |
1682
1f2ba96de73e
#71 code review
Marcin Kuzminski <marcin@python-works.com>
parents:
1681
diff
changeset
|
156 // inject comments into they proper positions |
1f2ba96de73e
#71 code review
Marcin Kuzminski <marcin@python-works.com>
parents:
1681
diff
changeset
|
157 var file_comments = YUQ('.inline-comment-placeholder'); |
2187
b61e540122f2
#415: Adding comment to changeset causes reload
Marcin Kuzminski <marcin@python-works.com>
parents:
2161
diff
changeset
|
158 renderInlineComments(file_comments); |
1677
7276b170ce8b
#71 code-review
Marcin Kuzminski <marcin@python-works.com>
parents:
1676
diff
changeset
|
159 }) |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
160 |
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
161 </script> |
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
162 |
1787
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1776
diff
changeset
|
163 </div> |
1472
aaec08ad9daf
Added pt_BR localization, added i18n wrappers on some places missing, fixed css in settings screen for longer labels.
Augusto Herrmann <augusto.herrmann@planejamento.gov.br>
parents:
1257
diff
changeset
|
164 </%def> |