Mercurial > kallithea
annotate rhodecode/templates/changeset/changeset.html @ 3582:1f334a68d057 beta
improved title consistency
- changed - into dots to save space
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Sun, 24 Mar 2013 22:01:31 +0100 |
parents | 5462bb077b05 |
children | bb1eecda3172 |
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()"> |
3582
1f334a68d057
improved title consistency
Marcin Kuzminski <marcin@python-works.com>
parents:
3533
diff
changeset
|
6 ${_('%s Changeset') % c.repo_name} - ${h.show_id(c.changeset)} · ${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()"> |
3392
f74be3359044
unified breadcrumbs display
Marcin Kuzminski <marcin@python-works.com>
parents:
3312
diff
changeset
|
10 ${_('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
|
11 </%def> |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
332
diff
changeset
|
12 |
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 name="page_nav()"> |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
14 ${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
|
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="main()"> |
3533
5462bb077b05
Adding context bar to the changeset page
Leonardo <leo@unity3d.com>
parents:
3392
diff
changeset
|
18 ${self.context_bar('changelog')} |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
332
diff
changeset
|
19 <div class="box"> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
332
diff
changeset
|
20 <!-- box / title --> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
332
diff
changeset
|
21 <div class="title"> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
332
diff
changeset
|
22 ${self.breadcrumbs()} |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
332
diff
changeset
|
23 </div> |
2995
32471bd1f4ee
Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents:
2725
diff
changeset
|
24 <script> |
32471bd1f4ee
Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents:
2725
diff
changeset
|
25 var _USERS_AC_DATA = ${c.users_array|n}; |
32471bd1f4ee
Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents:
2725
diff
changeset
|
26 var _GROUPS_AC_DATA = ${c.users_groups_array|n}; |
32471bd1f4ee
Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents:
2725
diff
changeset
|
27 AJAX_COMMENT_URL = "${url('changeset_comment',repo_name=c.repo_name,revision=c.changeset.raw_id)}"; |
32471bd1f4ee
Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents:
2725
diff
changeset
|
28 AJAX_COMMENT_DELETE_URL = "${url('changeset_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}"; |
32471bd1f4ee
Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents:
2725
diff
changeset
|
29 </script> |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
332
diff
changeset
|
30 <div class="table"> |
3197 | 31 <div class="diffblock"> |
3078
5ba6fd9ab711
Reordered parents/children links ref #650
Marcin Kuzminski <marcin@python-works.com>
parents:
3014
diff
changeset
|
32 <div class="parents"> |
5ba6fd9ab711
Reordered parents/children links ref #650
Marcin Kuzminski <marcin@python-works.com>
parents:
3014
diff
changeset
|
33 %if c.changeset.parents: |
3079
8618b7811bf0
fix enumerate call for python2.5
Marcin Kuzminski <marcin@python-works.com>
parents:
3078
diff
changeset
|
34 %for n, p_cs in enumerate(reversed(c.changeset.parents)): |
3078
5ba6fd9ab711
Reordered parents/children links ref #650
Marcin Kuzminski <marcin@python-works.com>
parents:
3014
diff
changeset
|
35 <span class="changeset_hash">« ${h.link_to('%s:%s' % (p_cs.revision,p_cs.raw_id[:6]),h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)}</span> |
5ba6fd9ab711
Reordered parents/children links ref #650
Marcin Kuzminski <marcin@python-works.com>
parents:
3014
diff
changeset
|
36 <br> |
5ba6fd9ab711
Reordered parents/children links ref #650
Marcin Kuzminski <marcin@python-works.com>
parents:
3014
diff
changeset
|
37 %endfor |
5ba6fd9ab711
Reordered parents/children links ref #650
Marcin Kuzminski <marcin@python-works.com>
parents:
3014
diff
changeset
|
38 %else: |
5ba6fd9ab711
Reordered parents/children links ref #650
Marcin Kuzminski <marcin@python-works.com>
parents:
3014
diff
changeset
|
39 <span>${_('No parents')}</span> |
3149
68f9c216377d
white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
3079
diff
changeset
|
40 %endif |
3078
5ba6fd9ab711
Reordered parents/children links ref #650
Marcin Kuzminski <marcin@python-works.com>
parents:
3014
diff
changeset
|
41 </div> |
5ba6fd9ab711
Reordered parents/children links ref #650
Marcin Kuzminski <marcin@python-works.com>
parents:
3014
diff
changeset
|
42 <div class="children"> |
5ba6fd9ab711
Reordered parents/children links ref #650
Marcin Kuzminski <marcin@python-works.com>
parents:
3014
diff
changeset
|
43 %if c.changeset.children: |
3079
8618b7811bf0
fix enumerate call for python2.5
Marcin Kuzminski <marcin@python-works.com>
parents:
3078
diff
changeset
|
44 %for n, p_cs in enumerate(reversed(c.changeset.children)): |
3078
5ba6fd9ab711
Reordered parents/children links ref #650
Marcin Kuzminski <marcin@python-works.com>
parents:
3014
diff
changeset
|
45 <span class="changeset_hash">${h.link_to('%s:%s' % (p_cs.revision,p_cs.raw_id[:6]),h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)} »</span> |
5ba6fd9ab711
Reordered parents/children links ref #650
Marcin Kuzminski <marcin@python-works.com>
parents:
3014
diff
changeset
|
46 <br> |
5ba6fd9ab711
Reordered parents/children links ref #650
Marcin Kuzminski <marcin@python-works.com>
parents:
3014
diff
changeset
|
47 %endfor |
5ba6fd9ab711
Reordered parents/children links ref #650
Marcin Kuzminski <marcin@python-works.com>
parents:
3014
diff
changeset
|
48 %else: |
5ba6fd9ab711
Reordered parents/children links ref #650
Marcin Kuzminski <marcin@python-works.com>
parents:
3014
diff
changeset
|
49 <span>${_('No children')}</span> |
3149
68f9c216377d
white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
3079
diff
changeset
|
50 %endif |
68f9c216377d
white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
3079
diff
changeset
|
51 </div> |
3197 | 52 <div class="code-header banner"> |
3149
68f9c216377d
white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
3079
diff
changeset
|
53 |
1949
0471cbe8b4a7
user lowercase (copy safe) hash in changeset
Marcin Kuzminski <marcin@python-works.com>
parents:
1902
diff
changeset
|
54 <div class="hash"> |
0471cbe8b4a7
user lowercase (copy safe) hash in changeset
Marcin Kuzminski <marcin@python-works.com>
parents:
1902
diff
changeset
|
55 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
|
56 </div> |
1963
9bbde54232dc
white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1956
diff
changeset
|
57 <div class="date"> |
2416
44f328d6f209
Added a translatable date formatter for every date displayed.
Vincent Duvert <vincent@duvert.net>
parents:
2369
diff
changeset
|
58 ${h.fmt_date(c.changeset.date)} |
1949
0471cbe8b4a7
user lowercase (copy safe) hash in changeset
Marcin Kuzminski <marcin@python-works.com>
parents:
1902
diff
changeset
|
59 </div> |
2239
493e03a4d268
added changeset status into changelog view
Marcin Kuzminski <marcin@python-works.com>
parents:
2238
diff
changeset
|
60 <div class="changeset-status-container"> |
493e03a4d268
added changeset status into changelog view
Marcin Kuzminski <marcin@python-works.com>
parents:
2238
diff
changeset
|
61 %if c.statuses: |
493e03a4d268
added changeset status into changelog view
Marcin Kuzminski <marcin@python-works.com>
parents:
2238
diff
changeset
|
62 <div title="${_('Changeset status')}" class="changeset-status-lbl">[${h.changeset_status_lbl(c.statuses[0])}]</div> |
493e03a4d268
added changeset status into changelog view
Marcin Kuzminski <marcin@python-works.com>
parents:
2238
diff
changeset
|
63 <div class="changeset-status-ico"><img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses[0])}" /></div> |
493e03a4d268
added changeset status into changelog view
Marcin Kuzminski <marcin@python-works.com>
parents:
2238
diff
changeset
|
64 %endif |
493e03a4d268
added changeset status into changelog view
Marcin Kuzminski <marcin@python-works.com>
parents:
2238
diff
changeset
|
65 </div> |
1865 | 66 <div class="diff-actions"> |
2996
ebe3e388bbb3
new patch function, and urls schema.
Marcin Kuzminski <marcin@python-works.com>
parents:
2995
diff
changeset
|
67 <a href="${h.url('changeset_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id)}" class="tooltip" title="${h.tooltip(_('raw diff'))}"><img class="icon" src="${h.url('/images/icons/page_white.png')}"/></a> |
ebe3e388bbb3
new patch function, and urls schema.
Marcin Kuzminski <marcin@python-works.com>
parents:
2995
diff
changeset
|
68 <a href="${h.url('changeset_patch_home',repo_name=c.repo_name,revision=c.changeset.raw_id)}" class="tooltip" title="${h.tooltip(_('patch diff'))}"><img class="icon" src="${h.url('/images/icons/page_add.png')}"/></a> |
ebe3e388bbb3
new patch function, and urls schema.
Marcin Kuzminski <marcin@python-works.com>
parents:
2995
diff
changeset
|
69 <a href="${h.url('changeset_download_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='download')}" class="tooltip" title="${h.tooltip(_('download diff'))}"><img class="icon" src="${h.url('/images/icons/page_save.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
|
70 ${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
|
71 ${c.context_url(request.GET)} |
1865 | 72 </div> |
2310
83e4447077d3
Improved i18n for the comment count (use of ngettext for pluralisation).
Vincent Duvert <vincent@duvert.net>
parents:
2231
diff
changeset
|
73 <div class="comments-number" style="float:right;padding-right:5px">${ungettext("%d comment", "%d comments", len(c.comments)) % len(c.comments)} ${ungettext("(%d inline)", "(%d inline)", c.inline_cnt) % c.inline_cnt}</div> |
3149
68f9c216377d
white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
3079
diff
changeset
|
74 </div> |
3197 | 75 </div> |
76 <div id="changeset_content"> | |
77 <div class="container"> | |
78 <div class="left"> | |
79 <div class="author"> | |
80 <div class="gravatar"> | |
81 <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(c.changeset.author),20)}"/> | |
82 </div> | |
83 <span>${h.person(c.changeset.author)}</span><br/> | |
84 <span><a href="mailto:${h.email_or_none(c.changeset.author)}">${h.email_or_none(c.changeset.author)}</a></span><br/> | |
85 </div> | |
86 <div class="message">${h.urlify_commit(c.changeset.message, c.repo_name)}</div> | |
87 </div> | |
88 <div class="right"> | |
89 <div class="changes"> | |
2996
ebe3e388bbb3
new patch function, and urls schema.
Marcin Kuzminski <marcin@python-works.com>
parents:
2995
diff
changeset
|
90 % if (len(c.changeset.affected_files) <= c.affected_files_cut_off) or c.fulldiff: |
3197 | 91 <span class="removed" title="${_('removed')}">${len(c.changeset.removed)}</span> |
92 <span class="changed" title="${_('changed')}">${len(c.changeset.changed)}</span> | |
93 <span class="added" title="${_('added')}">${len(c.changeset.added)}</span> | |
94 % else: | |
1130
1cecc7db3106
fixed some limits in changesets and changelogs
Marcin Kuzminski <marcin@python-works.com>
parents:
1100
diff
changeset
|
95 <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
|
96 <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
|
97 <span class="added" title="${_('affected %s files') % len(c.changeset.affected_files)}">!</span> |
3197 | 98 % endif |
99 </div> | |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
100 |
3197 | 101 <span class="logtags"> |
1856
0855c64c571f
css: merge/branch/tag blurbs
Aras Pranckevicius <aras@unity3d.com>
parents:
1851
diff
changeset
|
102 %if len(c.changeset.parents)>1: |
0855c64c571f
css: merge/branch/tag blurbs
Aras Pranckevicius <aras@unity3d.com>
parents:
1851
diff
changeset
|
103 <span class="merge">${_('merge')}</span> |
0855c64c571f
css: merge/branch/tag blurbs
Aras Pranckevicius <aras@unity3d.com>
parents:
1851
diff
changeset
|
104 %endif |
3197 | 105 %if c.changeset.branch: |
2231
2cfaf199a5a7
Fixed empty git commit message issue
Marcin Kuzminski <marcin@python-works.com>
parents:
2187
diff
changeset
|
106 <span class="branchtag" title="${'%s %s' % (_('branch'),c.changeset.branch)}"> |
3197 | 107 ${h.link_to(c.changeset.branch,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))} |
2231
2cfaf199a5a7
Fixed empty git commit message issue
Marcin Kuzminski <marcin@python-works.com>
parents:
2187
diff
changeset
|
108 </span> |
2cfaf199a5a7
Fixed empty git commit message issue
Marcin Kuzminski <marcin@python-works.com>
parents:
2187
diff
changeset
|
109 %endif |
3197 | 110 %for tag in c.changeset.tags: |
111 <span class="tagtag" title="${'%s %s' % (_('tag'),tag)}"> | |
112 ${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</span> | |
113 %endfor | |
114 </span> | |
115 </div> | |
116 </div> | |
117 <span> | |
2995
32471bd1f4ee
Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents:
2725
diff
changeset
|
118 % if c.limited_diff: |
3014
02bbd574fa14
Changed affected to changed, sounds better, and added ungettext translations for this
Marcin Kuzminski <marcin@python-works.com>
parents:
2996
diff
changeset
|
119 ${ungettext('%s file changed','%s files changed',len(c.changeset.affected_files)) % (len(c.changeset.affected_files))}: |
2995
32471bd1f4ee
Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents:
2725
diff
changeset
|
120 % else: |
3197 | 121 ${ungettext('%s file changed with %s insertions and %s deletions','%s files changed with %s insertions and %s deletions', len(c.changeset.affected_files)) % (len(c.changeset.affected_files),c.lines_added,c.lines_deleted)}: |
122 %endif | |
2995
32471bd1f4ee
Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents:
2725
diff
changeset
|
123 </span> |
3197 | 124 <div class="cs_files"> |
2995
32471bd1f4ee
Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents:
2725
diff
changeset
|
125 %for FID, (cs1, cs2, change, path, diff, stats) in c.changes[c.changeset.raw_id].iteritems(): |
32471bd1f4ee
Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents:
2725
diff
changeset
|
126 <div class="cs_${change}"> |
32471bd1f4ee
Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents:
2725
diff
changeset
|
127 <div class="node"> |
32471bd1f4ee
Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents:
2725
diff
changeset
|
128 <a href="#${FID}">${h.safe_unicode(path)}</a> |
32471bd1f4ee
Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents:
2725
diff
changeset
|
129 </div> |
32471bd1f4ee
Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents:
2725
diff
changeset
|
130 <div class="changes">${h.fancy_file_stats(stats)}</div> |
32471bd1f4ee
Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents:
2725
diff
changeset
|
131 </div> |
32471bd1f4ee
Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents:
2725
diff
changeset
|
132 %endfor |
32471bd1f4ee
Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents:
2725
diff
changeset
|
133 % if c.limited_diff: |
3312
1af36014d96f
show full diff option should preserve current GET params
Marcin Kuzminski <marcin@python-works.com>
parents:
3266
diff
changeset
|
134 <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}" onclick="return confirm('${_("confirm to show potentially huge diff")}')">${_('Show full diff')}</a></h5> |
2995
32471bd1f4ee
Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents:
2725
diff
changeset
|
135 % endif |
3197 | 136 </div> |
137 </div> | |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
138 |
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
|
139 </div> |
2995
32471bd1f4ee
Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents:
2725
diff
changeset
|
140 |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
141 ## diff block |
1787
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1776
diff
changeset
|
142 <%namespace name="diff_block" file="/changeset/diff_block.html"/> |
2995
32471bd1f4ee
Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents:
2725
diff
changeset
|
143 ${diff_block.diff_block(c.changes[c.changeset.raw_id])} |
32471bd1f4ee
Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents:
2725
diff
changeset
|
144 |
32471bd1f4ee
Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents:
2725
diff
changeset
|
145 % if c.limited_diff: |
3312
1af36014d96f
show full diff option should preserve current GET params
Marcin Kuzminski <marcin@python-works.com>
parents:
3266
diff
changeset
|
146 <h4>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}" onclick="return confirm('${_("confirm to show potentially huge diff")}')">${_('Show full diff')}</a></h4> |
2995
32471bd1f4ee
Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents:
2725
diff
changeset
|
147 % endif |
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 ## template for inline comment form |
1670
d2de0c2f02cd
#77 code review
Marcin Kuzminski <marcin@python-works.com>
parents:
1472
diff
changeset
|
150 <%namespace name="comment" file="/changeset/changeset_file_comment.html"/> |
2489
a0adf8db1416
Enabled inline comments in pull-requests
Marcin Kuzminski <marcin@python-works.com>
parents:
2439
diff
changeset
|
151 ${comment.comment_inline_form()} |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
152 |
2608
58c529332e7e
Added option to close pull requests, in future that will be close & merge
Marcin Kuzminski <marcin@python-works.com>
parents:
2492
diff
changeset
|
153 ## render comments and inlines |
58c529332e7e
Added option to close pull requests, in future that will be close & merge
Marcin Kuzminski <marcin@python-works.com>
parents:
2492
diff
changeset
|
154 ${comment.generate_comments()} |
58c529332e7e
Added option to close pull requests, in future that will be close & merge
Marcin Kuzminski <marcin@python-works.com>
parents:
2492
diff
changeset
|
155 |
58c529332e7e
Added option to close pull requests, in future that will be close & merge
Marcin Kuzminski <marcin@python-works.com>
parents:
2492
diff
changeset
|
156 ## main comment form and it status |
2439
ad19dfcdb1cc
Refactoring of changeset_file_comments for more generic usage. In both It enables sharing code between changeset, and pull requests discussions
Marcin Kuzminski <marcin@python-works.com>
parents:
2430
diff
changeset
|
157 ${comment.comments(h.url('changeset_comment', repo_name=c.repo_name, revision=c.changeset.raw_id), |
ad19dfcdb1cc
Refactoring of changeset_file_comments for more generic usage. In both It enables sharing code between changeset, and pull requests discussions
Marcin Kuzminski <marcin@python-works.com>
parents:
2430
diff
changeset
|
158 h.changeset_status(c.rhodecode_db_repo, c.changeset.raw_id))} |
ad19dfcdb1cc
Refactoring of changeset_file_comments for more generic usage. In both It enables sharing code between changeset, and pull requests discussions
Marcin Kuzminski <marcin@python-works.com>
parents:
2430
diff
changeset
|
159 |
2489
a0adf8db1416
Enabled inline comments in pull-requests
Marcin Kuzminski <marcin@python-works.com>
parents:
2439
diff
changeset
|
160 ## FORM FOR MAKING JS ACTION AS CHANGESET COMMENTS |
1674
6f0143e5efe5
#71 code review
Marcin Kuzminski <marcin@python-works.com>
parents:
1670
diff
changeset
|
161 <script type="text/javascript"> |
1677
7276b170ce8b
#71 code-review
Marcin Kuzminski <marcin@python-works.com>
parents:
1676
diff
changeset
|
162 YUE.onDOMReady(function(){ |
1787
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1776
diff
changeset
|
163 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
|
164 var show = 'none'; |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1776
diff
changeset
|
165 var target = e.currentTarget; |
2723
04aa0ea1ddd0
fixed comment addition and deletion functionality on IE9
Dies Koper <diesk@fast.au.fujitsu.com>
parents:
2673
diff
changeset
|
166 if(target == null){ |
04aa0ea1ddd0
fixed comment addition and deletion functionality on IE9
Dies Koper <diesk@fast.au.fujitsu.com>
parents:
2673
diff
changeset
|
167 target = this; |
04aa0ea1ddd0
fixed comment addition and deletion functionality on IE9
Dies Koper <diesk@fast.au.fujitsu.com>
parents:
2673
diff
changeset
|
168 } |
1787
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1776
diff
changeset
|
169 if(target.checked){ |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1776
diff
changeset
|
170 var show = '' |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1776
diff
changeset
|
171 } |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1776
diff
changeset
|
172 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
|
173 var comments = YUQ('#{0} .inline-comments'.format(boxid)); |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
174 for(c in comments){ |
1787
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1776
diff
changeset
|
175 YUD.setStyle(comments[c],'display',show); |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1776
diff
changeset
|
176 } |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1776
diff
changeset
|
177 var btns = YUQ('#{0} .inline-comments-button'.format(boxid)); |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
178 for(c in btns){ |
1772
c83d3d42ab92
- diff.css merge to main style.css
Marcin Kuzminski <marcin@python-works.com>
parents:
1705
diff
changeset
|
179 YUD.setStyle(btns[c],'display',show); |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
180 } |
1787
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1776
diff
changeset
|
181 }) |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
182 |
1677
7276b170ce8b
#71 code-review
Marcin Kuzminski <marcin@python-works.com>
parents:
1676
diff
changeset
|
183 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
|
184 var tr = e.currentTarget; |
2723
04aa0ea1ddd0
fixed comment addition and deletion functionality on IE9
Dies Koper <diesk@fast.au.fujitsu.com>
parents:
2673
diff
changeset
|
185 if(tr == null){ |
04aa0ea1ddd0
fixed comment addition and deletion functionality on IE9
Dies Koper <diesk@fast.au.fujitsu.com>
parents:
2673
diff
changeset
|
186 tr = this; |
04aa0ea1ddd0
fixed comment addition and deletion functionality on IE9
Dies Koper <diesk@fast.au.fujitsu.com>
parents:
2673
diff
changeset
|
187 } |
1787
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1776
diff
changeset
|
188 injectInlineForm(tr); |
1682
1f2ba96de73e
#71 code review
Marcin Kuzminski <marcin@python-works.com>
parents:
1681
diff
changeset
|
189 }); |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
190 |
1682
1f2ba96de73e
#71 code review
Marcin Kuzminski <marcin@python-works.com>
parents:
1681
diff
changeset
|
191 // inject comments into they proper positions |
1f2ba96de73e
#71 code review
Marcin Kuzminski <marcin@python-works.com>
parents:
1681
diff
changeset
|
192 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
|
193 renderInlineComments(file_comments); |
1677
7276b170ce8b
#71 code-review
Marcin Kuzminski <marcin@python-works.com>
parents:
1676
diff
changeset
|
194 }) |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
195 |
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
196 </script> |
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
197 |
1787
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1776
diff
changeset
|
198 </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
|
199 </%def> |