Show More
@@ -4567,6 +4567,14 b' PULL REQUESTS' | |||||
4567 | font-weight: bold; |
|
4567 | font-weight: bold; | |
4568 | } |
|
4568 | } | |
4569 |
|
4569 | |||
|
4570 | div.closed h4 a, | |||
|
4571 | h3.closed, | |||
|
4572 | #pullrequests_container li.closed a | |||
|
4573 | { | |||
|
4574 | color: #555; | |||
|
4575 | background: #eee; | |||
|
4576 | } | |||
|
4577 | ||||
4570 | /**** |
|
4578 | /**** | |
4571 | PERMS |
|
4579 | PERMS | |
4572 | *****/ |
|
4580 | *****/ |
@@ -7,16 +7,16 b'' | |||||
7 | <ul> |
|
7 | <ul> | |
8 | %if c.my_pull_requests: |
|
8 | %if c.my_pull_requests: | |
9 | %for pull_request in c.my_pull_requests: |
|
9 | %for pull_request in c.my_pull_requests: | |
10 | <li> |
|
10 | <li class="${'closed' if pull_request.is_closed() else ''}"> | |
11 | <div style="height: 12px"> |
|
11 | <div style="height: 12px"> | |
12 | <div style="float:left"> |
|
12 | <div style="float:left"> | |
13 | %if pull_request.is_closed(): |
|
13 | <img src="${h.url('/images/icons/flag_status_%s.png' % str(pull_request.last_review_status))}" /> | |
14 | <img src="${h.url('/images/icons/lock_go.png')}" title="${_('Closed')}"/> |
|
14 | <a href="${h.url('pullrequest_show',repo_name=pull_request.other_repo.repo_name,pull_request_id=pull_request.pull_request_id)}"> | |
15 | %endif |
|
15 | ${_('Pull request #%s opened on %s') % (pull_request.pull_request_id, h.fmt_date(pull_request.created_on))} | |
16 | <img src="${h.url('/images/icons/flag_status_%s.png' % str(pull_request.last_review_status))}" /> |
|
16 | %if pull_request.is_closed(): | |
17 | <a href="${h.url('pullrequest_show',repo_name=pull_request.other_repo.repo_name,pull_request_id=pull_request.pull_request_id)}"> |
|
17 | (${_('Closed')}) | |
18 | ${_('Pull request #%s opened on %s') % (pull_request.pull_request_id, h.fmt_date(pull_request.created_on))} |
|
18 | %endif | |
19 | </a> |
|
19 | </a> | |
20 | </div> |
|
20 | </div> | |
21 | <div style="float:left;margin-top: -5px"> |
|
21 | <div style="float:left;margin-top: -5px"> | |
22 | ${h.form(url('pullrequest_delete', repo_name=pull_request.other_repo.repo_name, pull_request_id=pull_request.pull_request_id),method='delete')} |
|
22 | ${h.form(url('pullrequest_delete', repo_name=pull_request.other_repo.repo_name, pull_request_id=pull_request.pull_request_id),method='delete')} | |
@@ -35,16 +35,16 b'' | |||||
35 | <ul> |
|
35 | <ul> | |
36 | %if c.participate_in_pull_requests: |
|
36 | %if c.participate_in_pull_requests: | |
37 | %for pull_request in c.participate_in_pull_requests: |
|
37 | %for pull_request in c.participate_in_pull_requests: | |
38 | <li> |
|
38 | <li class="${'closed' if pull_request.is_closed() else ''}"> | |
39 | <div style="height: 12px"> |
|
39 | <div style="height: 12px"> | |
40 | %if pull_request.is_closed(): |
|
40 | <img src="${h.url('/images/icons/flag_status_%s.png' % str(pull_request.last_review_status))}" /> | |
41 | <img src="${h.url('/images/icons/lock_go.png')}" title="${_('Closed')}"/> |
|
41 | <a href="${h.url('pullrequest_show',repo_name=pull_request.other_repo.repo_name,pull_request_id=pull_request.pull_request_id)}"> | |
42 | %endif |
|
42 | ${_('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))} | |
43 | <img src="${h.url('/images/icons/flag_status_%s.png' % str(pull_request.last_review_status))}" /> |
|
43 | </a> | |
44 | <a href="${h.url('pullrequest_show',repo_name=pull_request.other_repo.repo_name,pull_request_id=pull_request.pull_request_id)}"> |
|
44 | %if pull_request.is_closed(): | |
45 | ${_('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))} |
|
45 | (${_('Closed')}) | |
46 | </a> |
|
46 | %endif | |
47 | </div> |
|
47 | </div> | |
48 | </li> |
|
48 | </li> | |
49 | %endfor |
|
49 | %endfor | |
50 | %else: |
|
50 | %else: |
@@ -19,15 +19,14 b'' | |||||
19 | <div class="title"> |
|
19 | <div class="title"> | |
20 | ${self.breadcrumbs()} |
|
20 | ${self.breadcrumbs()} | |
21 | </div> |
|
21 | </div> | |
22 | %if c.pull_request.is_closed(): |
|
22 | ||
23 | <div style="padding:10px; font-size:22px;width:100%;text-align: center; color:#88D882">${_('Closed %s') % (h.age(c.pull_request.updated_on))} ${_('with status %s') % h.changeset_status_lbl(c.current_changeset_status)}</div> |
|
23 | <h3 class="${'closed' if c.pull_request.is_closed() else ''}"> | |
24 | %endif |
|
24 | <img src="${h.url('/images/icons/flag_status_%s.png' % str(c.pull_request.last_review_status))}" /> | |
25 | <h3> |
|
25 | ${_('Title')}: ${c.pull_request.title} | |
26 | %if c.pull_request.is_closed(): |
|
26 | %if c.pull_request.is_closed(): | |
27 | <img src="${h.url('/images/icons/lock_go.png')}" title="${_('Closed')}"/> |
|
27 | (${_('Closed')}) | |
28 | %endif |
|
28 | %endif | |
29 | <img src="${h.url('/images/icons/flag_status_%s.png' % str(c.pull_request.last_review_status))}" /> |
|
29 | </h3> | |
30 | ${_('Title')}: ${c.pull_request.title}</h3> |
|
|||
31 |
|
30 | |||
32 | <div class="form"> |
|
31 | <div class="form"> | |
33 | <div id="summary" class="fields"> |
|
32 | <div id="summary" class="fields"> | |
@@ -38,7 +37,12 b'' | |||||
38 | <div class="input"> |
|
37 | <div class="input"> | |
39 | <div class="changeset-status-container" style="float:none;clear:both"> |
|
38 | <div class="changeset-status-container" style="float:none;clear:both"> | |
40 | %if c.current_changeset_status: |
|
39 | %if c.current_changeset_status: | |
41 |
<div title="${_('Pull request status')}" class="changeset-status-lbl"> |
|
40 | <div title="${_('Pull request status')}" class="changeset-status-lbl"> | |
|
41 | %if c.pull_request.is_closed(): | |||
|
42 | ${_('Closed')}, | |||
|
43 | %endif | |||
|
44 | ${h.changeset_status_lbl(c.current_changeset_status)} | |||
|
45 | </div> | |||
42 | <div class="changeset-status-ico" style="padding:1px 4px"><img src="${h.url('/images/icons/flag_status_%s.png' % c.current_changeset_status)}" /></div> |
|
46 | <div class="changeset-status-ico" style="padding:1px 4px"><img src="${h.url('/images/icons/flag_status_%s.png' % c.current_changeset_status)}" /></div> | |
43 | %endif |
|
47 | %endif | |
44 | </div> |
|
48 | </div> |
@@ -21,15 +21,15 b'' | |||||
21 | </div> |
|
21 | </div> | |
22 |
|
22 | |||
23 | %for pr in c.pull_requests: |
|
23 | %for pr in c.pull_requests: | |
24 | <div> |
|
24 | <div class="${'closed' if pr.is_closed() else ''}"> | |
25 |
<h4 |
|
25 | <h4 style="border:0px;padding:0px"> | |
26 | %if pr.is_closed(): |
|
|||
27 | <img src="${h.url('/images/icons/lock_go.png')}" title="${_('Closed')}"/> |
|
|||
28 | %endif |
|
|||
29 | <img src="${h.url('/images/icons/flag_status_%s.png' % str(pr.last_review_status))}" /> |
|
26 | <img src="${h.url('/images/icons/flag_status_%s.png' % str(pr.last_review_status))}" /> | |
30 | <a href="${h.url('pullrequest_show',repo_name=c.repo_name,pull_request_id=pr.pull_request_id)}"> |
|
27 | <a href="${h.url('pullrequest_show',repo_name=c.repo_name,pull_request_id=pr.pull_request_id)}"> | |
31 | ${_('Pull request #%s opened by %s on %s') % (pr.pull_request_id, pr.author.full_name, h.fmt_date(pr.created_on))} |
|
28 | ${_('Pull request #%s opened by %s on %s') % (pr.pull_request_id, pr.author.full_name, h.fmt_date(pr.created_on))} | |
32 | </a> |
|
29 | </a> | |
|
30 | %if pr.is_closed(): | |||
|
31 | (${_('Closed')}) | |||
|
32 | %endif | |||
33 | </h4> |
|
33 | </h4> | |
34 | <h5 style="border:0px;padding-bottom:0px">${_('Title')}: ${pr.title}</h5> |
|
34 | <h5 style="border:0px;padding-bottom:0px">${_('Title')}: ${pr.title}</h5> | |
35 | <div style="padding:0px 24px">${pr.description}</div> |
|
35 | <div style="padding:0px 24px">${pr.description}</div> |
General Comments 0
You need to be logged in to leave comments.
Login now