Mercurial > kallithea

comparison rhodecode/templates/pullrequests/pullrequest_show.html @ 2482:1fd3c043c025 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
small UI changes for pull-request view
author Marcin Kuzminski <marcin@python-works.com>
date Tue, 19 Jun 2012 19:48:57 +0200
parents 4d3032431d4f
children a0adf8db1416
comparison
equal deleted inserted replaced
2481:4d3032431d4f 2482:1fd3c043c025
18 <!-- box / title --> 18 <!-- box / title -->
19 <div class="title"> 19 <div class="title">
20 ${self.breadcrumbs()} 20 ${self.breadcrumbs()}
21 </div> 21 </div>
22 22
23 <h3>${_('Title')}: ${c.pull_request.title}</h3> 23 <h3>${_('Title')}: ${c.pull_request.title}
24 <div class="changeset-status-container" style="float:left;padding:0px 20px 0px 20px"> 24 <div class="changeset-status-container" style="float:none">
25 %if c.current_changeset_status: 25 %if c.current_changeset_status:
26 <div title="${_('Changeset status')}" class="changeset-status-lbl">[${h.changeset_status_lbl(c.current_changeset_status)}]</div> 26 <div title="${_('Pull request status')}" class="changeset-status-lbl">[${h.changeset_status_lbl(c.current_changeset_status)}]</div>
27 <div class="changeset-status-ico"><img src="${h.url('/images/icons/flag_status_%s.png' % c.current_changeset_status)}" /></div> 27 <div class="changeset-status-ico" style="padding:4px"><img src="${h.url('/images/icons/flag_status_%s.png' % c.current_changeset_status)}" /></div>
28 %endif 28 %endif
29 </div> 29 </div>
30 <div style="padding:4px 4px 10px 4px"> 30 </h3>
31 <div>${h.fmt_date(c.pull_request.created_on)}</div> 31 <div style="white-space:pre-wrap;padding:3px 3px 5px 20px">${h.literal(c.pull_request.description)}</div>
32 <div style="padding:4px 4px 10px 20px">
33 <div>${_('Created on')}: ${h.fmt_date(c.pull_request.created_on)}</div>
32 </div> 34 </div>
33 35
34 ## REVIEWERS 36 ## REVIEWERS
35 <div> 37 <div>
36 <div class="table" style="float:right;width:46%;clear:none"> 38 <div class="table" style="float:right;width:46%;clear:none">
41 <div class="group_members_wrap"> 43 <div class="group_members_wrap">
42 <ul class="group_members"> 44 <ul class="group_members">
43 %for user,status in c.pull_request_reviewers: 45 %for user,status in c.pull_request_reviewers:
44 <li> 46 <li>
45 <div class="group_member"> 47 <div class="group_member">
46 <div style="float:left;padding:3px"> 48 <div style="float:left;padding:3px" class="tooltip" title="${h.tooltip(h.changeset_status_lbl(status[0][1].status if status else 'not_reviewed'))}">
47 <img src="${h.url(str('/images/icons/flag_status_%s.png' % (status[0][1].status if status else 'not_reviewed')))}"/> 49 <img src="${h.url(str('/images/icons/flag_status_%s.png' % (status[0][1].status if status else 'not_reviewed')))}"/>
48 </div> 50 </div>
49 <div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(user.email,20)}"/> </div> 51 <div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(user.email,20)}"/> </div>
50 <div style="float:left">${user.username}</div> 52 <div style="float:left">${user.username}</div>
51 </div> 53 </div>
56 </div> 58 </div>
57 </div> 59 </div>
58 ##DIFF 60 ##DIFF
59 <div class="table" style="float:left;width:46%;clear:none"> 61 <div class="table" style="float:left;width:46%;clear:none">
60 <div id="body" class="diffblock"> 62 <div id="body" class="diffblock">
61 <div style="white-space:pre-wrap;padding:5px">${h.literal(c.pull_request.description)}</div> 63 <div style="white-space:pre-wrap;padding:5px">${_('Compare view')}</div>
62 </div> 64 </div>
63 <div id="changeset_compare_view_content"> 65 <div id="changeset_compare_view_content">
64 ##CS 66 ##CS
65 <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Incoming changesets')}</div> 67 <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Incoming changesets')}</div>
66 <%include file="/compare/compare_cs.html" /> 68 <%include file="/compare/compare_cs.html" />
97 ${comment.comments(h.url('pullrequest_comment', repo_name=c.repo_name, pull_request_id=c.pull_request.pull_request_id), 99 ${comment.comments(h.url('pullrequest_comment', repo_name=c.repo_name, pull_request_id=c.pull_request.pull_request_id),
98 c.current_changeset_status)} 100 c.current_changeset_status)}
99 101
100 </div> 102 </div>
101 103
102 <script type="text/javascript">
103
104
105 </script>
106
107 </%def> 104 </%def>