Mercurial > kallithea

annotate rhodecode/templates/compare/compare_cs.html @ 4148:3c713e810e61 rhodecode-2.2.5-gpl

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
old style: fix width of new changelog "expand" column
author Mads Kiilerich <madski@unity3d.com>
date Wed, 02 Jul 2014 19:03:23 -0400
parents ffd45b185016
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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:
4116
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 4056
diff changeset
6
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 4056
diff changeset
7 %if c.ancestor:
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 4056
diff changeset
8 <div class="ancestor">${_('Ancestor')}:
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 4056
diff changeset
9 ${h.link_to(h.short_id(c.ancestor),h.url('changeset_home',repo_name=c.repo_name,revision=c.ancestor))}
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 4056
diff changeset
10 </div>
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 4056
diff changeset
11 %endif
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 4056
diff changeset
12
3486
2053053e0882 compare/pullrequest: introduce merge parameter
Mads Kiilerich <madski@unity3d.com>
parents: 3324
diff changeset
13 <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
14 %for cs in reversed(c.cs_ranges):
4116
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 4056
diff changeset
15 <tr id="row-${cs.raw_id}">
2395
b262e349a7a5 created pull-request overview
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
16 <td>
b262e349a7a5 created pull-request overview
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
17 %if cs.raw_id in c.statuses:
4116
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 4056
diff changeset
18 <div title="${_('Changeset status: %s') % c.statuses[cs.raw_id][1]}" class="changeset-status-ico">
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 4056
diff changeset
19 <img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses[cs.raw_id][0])}" />
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 4056
diff changeset
20 </div>
2395
b262e349a7a5 created pull-request overview
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
21 %endif
2434
f29469677319 Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2395
diff changeset
22 </td>
4116
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 4056
diff changeset
23 <td style="min-width: 120px"><span class="tooltip" title="${h.tooltip(h.age(cs.date))}">${cs.date}</span></td>
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 4056
diff changeset
24 <td><div class="gravatar" commit_id="${cs.raw_id}"><img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),14)}"/></div></td>
3610
5f1f77948355 compare: reorder columns in changeset list - this feels more natural to me
Mads Kiilerich <madski@unity3d.com>
parents: 3605
diff changeset
25 <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
26 <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
27 %if c.as_form:
f29469677319 Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2395
diff changeset
28 ${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
29 %endif
f29469677319 Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2395
diff changeset
30 </td>
3614
e8db9fe4cca3 fix branch UI issue for git repos
Marcin Kuzminski <marcin@python-works.com>
parents: 3610
diff changeset
31 <td>
e8db9fe4cca3 fix branch UI issue for git repos
Marcin Kuzminski <marcin@python-works.com>
parents: 3610
diff changeset
32 %if cs.branch:
e8db9fe4cca3 fix branch UI issue for git repos
Marcin Kuzminski <marcin@python-works.com>
parents: 3610
diff changeset
33 <span class="branchtag">${cs.branch}</span>
e8db9fe4cca3 fix branch UI issue for git repos
Marcin Kuzminski <marcin@python-works.com>
parents: 3610
diff changeset
34 %endif
e8db9fe4cca3 fix branch UI issue for git repos
Marcin Kuzminski <marcin@python-works.com>
parents: 3610
diff changeset
35 </td>
4116
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 4056
diff changeset
36 <td class="expand_commit" commit_id="${cs.raw_id}" title="${_('Expand commit message')}">
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 4056
diff changeset
37 <i class="icon-resize-vertical" style="color:#DDD"></i>
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 4056
diff changeset
38 </td>
4148
3c713e810e61 old style: fix width of new changelog "expand" column
Mads Kiilerich <madski@unity3d.com>
parents: 4116
diff changeset
39 <td><div id="C-${cs.raw_id}" class="message" style="white-space:normal; height:1.1em; padding:0">${h.urlify_commit(cs.message, c.repo_name)}</div></td>
2395
b262e349a7a5 created pull-request overview
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
40 </tr>
b262e349a7a5 created pull-request overview
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
41 %endfor
3486
2053053e0882 compare/pullrequest: introduce merge parameter
Mads Kiilerich <madski@unity3d.com>
parents: 3324
diff changeset
42 </table>
2053053e0882 compare/pullrequest: introduce merge parameter
Mads Kiilerich <madski@unity3d.com>
parents: 3324
diff changeset
43 %if c.as_form:
2053053e0882 compare/pullrequest: introduce merge parameter
Mads Kiilerich <madski@unity3d.com>
parents: 3324
diff changeset
44 ${h.hidden('ancestor_rev',c.ancestor)}
2053053e0882 compare/pullrequest: introduce merge parameter
Mads Kiilerich <madski@unity3d.com>
parents: 3324
diff changeset
45 ${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
46 %endif
2395
b262e349a7a5 created pull-request overview
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
47 %endif
2434
f29469677319 Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2395
diff changeset
48 </div>
4116
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 4056
diff changeset
49
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 4056
diff changeset
50 <script>
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 4056
diff changeset
51 $('.expand_commit').on('click',function(e){
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 4056
diff changeset
52 $(this).children('i').hide();
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 4056
diff changeset
53 var cid = $(this).attr('commit_id');
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 4056
diff changeset
54 $('#C-'+cid).css({'height': 'auto','width': 'auto', 'white-space': 'pre'})
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 4056
diff changeset
55 });
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 4056
diff changeset
56 $('.gravatar').on('click',function(e){
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 4056
diff changeset
57 var cid = $(this).attr('commit_id');
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 4056
diff changeset
58 $('#row-'+cid).toggleClass('hl', !$('#row-'+cid).hasClass('hl'));
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 4056
diff changeset
59 });
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 4056
diff changeset
60 </script>