Mercurial > kallithea
annotate kallithea/templates/compare/compare_cs.html @ 6281:d4b39ef6cadf
style: use span for tag/bookmark tags ... and make it inline-block to avoid wrapping
Based on work by Dominik Ruf.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Mon, 24 Oct 2016 21:45:35 +0200 |
parents | 9a523af15c9f |
children | 48a96c4059df |
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')}: |
6123
12919ffab34c
pullrequests: use monospace for hashes - columns of hashes look messy when they have different lenght
Mads Kiilerich <madski@unity3d.com>
parents:
5896
diff
changeset
|
9 ${h.link_to(h.short_id(c.ancestor),h.url('changeset_home',repo_name=c.repo_name,revision=c.ancestor), class_="changeset_hash")} |
4116
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 |
4352
c733124b6262
pull requests: show graph when displaying PR
Mads Kiilerich <madski@unity3d.com>
parents:
4351
diff
changeset
|
13 <div id="graph_nodes"> |
5385
b8734b428786
graphs: set initial canvas size to 0
Mads Kiilerich <madski@unity3d.com>
parents:
5284
diff
changeset
|
14 <canvas id="graph_canvas" style="width:0"></canvas> |
4352
c733124b6262
pull requests: show graph when displaying PR
Mads Kiilerich <madski@unity3d.com>
parents:
4351
diff
changeset
|
15 </div> |
c733124b6262
pull requests: show graph when displaying PR
Mads Kiilerich <madski@unity3d.com>
parents:
4351
diff
changeset
|
16 |
c733124b6262
pull requests: show graph when displaying PR
Mads Kiilerich <madski@unity3d.com>
parents:
4351
diff
changeset
|
17 <div id="graph_content_pr" style="margin-left: 100px;"> |
c733124b6262
pull requests: show graph when displaying PR
Mads Kiilerich <madski@unity3d.com>
parents:
4351
diff
changeset
|
18 |
3486
2053053e0882
compare/pullrequest: introduce merge parameter
Mads Kiilerich <madski@unity3d.com>
parents:
3324
diff
changeset
|
19 <table class="compare_view_commits noborder"> |
4353
67d5afe2fa1a
pull requests: show graph when creating PR
Mads Kiilerich <madski@unity3d.com>
parents:
4352
diff
changeset
|
20 %for cnt, cs in enumerate(reversed(c.cs_ranges)): |
6197
9a523af15c9f
changelog: show merges as semi opaque in more places
Mads Kiilerich <madski@unity3d.com>
parents:
6180
diff
changeset
|
21 <tr id="chg_${cnt+1}" class="${'mergerow' if len(cs.parents) > 1 else ''}"> |
4262
f9c473b0d385
old style: adjust column widths
Mads Kiilerich <madski@unity3d.com>
parents:
4187
diff
changeset
|
22 <td style="width:50px"> |
2395
b262e349a7a5
created pull-request overview
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
23 %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
|
24 <div title="${_('Changeset status: %s') % c.statuses[cs.raw_id][1]}" class="changeset-status-ico"> |
4625
40f65bfc04d0
flag_status: replace with icon-circle
Sean Farley <sean.michael.farley@gmail.com>
parents:
4623
diff
changeset
|
25 <i class="icon-circle changeset-status-${c.statuses[cs.raw_id][0]}"></i> |
4116
ffd45b185016
Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
4056
diff
changeset
|
26 </div> |
2395
b262e349a7a5
created pull-request overview
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
27 %endif |
4367
7879d8d88672
pull requests: show changeset comment and status flags in the changelog for PRs
Mads Kiilerich <madski@unity3d.com>
parents:
4354
diff
changeset
|
28 %if c.cs_comments.get(cs.raw_id): |
7879d8d88672
pull requests: show changeset comment and status flags in the changelog for PRs
Mads Kiilerich <madski@unity3d.com>
parents:
4354
diff
changeset
|
29 <div class="comments-container"> |
7879d8d88672
pull requests: show changeset comment and status flags in the changelog for PRs
Mads Kiilerich <madski@unity3d.com>
parents:
4354
diff
changeset
|
30 <div class="comments-cnt" title="${_('Changeset has comments')}"> |
5156
b3299a079fa6
comments: introduce .url method for linking to originating PR or changeset page
Mads Kiilerich <madski@unity3d.com>
parents:
4855
diff
changeset
|
31 <a href="${c.cs_comments[cs.raw_id][0].url()}"> |
4367
7879d8d88672
pull requests: show changeset comment and status flags in the changelog for PRs
Mads Kiilerich <madski@unity3d.com>
parents:
4354
diff
changeset
|
32 ${len(c.cs_comments[cs.raw_id])} |
4855
02fadbd74483
font: fix missing icon-comment-color and icon-comment-alt
Sean Farley <sean.michael.farley@gmail.com>
parents:
4795
diff
changeset
|
33 <i class="icon-comment"></i> |
4367
7879d8d88672
pull requests: show changeset comment and status flags in the changelog for PRs
Mads Kiilerich <madski@unity3d.com>
parents:
4354
diff
changeset
|
34 </a> |
7879d8d88672
pull requests: show changeset comment and status flags in the changelog for PRs
Mads Kiilerich <madski@unity3d.com>
parents:
4354
diff
changeset
|
35 </div> |
7879d8d88672
pull requests: show changeset comment and status flags in the changelog for PRs
Mads Kiilerich <madski@unity3d.com>
parents:
4354
diff
changeset
|
36 </div> |
7879d8d88672
pull requests: show changeset comment and status flags in the changelog for PRs
Mads Kiilerich <madski@unity3d.com>
parents:
4354
diff
changeset
|
37 %endif |
2434
f29469677319
Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
2395
diff
changeset
|
38 </td> |
5165
6ec5fd198084
pullrequest/compare: add logical changeset index to clarify the order
Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
parents:
5156
diff
changeset
|
39 <td class="changeset-logical-index"> |
6ec5fd198084
pullrequest/compare: add logical changeset index to clarify the order
Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
parents:
5156
diff
changeset
|
40 <% |
6ec5fd198084
pullrequest/compare: add logical changeset index to clarify the order
Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
parents:
5156
diff
changeset
|
41 num_cs = len(c.cs_ranges) |
6ec5fd198084
pullrequest/compare: add logical changeset index to clarify the order
Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
parents:
5156
diff
changeset
|
42 index = num_cs - cnt |
6ec5fd198084
pullrequest/compare: add logical changeset index to clarify the order
Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
parents:
5156
diff
changeset
|
43 if index == 1: |
6ec5fd198084
pullrequest/compare: add logical changeset index to clarify the order
Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
parents:
5156
diff
changeset
|
44 title = _('First (oldest) changeset in this list') |
6ec5fd198084
pullrequest/compare: add logical changeset index to clarify the order
Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
parents:
5156
diff
changeset
|
45 elif index == num_cs: |
6ec5fd198084
pullrequest/compare: add logical changeset index to clarify the order
Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
parents:
5156
diff
changeset
|
46 title = _('Last (most recent) changeset in this list') |
6ec5fd198084
pullrequest/compare: add logical changeset index to clarify the order
Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
parents:
5156
diff
changeset
|
47 else: |
6ec5fd198084
pullrequest/compare: add logical changeset index to clarify the order
Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
parents:
5156
diff
changeset
|
48 title = _('Position in this list of changesets') |
6ec5fd198084
pullrequest/compare: add logical changeset index to clarify the order
Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
parents:
5156
diff
changeset
|
49 %> |
6ec5fd198084
pullrequest/compare: add logical changeset index to clarify the order
Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
parents:
5156
diff
changeset
|
50 <span class="tooltip" title="${title}"> |
6ec5fd198084
pullrequest/compare: add logical changeset index to clarify the order
Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
parents:
5156
diff
changeset
|
51 ${index} |
6ec5fd198084
pullrequest/compare: add logical changeset index to clarify the order
Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
parents:
5156
diff
changeset
|
52 </span> |
6ec5fd198084
pullrequest/compare: add logical changeset index to clarify the order
Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
parents:
5156
diff
changeset
|
53 </td> |
5284
5d161c096260
helpers: drop h.tooltip
Mads Kiilerich <madski@unity3d.com>
parents:
5165
diff
changeset
|
54 <td style="width: 140px"><span class="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td> |
5896
b9688c512c63
helpers: more efficient disabling of gravatars - don't leave spacing behind
Mads Kiilerich <madski@unity3d.com>
parents:
5895
diff
changeset
|
55 %if c.visual.use_gravatar: |
5895
f287754980cc
templates: use the new gravatar_div
Mads Kiilerich <madski@unity3d.com>
parents:
5683
diff
changeset
|
56 <td>${h.gravatar_div(h.email_or_none(cs.author), size=14, div_commit_id="${cs.raw_id}")}</td> |
5896
b9688c512c63
helpers: more efficient disabling of gravatars - don't leave spacing behind
Mads Kiilerich <madski@unity3d.com>
parents:
5895
diff
changeset
|
57 %endif |
3610
5f1f77948355
compare: reorder columns in changeset list - this feels more natural to me
Mads Kiilerich <madski@unity3d.com>
parents:
3605
diff
changeset
|
58 <td><div class="author">${h.person(cs.author)}</div></td> |
6123
12919ffab34c
pullrequests: use monospace for hashes - columns of hashes look messy when they have different lenght
Mads Kiilerich <madski@unity3d.com>
parents:
5896
diff
changeset
|
59 <td>${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id), class_='changeset_hash')}</td> |
3614
e8db9fe4cca3
fix branch UI issue for git repos
Marcin Kuzminski <marcin@python-works.com>
parents:
3610
diff
changeset
|
60 <td> |
e8db9fe4cca3
fix branch UI issue for git repos
Marcin Kuzminski <marcin@python-works.com>
parents:
3610
diff
changeset
|
61 %if cs.branch: |
4368
3136811db1af
compare: introduce .cs_repo as the repo for .cs_changes - sometimes it is org, sometimes other
Mads Kiilerich <madski@unity3d.com>
parents:
4367
diff
changeset
|
62 <span class="branchtag">${h.link_to(cs.branch,h.url('changelog_home',repo_name=c.cs_repo.repo_name,branch=cs.branch))}</span> |
3614
e8db9fe4cca3
fix branch UI issue for git repos
Marcin Kuzminski <marcin@python-works.com>
parents:
3610
diff
changeset
|
63 %endif |
e8db9fe4cca3
fix branch UI issue for git repos
Marcin Kuzminski <marcin@python-works.com>
parents:
3610
diff
changeset
|
64 </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
|
65 <td class="expand_commit" commit_id="${cs.raw_id}" title="${_('Expand commit message')}"> |
4623
27c7922c745d
text_align_left.png: replace icon-resize-vertical with icon-align-left
Sean Farley <sean.michael.farley@gmail.com>
parents:
4516
diff
changeset
|
66 <i class="icon-align-left" style="color:#999"></i> |
4116
ffd45b185016
Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
4056
diff
changeset
|
67 </td> |
5683
5fe9bb7acee6
pullrequests: show tags in lists of included and available changesets
Mads Kiilerich <madski@unity3d.com>
parents:
5385
diff
changeset
|
68 <td> |
5fe9bb7acee6
pullrequests: show tags in lists of included and available changesets
Mads Kiilerich <madski@unity3d.com>
parents:
5385
diff
changeset
|
69 <div style="float: right; margin-top: -4px;"> |
5fe9bb7acee6
pullrequests: show tags in lists of included and available changesets
Mads Kiilerich <madski@unity3d.com>
parents:
5385
diff
changeset
|
70 %for tag in cs.tags: |
6281
d4b39ef6cadf
style: use span for tag/bookmark tags ... and make it inline-block to avoid wrapping
Mads Kiilerich <madski@unity3d.com>
parents:
6197
diff
changeset
|
71 <span class="tagtag" title="${_('Tag %s') % tag}"> |
5683
5fe9bb7acee6
pullrequests: show tags in lists of included and available changesets
Mads Kiilerich <madski@unity3d.com>
parents:
5385
diff
changeset
|
72 ${h.link_to(tag,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))} |
6281
d4b39ef6cadf
style: use span for tag/bookmark tags ... and make it inline-block to avoid wrapping
Mads Kiilerich <madski@unity3d.com>
parents:
6197
diff
changeset
|
73 </span> |
5683
5fe9bb7acee6
pullrequests: show tags in lists of included and available changesets
Mads Kiilerich <madski@unity3d.com>
parents:
5385
diff
changeset
|
74 %endfor |
5fe9bb7acee6
pullrequests: show tags in lists of included and available changesets
Mads Kiilerich <madski@unity3d.com>
parents:
5385
diff
changeset
|
75 </div> |
6180
c3892e3a6ba3
helpers: merge urlify_commit into urlify_text
Mads Kiilerich <madski@unity3d.com>
parents:
6123
diff
changeset
|
76 <div id="C-${cs.raw_id}" class="message">${h.urlify_text(cs.message, c.repo_name)}</div> |
5683
5fe9bb7acee6
pullrequests: show tags in lists of included and available changesets
Mads Kiilerich <madski@unity3d.com>
parents:
5385
diff
changeset
|
77 </td> |
2395
b262e349a7a5
created pull-request overview
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
78 </tr> |
b262e349a7a5
created pull-request overview
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
79 %endfor |
3486
2053053e0882
compare/pullrequest: introduce merge parameter
Mads Kiilerich <madski@unity3d.com>
parents:
3324
diff
changeset
|
80 </table> |
4352
c733124b6262
pull requests: show graph when displaying PR
Mads Kiilerich <madski@unity3d.com>
parents:
4351
diff
changeset
|
81 |
c733124b6262
pull requests: show graph when displaying PR
Mads Kiilerich <madski@unity3d.com>
parents:
4351
diff
changeset
|
82 </div> |
c733124b6262
pull requests: show graph when displaying PR
Mads Kiilerich <madski@unity3d.com>
parents:
4351
diff
changeset
|
83 |
4298
33a58b74bbc3
pull requests: include 'detailed view' and ancestor information in ajax chunk, open diff in another window
Mads Kiilerich <madski@unity3d.com>
parents:
4297
diff
changeset
|
84 %if c.as_form: |
33a58b74bbc3
pull requests: include 'detailed view' and ancestor information in ajax chunk, open diff in another window
Mads Kiilerich <madski@unity3d.com>
parents:
4297
diff
changeset
|
85 <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px"> |
4460
6cb077e99873
diff: rename template values for org and other for compare and PR
Mads Kiilerich <madski@unity3d.com>
parents:
4368
diff
changeset
|
86 ## links should perhaps use ('rev', c.a_rev) instead ... |
4298
33a58b74bbc3
pull requests: include 'detailed view' and ancestor information in ajax chunk, open diff in another window
Mads Kiilerich <madski@unity3d.com>
parents:
4297
diff
changeset
|
87 ${h.link_to(_('Show merge diff'), |
33a58b74bbc3
pull requests: include 'detailed view' and ancestor information in ajax chunk, open diff in another window
Mads Kiilerich <madski@unity3d.com>
parents:
4297
diff
changeset
|
88 h.url('compare_url', |
4460
6cb077e99873
diff: rename template values for org and other for compare and PR
Mads Kiilerich <madski@unity3d.com>
parents:
4368
diff
changeset
|
89 repo_name=c.a_repo.repo_name, |
6cb077e99873
diff: rename template values for org and other for compare and PR
Mads Kiilerich <madski@unity3d.com>
parents:
4368
diff
changeset
|
90 org_ref_type=c.a_ref_type, org_ref_name=c.a_ref_name, |
6cb077e99873
diff: rename template values for org and other for compare and PR
Mads Kiilerich <madski@unity3d.com>
parents:
4368
diff
changeset
|
91 other_repo=c.cs_repo.repo_name, |
6cb077e99873
diff: rename template values for org and other for compare and PR
Mads Kiilerich <madski@unity3d.com>
parents:
4368
diff
changeset
|
92 other_ref_type=c.cs_ref_type, other_ref_name=c.cs_ref_name, |
4516
b3f12c354e87
javascript: remove nice trailing comma to please IE8 (Issue #39)
Mads Kiilerich <madski@unity3d.com>
parents:
4461
diff
changeset
|
93 merge='1') |
4298
33a58b74bbc3
pull requests: include 'detailed view' and ancestor information in ajax chunk, open diff in another window
Mads Kiilerich <madski@unity3d.com>
parents:
4297
diff
changeset
|
94 )} |
33a58b74bbc3
pull requests: include 'detailed view' and ancestor information in ajax chunk, open diff in another window
Mads Kiilerich <madski@unity3d.com>
parents:
4297
diff
changeset
|
95 </div> |
33a58b74bbc3
pull requests: include 'detailed view' and ancestor information in ajax chunk, open diff in another window
Mads Kiilerich <madski@unity3d.com>
parents:
4297
diff
changeset
|
96 <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px"> |
33a58b74bbc3
pull requests: include 'detailed view' and ancestor information in ajax chunk, open diff in another window
Mads Kiilerich <madski@unity3d.com>
parents:
4297
diff
changeset
|
97 ${_('Common ancestor')}: |
33a58b74bbc3
pull requests: include 'detailed view' and ancestor information in ajax chunk, open diff in another window
Mads Kiilerich <madski@unity3d.com>
parents:
4297
diff
changeset
|
98 %if c.ancestor: |
6123
12919ffab34c
pullrequests: use monospace for hashes - columns of hashes look messy when they have different lenght
Mads Kiilerich <madski@unity3d.com>
parents:
5896
diff
changeset
|
99 ${h.link_to(h.short_id(c.ancestor),h.url('changeset_home',repo_name=c.repo_name,revision=c.ancestor), class_="changeset_hash")} |
4298
33a58b74bbc3
pull requests: include 'detailed view' and ancestor information in ajax chunk, open diff in another window
Mads Kiilerich <madski@unity3d.com>
parents:
4297
diff
changeset
|
100 %else: |
33a58b74bbc3
pull requests: include 'detailed view' and ancestor information in ajax chunk, open diff in another window
Mads Kiilerich <madski@unity3d.com>
parents:
4297
diff
changeset
|
101 ${_('No common ancestor found - repositories are unrelated')} |
33a58b74bbc3
pull requests: include 'detailed view' and ancestor information in ajax chunk, open diff in another window
Mads Kiilerich <madski@unity3d.com>
parents:
4297
diff
changeset
|
102 %endif |
4296
fa4ef7f0f440
compare: calculate changesets and calculate and show ancestor also for non-merge diffs
Mads Kiilerich <madski@unity3d.com>
parents:
4262
diff
changeset
|
103 </div> |
3486
2053053e0882
compare/pullrequest: introduce merge parameter
Mads Kiilerich <madski@unity3d.com>
parents:
3324
diff
changeset
|
104 %endif |
4297
7a5977429125
compare: show how many changesets the compared repo is behind
Mads Kiilerich <madski@unity3d.com>
parents:
4296
diff
changeset
|
105 %if c.cs_ranges_org is not None: |
7a5977429125
compare: show how many changesets the compared repo is behind
Mads Kiilerich <madski@unity3d.com>
parents:
4296
diff
changeset
|
106 ## TODO: list actual changesets? |
7a5977429125
compare: show how many changesets the compared repo is behind
Mads Kiilerich <madski@unity3d.com>
parents:
4296
diff
changeset
|
107 <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px"> |
4460
6cb077e99873
diff: rename template values for org and other for compare and PR
Mads Kiilerich <madski@unity3d.com>
parents:
4368
diff
changeset
|
108 ${h.link_to_ref(c.cs_repo.repo_name, c.cs_ref_type, c.cs_ref_name, c.cs_rev)} |
4297
7a5977429125
compare: show how many changesets the compared repo is behind
Mads Kiilerich <madski@unity3d.com>
parents:
4296
diff
changeset
|
109 ${_('is')} |
7a5977429125
compare: show how many changesets the compared repo is behind
Mads Kiilerich <madski@unity3d.com>
parents:
4296
diff
changeset
|
110 <a href="${c.swap_url}">${_('%s changesets') % (len(c.cs_ranges_org))}</a> |
7a5977429125
compare: show how many changesets the compared repo is behind
Mads Kiilerich <madski@unity3d.com>
parents:
4296
diff
changeset
|
111 ${_('behind')} |
4461
d6e96730edfb
diff: consistently use a=base=ancestor and b=changes in compare and PR
Mads Kiilerich <madski@unity3d.com>
parents:
4460
diff
changeset
|
112 ${h.link_to_ref(c.a_repo.repo_name, c.a_ref_type, c.a_ref_name)} |
4297
7a5977429125
compare: show how many changesets the compared repo is behind
Mads Kiilerich <madski@unity3d.com>
parents:
4296
diff
changeset
|
113 </div> |
7a5977429125
compare: show how many changesets the compared repo is behind
Mads Kiilerich <madski@unity3d.com>
parents:
4296
diff
changeset
|
114 %endif |
2395
b262e349a7a5
created pull-request overview
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
115 %endif |
2434
f29469677319
Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
2395
diff
changeset
|
116 </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
|
117 |
4353
67d5afe2fa1a
pull requests: show graph when creating PR
Mads Kiilerich <madski@unity3d.com>
parents:
4352
diff
changeset
|
118 %if c.as_form: |
67d5afe2fa1a
pull requests: show graph when creating PR
Mads Kiilerich <madski@unity3d.com>
parents:
4352
diff
changeset
|
119 <div id="jsdata" style="display:none">${c.jsdata|n}</div> |
67d5afe2fa1a
pull requests: show graph when creating PR
Mads Kiilerich <madski@unity3d.com>
parents:
4352
diff
changeset
|
120 %else: |
4778
dba66b0768f4
graph: don't hardcode chg_ prefix ... and just assume canvas and table are aligned
Mads Kiilerich <madski@unity3d.com>
parents:
4625
diff
changeset
|
121 <script type="text/javascript" src="${h.url('/js/graph.js', ver=c.kallithea_version)}"></script> |
4352
c733124b6262
pull requests: show graph when displaying PR
Mads Kiilerich <madski@unity3d.com>
parents:
4351
diff
changeset
|
122 %endif |
c733124b6262
pull requests: show graph when displaying PR
Mads Kiilerich <madski@unity3d.com>
parents:
4351
diff
changeset
|
123 |
c733124b6262
pull requests: show graph when displaying PR
Mads Kiilerich <madski@unity3d.com>
parents:
4351
diff
changeset
|
124 <script type="text/javascript"> |
c733124b6262
pull requests: show graph when displaying PR
Mads Kiilerich <madski@unity3d.com>
parents:
4351
diff
changeset
|
125 |
c733124b6262
pull requests: show graph when displaying PR
Mads Kiilerich <madski@unity3d.com>
parents:
4351
diff
changeset
|
126 $(document).ready(function(){ |
c733124b6262
pull requests: show graph when displaying PR
Mads Kiilerich <madski@unity3d.com>
parents:
4351
diff
changeset
|
127 %if not c.as_form: |
c733124b6262
pull requests: show graph when displaying PR
Mads Kiilerich <madski@unity3d.com>
parents:
4351
diff
changeset
|
128 var jsdata = ${c.jsdata|n}; |
4778
dba66b0768f4
graph: don't hardcode chg_ prefix ... and just assume canvas and table are aligned
Mads Kiilerich <madski@unity3d.com>
parents:
4625
diff
changeset
|
129 var r = new BranchRenderer('graph_canvas', 'graph_content_pr', 'chg_'); |
4352
c733124b6262
pull requests: show graph when displaying PR
Mads Kiilerich <madski@unity3d.com>
parents:
4351
diff
changeset
|
130 r.render(jsdata,100); |
c733124b6262
pull requests: show graph when displaying PR
Mads Kiilerich <madski@unity3d.com>
parents:
4351
diff
changeset
|
131 %endif |
c733124b6262
pull requests: show graph when displaying PR
Mads Kiilerich <madski@unity3d.com>
parents:
4351
diff
changeset
|
132 |
c733124b6262
pull requests: show graph when displaying PR
Mads Kiilerich <madski@unity3d.com>
parents:
4351
diff
changeset
|
133 $('.expand_commit').click(function(e){ |
c733124b6262
pull requests: show graph when displaying PR
Mads Kiilerich <madski@unity3d.com>
parents:
4351
diff
changeset
|
134 var cid = $(this).attr('commit_id'); |
c733124b6262
pull requests: show graph when displaying PR
Mads Kiilerich <madski@unity3d.com>
parents:
4351
diff
changeset
|
135 $('#C-'+cid).toggleClass('expanded'); |
c733124b6262
pull requests: show graph when displaying PR
Mads Kiilerich <madski@unity3d.com>
parents:
4351
diff
changeset
|
136 r.render(jsdata,100); |
c733124b6262
pull requests: show graph when displaying PR
Mads Kiilerich <madski@unity3d.com>
parents:
4351
diff
changeset
|
137 }); |
c733124b6262
pull requests: show graph when displaying PR
Mads Kiilerich <madski@unity3d.com>
parents:
4351
diff
changeset
|
138 |
c733124b6262
pull requests: show graph when displaying PR
Mads Kiilerich <madski@unity3d.com>
parents:
4351
diff
changeset
|
139 $('.gravatar').click(function(e){ |
c733124b6262
pull requests: show graph when displaying PR
Mads Kiilerich <madski@unity3d.com>
parents:
4351
diff
changeset
|
140 var cid = $(this).attr('commit_id'); |
c733124b6262
pull requests: show graph when displaying PR
Mads Kiilerich <madski@unity3d.com>
parents:
4351
diff
changeset
|
141 $('#row-'+cid).toggleClass('hl', !$('#row-'+cid).hasClass('hl')); |
c733124b6262
pull requests: show graph when displaying PR
Mads Kiilerich <madski@unity3d.com>
parents:
4351
diff
changeset
|
142 }); |
c733124b6262
pull requests: show graph when displaying PR
Mads Kiilerich <madski@unity3d.com>
parents:
4351
diff
changeset
|
143 }); |
c733124b6262
pull requests: show graph when displaying PR
Mads Kiilerich <madski@unity3d.com>
parents:
4351
diff
changeset
|
144 |
4368
3136811db1af
compare: introduce .cs_repo as the repo for .cs_changes - sometimes it is org, sometimes other
Mads Kiilerich <madski@unity3d.com>
parents:
4367
diff
changeset
|
145 </script> |