Mercurial > kallithea

comparison rhodecode/templates/pullrequests/pullrequest_show.html @ 2481:4d3032431d4f beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Adde pull request voting recalculation
author Marcin Kuzminski <marcin@python-works.com>
date Tue, 19 Jun 2012 00:43:55 +0200
parents 8eab81115660
children 1fd3c043c025
comparison
equal deleted inserted replaced
2480:cb9e73b29a87 2481:4d3032431d4f
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}</h3>
24 <div class="changeset-status-container" style="float:left;padding:0px 20px 20px 20px"> 24 <div class="changeset-status-container" style="float:left;padding:0px 20px 0px 20px">
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="${_('Changeset 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"><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"> 30 <div style="padding:4px 4px 10px 4px">
31 <div>${h.fmt_date(c.pull_request.created_on)}</div> 31 <div>${h.fmt_date(c.pull_request.created_on)}</div>
32 </div> 32 </div>
33 33
34 ##DIFF 34 ## REVIEWERS
35 35 <div>
36 <div class="table"> 36 <div class="table" style="float:right;width:46%;clear:none">
37 <div id="body" class="diffblock"> 37 <div id="body" class="diffblock">
38 <div style="white-space:pre-wrap;padding:5px">${h.literal(c.pull_request.description)}</div> 38 <div style="white-space:pre-wrap;padding:5px">${_('Pull request reviewers')}</div>
39 </div> 39 </div>
40 <div id="changeset_compare_view_content"> 40 <div style="border: 1px solid #CCC">
41 ##CS 41 <div class="group_members_wrap">
42 <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Incoming changesets')}</div> 42 <ul class="group_members">
43 <%include file="/compare/compare_cs.html" /> 43 %for user,status in c.pull_request_reviewers:
44 44 <li>
45 ## FILES 45 <div class="group_member">
46 <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Files affected')}</div> 46 <div style="float:left;padding:3px">
47 <div class="cs_files"> 47 <img src="${h.url(str('/images/icons/flag_status_%s.png' % (status[0][1].status if status else 'not_reviewed')))}"/>
48 %for fid, change, f, stat in c.files: 48 </div>
49 <div class="cs_${change}"> 49 <div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(user.email,20)}"/> </div>
50 <div class="node">${h.link_to(h.safe_unicode(f),h.url.current(anchor=fid))}</div> 50 <div style="float:left">${user.username}</div>
51 <div class="changes">${h.fancy_file_stats(stat)}</div>
52 </div> 51 </div>
52 </li>
53 %endfor 53 %endfor
54 </div> 54 </ul>
55 </div> 55 </div>
56 </div>
57 </div>
58 ##DIFF
59 <div class="table" style="float:left;width:46%;clear:none">
60 <div id="body" class="diffblock">
61 <div style="white-space:pre-wrap;padding:5px">${h.literal(c.pull_request.description)}</div>
62 </div>
63 <div id="changeset_compare_view_content">
64 ##CS
65 <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Incoming changesets')}</div>
66 <%include file="/compare/compare_cs.html" />
67
68 ## FILES
69 <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Files affected')}</div>
70 <div class="cs_files">
71 %for fid, change, f, stat in c.files:
72 <div class="cs_${change}">
73 <div class="node">${h.link_to(h.safe_unicode(f),h.url.current(anchor=fid))}</div>
74 <div class="changes">${h.fancy_file_stats(stat)}</div>
75 </div>
76 %endfor
77 </div>
78 </div>
79 </div>
56 </div> 80 </div>
57 <script> 81 <script>
58 var _USERS_AC_DATA = ${c.users_array|n}; 82 var _USERS_AC_DATA = ${c.users_array|n};
59 var _GROUPS_AC_DATA = ${c.users_groups_array|n}; 83 var _GROUPS_AC_DATA = ${c.users_groups_array|n};
60 </script> 84 </script>