Mercurial > kallithea

annotate rhodecode/templates/admin/my_account/my_account_pullrequests.html @ 4116:ffd45b185016 rhodecode-2.2.5-gpl

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Imported some of the GPLv3'd changes from RhodeCode v2.2.5. This imports changes between changesets 21af6c4eab3d and 6177597791c2 in RhodeCode's original repository, including only changes to Python files and HTML. RhodeCode clearly licensed its changes to these files under GPLv3 in their /LICENSE file, which states the following: The Python code and integrated HTML are licensed under the GPLv3 license. (See: https://code.rhodecode.com/rhodecode/files/v2.2.5/LICENSE or http://web.archive.org/web/20140512193334/https://code.rhodecode.com/rhodecode/files/f3b123159901f15426d18e3dc395e8369f70ebe0/LICENSE for an online copy of that LICENSE file) Conservancy reviewed these changes and confirmed that they can be licensed as a whole to the Kallithea project under GPLv3-only. While some of the contents committed herein are clearly licensed GPLv3-or-later, on the whole we must assume the are GPLv3-only, since the statement above from RhodeCode indicates that they intend GPLv3-only as their license, per GPLv3ยง14 and other relevant sections of GPLv3.
author Bradley M. Kuhn <bkuhn@sfconservancy.org>
date Wed, 02 Jul 2014 19:03:13 -0400
parents rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html@8a8a559eaf95
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3404
7854097b189c Hide closed pull requests on my page.
Marcin Kuzminski <marcin@python-works.com>
parents: 3394
diff changeset
1 %if c.show_closed:
7854097b189c Hide closed pull requests on my page.
Marcin Kuzminski <marcin@python-works.com>
parents: 3394
diff changeset
2 ${h.checkbox('show_closed',checked="checked", label=_('Show closed pull requests'))}
7854097b189c Hide closed pull requests on my page.
Marcin Kuzminski <marcin@python-works.com>
parents: 3394
diff changeset
3 %else:
7854097b189c Hide closed pull requests on my page.
Marcin Kuzminski <marcin@python-works.com>
parents: 3394
diff changeset
4 ${h.checkbox('show_closed',label=_('Show closed pull requests'))}
7854097b189c Hide closed pull requests on my page.
Marcin Kuzminski <marcin@python-works.com>
parents: 3394
diff changeset
5 %endif
2624
19daa8d761dc Improvements to my account page
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
6 <div class="pullrequests_section_head">${_('Opened by me')}</div>
19daa8d761dc Improvements to my account page
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
7 <ul>
2722
ef7520340c44 fixed missing div on my_account + added nothing here yet when there are no
Marcin Kuzminski <marcin@python-works.com>
parents: 2667
diff changeset
8 %if c.my_pull_requests:
ef7520340c44 fixed missing div on my_account + added nothing here yet when there are no
Marcin Kuzminski <marcin@python-works.com>
parents: 2667
diff changeset
9 %for pull_request in c.my_pull_requests:
3652
8a8a559eaf95 pullrequests: state "closed" explicitly
Mads Kiilerich <madski@unity3d.com>
parents: 3404
diff changeset
10 <li class="${'closed' if pull_request.is_closed() else ''}">
2770
74364824c1e1 Hide add/delete pull request members when you don't have permission for it
Marcin Kuzminski <marcin@python-works.com>
parents: 2746
diff changeset
11 <div style="height: 12px">
74364824c1e1 Hide add/delete pull request members when you don't have permission for it
Marcin Kuzminski <marcin@python-works.com>
parents: 2746
diff changeset
12 <div style="float:left">
3652
8a8a559eaf95 pullrequests: state "closed" explicitly
Mads Kiilerich <madski@unity3d.com>
parents: 3404
diff changeset
13 <img src="${h.url('/images/icons/flag_status_%s.png' % str(pull_request.last_review_status))}" />
8a8a559eaf95 pullrequests: state "closed" explicitly
Mads Kiilerich <madski@unity3d.com>
parents: 3404
diff changeset
14 <a href="${h.url('pullrequest_show',repo_name=pull_request.other_repo.repo_name,pull_request_id=pull_request.pull_request_id)}">
8a8a559eaf95 pullrequests: state "closed" explicitly
Mads Kiilerich <madski@unity3d.com>
parents: 3404
diff changeset
15 ${_('Pull request #%s opened on %s') % (pull_request.pull_request_id, h.fmt_date(pull_request.created_on))}
8a8a559eaf95 pullrequests: state "closed" explicitly
Mads Kiilerich <madski@unity3d.com>
parents: 3404
diff changeset
16 %if pull_request.is_closed():
8a8a559eaf95 pullrequests: state "closed" explicitly
Mads Kiilerich <madski@unity3d.com>
parents: 3404
diff changeset
17 (${_('Closed')})
8a8a559eaf95 pullrequests: state "closed" explicitly
Mads Kiilerich <madski@unity3d.com>
parents: 3404
diff changeset
18 %endif
8a8a559eaf95 pullrequests: state "closed" explicitly
Mads Kiilerich <madski@unity3d.com>
parents: 3404
diff changeset
19 </a>
2770
74364824c1e1 Hide add/delete pull request members when you don't have permission for it
Marcin Kuzminski <marcin@python-works.com>
parents: 2746
diff changeset
20 </div>
4116
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 3652
diff changeset
21 <div style="float:left;padding:4px 0px 0px 5px">
2770
74364824c1e1 Hide add/delete pull request members when you don't have permission for it
Marcin Kuzminski <marcin@python-works.com>
parents: 2746
diff changeset
22 ${h.form(url('pullrequest_delete', repo_name=pull_request.other_repo.repo_name, pull_request_id=pull_request.pull_request_id),method='delete')}
4116
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 3652
diff changeset
23 <i class="icon-remove-sign" style="color:#FF4444"></i>
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 3652
diff changeset
24 ${h.submit('remove_%s' % pull_request.pull_request_id, _('delete'),
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 3652
diff changeset
25 class_="action_button",onclick="return confirm('"+_('Confirm to delete this pull request')+"');")}
2770
74364824c1e1 Hide add/delete pull request members when you don't have permission for it
Marcin Kuzminski <marcin@python-works.com>
parents: 2746
diff changeset
26 ${h.end_form()}
74364824c1e1 Hide add/delete pull request members when you don't have permission for it
Marcin Kuzminski <marcin@python-works.com>
parents: 2746
diff changeset
27 </div>
74364824c1e1 Hide add/delete pull request members when you don't have permission for it
Marcin Kuzminski <marcin@python-works.com>
parents: 2746
diff changeset
28 </div>
2722
ef7520340c44 fixed missing div on my_account + added nothing here yet when there are no
Marcin Kuzminski <marcin@python-works.com>
parents: 2667
diff changeset
29 </li>
ef7520340c44 fixed missing div on my_account + added nothing here yet when there are no
Marcin Kuzminski <marcin@python-works.com>
parents: 2667
diff changeset
30 %endfor
ef7520340c44 fixed missing div on my_account + added nothing here yet when there are no
Marcin Kuzminski <marcin@python-works.com>
parents: 2667
diff changeset
31 %else:
ef7520340c44 fixed missing div on my_account + added nothing here yet when there are no
Marcin Kuzminski <marcin@python-works.com>
parents: 2667
diff changeset
32 <li><span class="empty_data">${_('Nothing here yet')}</span></li>
ef7520340c44 fixed missing div on my_account + added nothing here yet when there are no
Marcin Kuzminski <marcin@python-works.com>
parents: 2667
diff changeset
33 %endif
2624
19daa8d761dc Improvements to my account page
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
34 </ul>
19daa8d761dc Improvements to my account page
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
35
2746
49a4864b11c1 Authors of pull-requests can now delete them
Marcin Kuzminski <marcin@python-works.com>
parents: 2722
diff changeset
36 <div class="pullrequests_section_head" style="clear:both">${_('I participate in')}</div>
2624
19daa8d761dc Improvements to my account page
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
37 <ul>
3017
eaa36a2497a9 fixes #651 Pull request I participate - empty for some cases
Marcin Kuzminski <marcin@python-works.com>
parents: 2770
diff changeset
38 %if c.participate_in_pull_requests:
2722
ef7520340c44 fixed missing div on my_account + added nothing here yet when there are no
Marcin Kuzminski <marcin@python-works.com>
parents: 2667
diff changeset
39 %for pull_request in c.participate_in_pull_requests:
3652
8a8a559eaf95 pullrequests: state "closed" explicitly
Mads Kiilerich <madski@unity3d.com>
parents: 3404
diff changeset
40 <li class="${'closed' if pull_request.is_closed() else ''}">
2770
74364824c1e1 Hide add/delete pull request members when you don't have permission for it
Marcin Kuzminski <marcin@python-works.com>
parents: 2746
diff changeset
41 <div style="height: 12px">
3652
8a8a559eaf95 pullrequests: state "closed" explicitly
Mads Kiilerich <madski@unity3d.com>
parents: 3404
diff changeset
42 <img src="${h.url('/images/icons/flag_status_%s.png' % str(pull_request.last_review_status))}" />
8a8a559eaf95 pullrequests: state "closed" explicitly
Mads Kiilerich <madski@unity3d.com>
parents: 3404
diff changeset
43 <a href="${h.url('pullrequest_show',repo_name=pull_request.other_repo.repo_name,pull_request_id=pull_request.pull_request_id)}">
8a8a559eaf95 pullrequests: state "closed" explicitly
Mads Kiilerich <madski@unity3d.com>
parents: 3404
diff changeset
44 ${_('Pull request #%s opened by %s on %s') % (pull_request.pull_request_id, pull_request.author.full_name, h.fmt_date(pull_request.created_on))}
8a8a559eaf95 pullrequests: state "closed" explicitly
Mads Kiilerich <madski@unity3d.com>
parents: 3404
diff changeset
45 </a>
8a8a559eaf95 pullrequests: state "closed" explicitly
Mads Kiilerich <madski@unity3d.com>
parents: 3404
diff changeset
46 %if pull_request.is_closed():
8a8a559eaf95 pullrequests: state "closed" explicitly
Mads Kiilerich <madski@unity3d.com>
parents: 3404
diff changeset
47 (${_('Closed')})
8a8a559eaf95 pullrequests: state "closed" explicitly
Mads Kiilerich <madski@unity3d.com>
parents: 3404
diff changeset
48 %endif
8a8a559eaf95 pullrequests: state "closed" explicitly
Mads Kiilerich <madski@unity3d.com>
parents: 3404
diff changeset
49 </div>
2722
ef7520340c44 fixed missing div on my_account + added nothing here yet when there are no
Marcin Kuzminski <marcin@python-works.com>
parents: 2667
diff changeset
50 </li>
ef7520340c44 fixed missing div on my_account + added nothing here yet when there are no
Marcin Kuzminski <marcin@python-works.com>
parents: 2667
diff changeset
51 %endfor
ef7520340c44 fixed missing div on my_account + added nothing here yet when there are no
Marcin Kuzminski <marcin@python-works.com>
parents: 2667
diff changeset
52 %else:
ef7520340c44 fixed missing div on my_account + added nothing here yet when there are no
Marcin Kuzminski <marcin@python-works.com>
parents: 2667
diff changeset
53 <li><span class="empty_data">${_('Nothing here yet')}</span></li>
ef7520340c44 fixed missing div on my_account + added nothing here yet when there are no
Marcin Kuzminski <marcin@python-works.com>
parents: 2667
diff changeset
54 %endif
2624
19daa8d761dc Improvements to my account page
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
55 </ul>
4116
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 3652
diff changeset
56
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 3652
diff changeset
57 <script>
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 3652
diff changeset
58 $('#show_closed').on('click', function(e){
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 3652
diff changeset
59 if($(this).is(":checked")){
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 3652
diff changeset
60 window.location = "${h.url('my_account_pullrequests', pr_show_closed=1)}";
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 3652
diff changeset
61 }
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 3652
diff changeset
62 else{
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 3652
diff changeset
63 window.location = "${h.url('my_account_pullrequests')}";
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 3652
diff changeset
64 }
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 3652
diff changeset
65 })
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 3652
diff changeset
66 </script>