Mercurial > kallithea
annotate rhodecode/templates/compare/compare_cs.html @ 3486:2053053e0882 beta
compare/pullrequest: introduce merge parameter
This is more correct and flexible than the old way of looking on same/different
repo.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Tue, 05 Mar 2013 11:55:01 +0100 |
parents | c9b85375776d |
children | 9f9e7c937eb0 |
rev | line source |
---|---|
2395
b262e349a7a5
created pull-request overview
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
1 ## Changesets table ! |
b262e349a7a5
created pull-request overview
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
2 <div class="container"> |
b262e349a7a5
created pull-request overview
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
3 %if not c.cs_ranges: |
3015
16af24982e30
Multiple changes for compare system
Marcin Kuzminski <marcin@python-works.com>
parents:
3011
diff
changeset
|
4 <span class="empty_data">${_('No changesets')}</span> |
2395
b262e349a7a5
created pull-request overview
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
5 %else: |
3486
2053053e0882
compare/pullrequest: introduce merge parameter
Mads Kiilerich <madski@unity3d.com>
parents:
3324
diff
changeset
|
6 <table class="compare_view_commits noborder"> |
2395
b262e349a7a5
created pull-request overview
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
7 %for cnt, cs in enumerate(c.cs_ranges): |
b262e349a7a5
created pull-request overview
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
8 <tr> |
2732
c25cc1c7c65f
again #531 forgot to replace other occurences of h.email call
Marcin Kuzminski <marcin@python-works.com>
parents:
2487
diff
changeset
|
9 <td><div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),14)}"/></div></td> |
2395
b262e349a7a5
created pull-request overview
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
10 <td> |
b262e349a7a5
created pull-request overview
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
11 %if cs.raw_id in c.statuses: |
b262e349a7a5
created pull-request overview
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
12 <div title="${c.statuses[cs.raw_id][1]}" class="changeset-status-ico"><img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses[cs.raw_id][0])}" /></div> |
b262e349a7a5
created pull-request overview
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
13 %endif |
2434
f29469677319
Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
2395
diff
changeset
|
14 </td> |
3324
c9b85375776d
compare: drop target_repo - it is always other_repo
Mads Kiilerich <madski@unity3d.com>
parents:
3015
diff
changeset
|
15 <td>${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.other_repo.repo_name,revision=cs.raw_id))} |
2434
f29469677319
Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
2395
diff
changeset
|
16 %if c.as_form: |
f29469677319
Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
2395
diff
changeset
|
17 ${h.hidden('revisions',cs.raw_id)} |
f29469677319
Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
2395
diff
changeset
|
18 %endif |
f29469677319
Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
2395
diff
changeset
|
19 </td> |
2395
b262e349a7a5
created pull-request overview
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
20 <td><div class="author">${h.person(cs.author)}</div></td> |
3011
25d77aef2729
Optimized look of compare view of changesets.
Marcin Kuzminski <marcin@python-works.com>
parents:
2732
diff
changeset
|
21 <td><span class="tooltip" title="${h.tooltip(h.age(cs.date))}">${cs.date}</span></td> |
25d77aef2729
Optimized look of compare view of changesets.
Marcin Kuzminski <marcin@python-works.com>
parents:
2732
diff
changeset
|
22 <td><div class="message tooltip" title="${h.tooltip(cs.message)}" style="white-space:normal">${h.urlify_commit(h.shorter(cs.message, 60),c.repo_name)}</div></td> |
2395
b262e349a7a5
created pull-request overview
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
23 </tr> |
b262e349a7a5
created pull-request overview
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
24 %endfor |
3486
2053053e0882
compare/pullrequest: introduce merge parameter
Mads Kiilerich <madski@unity3d.com>
parents:
3324
diff
changeset
|
25 </table> |
2053053e0882
compare/pullrequest: introduce merge parameter
Mads Kiilerich <madski@unity3d.com>
parents:
3324
diff
changeset
|
26 %if c.ancestor: |
2053053e0882
compare/pullrequest: introduce merge parameter
Mads Kiilerich <madski@unity3d.com>
parents:
3324
diff
changeset
|
27 <span class="ancestor">${_('Ancestor')}: |
2053053e0882
compare/pullrequest: introduce merge parameter
Mads Kiilerich <madski@unity3d.com>
parents:
3324
diff
changeset
|
28 ${h.link_to(c.ancestor,h.url('changeset_home',repo_name=c.repo_name,revision=c.ancestor))} |
2053053e0882
compare/pullrequest: introduce merge parameter
Mads Kiilerich <madski@unity3d.com>
parents:
3324
diff
changeset
|
29 </span> |
2053053e0882
compare/pullrequest: introduce merge parameter
Mads Kiilerich <madski@unity3d.com>
parents:
3324
diff
changeset
|
30 %endif |
2053053e0882
compare/pullrequest: introduce merge parameter
Mads Kiilerich <madski@unity3d.com>
parents:
3324
diff
changeset
|
31 %if c.as_form: |
2053053e0882
compare/pullrequest: introduce merge parameter
Mads Kiilerich <madski@unity3d.com>
parents:
3324
diff
changeset
|
32 ${h.hidden('ancestor_rev',c.ancestor)} |
2053053e0882
compare/pullrequest: introduce merge parameter
Mads Kiilerich <madski@unity3d.com>
parents:
3324
diff
changeset
|
33 ${h.hidden('merge_rev',c.cs_ranges[-1].raw_id)} |
2053053e0882
compare/pullrequest: introduce merge parameter
Mads Kiilerich <madski@unity3d.com>
parents:
3324
diff
changeset
|
34 %endif |
2395
b262e349a7a5
created pull-request overview
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
35 %endif |
2434
f29469677319
Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
2395
diff
changeset
|
36 </div> |