Mercurial > kallithea
annotate rhodecode/templates/compare/compare_cs.html @ 3983:2e0ccba6dd6b
css: show status labels clearly - not pseudo-invisible grey
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Wed, 12 Jun 2013 01:36:35 +0200 |
parents | e8db9fe4cca3 |
children | 458fd829aa20 |
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"> |
3518
41b4edf77b5b
pullrequests: show changesets with highest revision on top, like in most other lists
Mads Kiilerich <madski@unity3d.com>
parents:
3506
diff
changeset
|
7 %for cs in reversed(c.cs_ranges): |
2395
b262e349a7a5
created pull-request overview
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
8 <tr> |
b262e349a7a5
created pull-request overview
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
9 <td> |
b262e349a7a5
created pull-request overview
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
10 %if cs.raw_id in c.statuses: |
b262e349a7a5
created pull-request overview
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
11 <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
|
12 %endif |
2434
f29469677319
Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
2395
diff
changeset
|
13 </td> |
3610
5f1f77948355
compare: reorder columns in changeset list - this feels more natural to me
Mads Kiilerich <madski@unity3d.com>
parents:
3605
diff
changeset
|
14 <td><span class="tooltip" title="${h.tooltip(h.age(cs.date))}">${cs.date}</span></td> |
5f1f77948355
compare: reorder columns in changeset list - this feels more natural to me
Mads Kiilerich <madski@unity3d.com>
parents:
3605
diff
changeset
|
15 <td><div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),14)}"/></div></td> |
5f1f77948355
compare: reorder columns in changeset list - this feels more natural to me
Mads Kiilerich <madski@unity3d.com>
parents:
3605
diff
changeset
|
16 <td><div class="author">${h.person(cs.author)}</div></td> |
3324
c9b85375776d
compare: drop target_repo - it is always other_repo
Mads Kiilerich <madski@unity3d.com>
parents:
3015
diff
changeset
|
17 <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
|
18 %if c.as_form: |
f29469677319
Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
2395
diff
changeset
|
19 ${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
|
20 %endif |
f29469677319
Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
2395
diff
changeset
|
21 </td> |
3614
e8db9fe4cca3
fix branch UI issue for git repos
Marcin Kuzminski <marcin@python-works.com>
parents:
3610
diff
changeset
|
22 <td> |
e8db9fe4cca3
fix branch UI issue for git repos
Marcin Kuzminski <marcin@python-works.com>
parents:
3610
diff
changeset
|
23 %if cs.branch: |
e8db9fe4cca3
fix branch UI issue for git repos
Marcin Kuzminski <marcin@python-works.com>
parents:
3610
diff
changeset
|
24 <span class="branchtag">${cs.branch}</span> |
e8db9fe4cca3
fix branch UI issue for git repos
Marcin Kuzminski <marcin@python-works.com>
parents:
3610
diff
changeset
|
25 %endif |
e8db9fe4cca3
fix branch UI issue for git repos
Marcin Kuzminski <marcin@python-works.com>
parents:
3610
diff
changeset
|
26 </td> |
3011
25d77aef2729
Optimized look of compare view of changesets.
Marcin Kuzminski <marcin@python-works.com>
parents:
2732
diff
changeset
|
27 <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
|
28 </tr> |
b262e349a7a5
created pull-request overview
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
29 %endfor |
3486
2053053e0882
compare/pullrequest: introduce merge parameter
Mads Kiilerich <madski@unity3d.com>
parents:
3324
diff
changeset
|
30 </table> |
2053053e0882
compare/pullrequest: introduce merge parameter
Mads Kiilerich <madski@unity3d.com>
parents:
3324
diff
changeset
|
31 %if c.ancestor: |
2053053e0882
compare/pullrequest: introduce merge parameter
Mads Kiilerich <madski@unity3d.com>
parents:
3324
diff
changeset
|
32 <span class="ancestor">${_('Ancestor')}: |
3506
9f9e7c937eb0
use short id in ancestor
Marcin Kuzminski <marcin@python-works.com>
parents:
3486
diff
changeset
|
33 ${h.link_to(h.short_id(c.ancestor),h.url('changeset_home',repo_name=c.repo_name,revision=c.ancestor))} |
3486
2053053e0882
compare/pullrequest: introduce merge parameter
Mads Kiilerich <madski@unity3d.com>
parents:
3324
diff
changeset
|
34 </span> |
2053053e0882
compare/pullrequest: introduce merge parameter
Mads Kiilerich <madski@unity3d.com>
parents:
3324
diff
changeset
|
35 %endif |
2053053e0882
compare/pullrequest: introduce merge parameter
Mads Kiilerich <madski@unity3d.com>
parents:
3324
diff
changeset
|
36 %if c.as_form: |
2053053e0882
compare/pullrequest: introduce merge parameter
Mads Kiilerich <madski@unity3d.com>
parents:
3324
diff
changeset
|
37 ${h.hidden('ancestor_rev',c.ancestor)} |
2053053e0882
compare/pullrequest: introduce merge parameter
Mads Kiilerich <madski@unity3d.com>
parents:
3324
diff
changeset
|
38 ${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
|
39 %endif |
2395
b262e349a7a5
created pull-request overview
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
40 %endif |
2434
f29469677319
Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
2395
diff
changeset
|
41 </div> |