comparison rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html @ 3652:8a8a559eaf95 beta

pullrequests: state "closed" explicitly A closed-as-in-locked icon did not communicate the closed-as-in-inactive state clearly. Instead we say "Closed" and make the text greyed out. Not pretty but more efficient.
author Mads Kiilerich <madski@unity3d.com>
date Wed, 03 Apr 2013 15:56:12 +0200
parents 7854097b189c
children
comparison
equal deleted inserted replaced
3651:659bd922520e 3652:8a8a559eaf95
5 %endif 5 %endif
6 <div class="pullrequests_section_head">${_('Opened by me')}</div> 6 <div class="pullrequests_section_head">${_('Opened by me')}</div>
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')}
23 ${h.submit('remove_%s' % pull_request.pull_request_id,'',class_="delete_icon action_button",onclick="return confirm('"+_('Confirm to delete this pull request')+"');")} 23 ${h.submit('remove_%s' % pull_request.pull_request_id,'',class_="delete_icon action_button",onclick="return confirm('"+_('Confirm to delete this pull request')+"');")}
24 ${h.end_form()} 24 ${h.end_form()}
33 33
34 <div class="pullrequests_section_head" style="clear:both">${_('I participate in')}</div> 34 <div class="pullrequests_section_head" style="clear:both">${_('I participate in')}</div>
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:
51 <li><span class="empty_data">${_('Nothing here yet')}</span></li> 51 <li><span class="empty_data">${_('Nothing here yet')}</span></li>
52 %endif 52 %endif