Show More
@@ -4746,7 +4746,7 b' PULL REQUESTS' | |||
|
4746 | 4746 | } |
|
4747 | 4747 | |
|
4748 | 4748 | div.pr-details-title.closed, |
|
4749 |
#pullrequests_container li.closed |
|
|
4749 | #pullrequests_container li.closed div div | |
|
4750 | 4750 | { |
|
4751 | 4751 | color: #555; |
|
4752 | 4752 | background: #eee; |
@@ -4761,9 +4761,8 b' div.pr-details-title {' | |||
|
4761 | 4761 | } |
|
4762 | 4762 | |
|
4763 | 4763 | div.pr { |
|
4764 | border-bottom: 1px solid #DDD; | |
|
4765 | 4764 | margin: 0px 20px; |
|
4766 |
padding: |
|
|
4765 | padding: 4px 4px; | |
|
4767 | 4766 | } |
|
4768 | 4767 | div.pr-desc { |
|
4769 | 4768 | margin: 0px 20px; |
@@ -9,14 +9,17 b'' | |||
|
9 | 9 | <img src="${h.url('/images/icons/flag_status_not_reviewed.png')}" title="${_("Nobody voted")}"/> |
|
10 | 10 | %endif |
|
11 | 11 | <a href="${h.url('pullrequest_show',repo_name=pr.other_repo.repo_name,pull_request_id=pr.pull_request_id)}"> |
|
12 | ${_('Pull request #%s opened by %s on %s') % (pr.pull_request_id, pr.author.full_name, h.fmt_date(pr.created_on))} | |
|
13 | </a> | |
|
12 | ${pr.title or _("(no title)")} | |
|
14 | 13 | %if pr.is_closed(): |
|
15 | 14 | <span class="pr-closed-tag">${_('Closed')}</span> |
|
16 | 15 | %endif |
|
16 | </a> | |
|
17 | ${_('opened on %s from') % (h.fmt_date(pr.created_on))} | |
|
18 | <% org_ref_name=pr.org_ref.rsplit(':', 2)[-2] %> | |
|
19 | <a href="${h.url('summary_home', repo_name=pr.org_repo.repo_name, anchor=org_ref_name)}"> | |
|
20 | ${pr.org_repo.repo_name}#${org_ref_name} | |
|
21 | </a> | |
|
17 | 22 | </div> |
|
18 | <h5 style="border:0px;padding-bottom:0px">${_('Title')}: ${pr.title}</h5> | |
|
19 | <div class="pr-desc">${pr.description}</div> | |
|
20 | 23 | </div> |
|
21 | 24 | % endfor |
|
22 | 25 |
@@ -1,12 +1,8 b'' | |||
|
1 | %if c.show_closed: | |
|
2 | ${h.checkbox('show_closed',checked="checked", label=_('Show closed pull requests'))} | |
|
3 | %else: | |
|
4 | ${h.checkbox('show_closed',label=_('Show closed pull requests'))} | |
|
5 | %endif | |
|
1 | ${h.checkbox('show_closed',checked="checked" if c.show_closed else "", label=_('Show closed pull requests too'))} | |
|
6 | 2 | <div class="pullrequests_section_head">${_('Opened by me')}</div> |
|
7 | 3 | <ul> |
|
8 |
|
|
|
9 |
|
|
|
4 | %if c.my_pull_requests: | |
|
5 | %for pull_request in c.my_pull_requests: | |
|
10 | 6 | <li class="${'closed' if pull_request.is_closed() else ''}"> |
|
11 | 7 | <div style="height: 12px"> |
|
12 | 8 | <div style="float:left"> |
@@ -16,11 +12,16 b'' | |||
|
16 | 12 | <img src="${h.url('/images/icons/flag_status_not_reviewed.png')}" title="${_("Nobody voted")}"/> |
|
17 | 13 | %endif |
|
18 | 14 | <a href="${h.url('pullrequest_show',repo_name=pull_request.other_repo.repo_name,pull_request_id=pull_request.pull_request_id)}"> |
|
19 | ${_('Pull request #%s opened on %s') % (pull_request.pull_request_id, h.fmt_date(pull_request.created_on))} | |
|
20 | %if pull_request.is_closed(): | |
|
21 | (${_('Closed')}) | |
|
22 | %endif | |
|
15 | ${pull_request.title or _("(no title)")} | |
|
23 | 16 | </a> |
|
17 | ${_('opened on %s from') % (h.fmt_date(pull_request.created_on))} | |
|
18 | <% org_ref_name=pull_request.org_ref.rsplit(':', 2)[-2] %> | |
|
19 | <a href="${h.url('summary_home', repo_name=pull_request.org_repo.repo_name, anchor=org_ref_name)}"> | |
|
20 | ${pull_request.org_repo.repo_name}#${org_ref_name} | |
|
21 | </a> | |
|
22 | %if pull_request.is_closed(): | |
|
23 | (${_('Closed')}) | |
|
24 | %endif | |
|
24 | 25 | </div> |
|
25 | 26 | <div style="float:left"> |
|
26 | 27 | ${h.form(url('pullrequest_delete', repo_name=pull_request.other_repo.repo_name, pull_request_id=pull_request.pull_request_id),method='delete')} |
@@ -29,33 +30,41 b'' | |||
|
29 | 30 | </div> |
|
30 | 31 | </div> |
|
31 | 32 | </li> |
|
32 |
|
|
|
33 |
|
|
|
33 | %endfor | |
|
34 | %else: | |
|
34 | 35 | <li><span class="empty_data">${_('Nothing here yet')}</span></li> |
|
35 |
|
|
|
36 | %endif | |
|
36 | 37 | </ul> |
|
37 | 38 | |
|
38 | 39 | <div class="pullrequests_section_head" style="clear:both">${_('I participate in')}</div> |
|
39 | 40 | <ul> |
|
40 |
|
|
|
41 |
|
|
|
41 | %if c.participate_in_pull_requests: | |
|
42 | %for pull_request in c.participate_in_pull_requests: | |
|
42 | 43 | <li class="${'closed' if pull_request.is_closed() else ''}"> |
|
43 | 44 | <div style="height: 12px"> |
|
44 | %if pull_request.last_review_status: | |
|
45 | <img src="${h.url('/images/icons/flag_status_%s.png' % pull_request.last_review_status)}" title="${_("Someone voted: %s") % pull_request.last_review_status}"/> | |
|
46 | %else: | |
|
47 | <img src="${h.url('/images/icons/flag_status_not_reviewed.png')}" title="${_("Nobody voted")}"/> | |
|
48 | %endif | |
|
49 | <a href="${h.url('pullrequest_show',repo_name=pull_request.other_repo.repo_name,pull_request_id=pull_request.pull_request_id)}"> | |
|
50 | ${_('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))} | |
|
51 | </a> | |
|
52 | %if pull_request.is_closed(): | |
|
53 |
|
|
|
54 | %endif | |
|
45 | <div style="float:left"> | |
|
46 | %if pull_request.last_review_status: | |
|
47 | <img src="${h.url('/images/icons/flag_status_%s.png' % pull_request.last_review_status)}" title="${_("Someone voted: %s") % pull_request.last_review_status}"/> | |
|
48 | %else: | |
|
49 | <img src="${h.url('/images/icons/flag_status_not_reviewed.png')}" title="${_("Nobody voted")}"/> | |
|
50 | %endif | |
|
51 | <a href="${h.url('pullrequest_show',repo_name=pull_request.other_repo.repo_name,pull_request_id=pull_request.pull_request_id)}"> | |
|
52 | ${pull_request.title or _("(no title)")} | |
|
53 | </a> | |
|
54 | ${_('from')} | |
|
55 | <% org_ref_name=pull_request.org_ref.rsplit(':', 2)[-2] %> | |
|
56 | <a href="${h.url('summary_home', repo_name=pull_request.org_repo.repo_name, anchor=org_ref_name)}"> | |
|
57 | ${pull_request.org_repo.repo_name}#${org_ref_name} | |
|
58 | </a> | |
|
59 | ${_('opened on %s') % (h.fmt_date(pull_request.created_on))} | |
|
60 | %if pull_request.is_closed(): | |
|
61 | (${_('Closed')}) | |
|
62 | %endif | |
|
63 | </div> | |
|
55 | 64 | </div> |
|
56 | 65 | </li> |
|
57 |
|
|
|
58 |
|
|
|
59 |
|
|
|
60 |
|
|
|
66 | %endfor | |
|
67 | %else: | |
|
68 | <li><span class="empty_data">${_('Nothing here yet')}</span></li> | |
|
69 | %endif | |
|
61 | 70 | </ul> |
General Comments 0
You need to be logged in to leave comments.
Login now