Mercurial > kallithea

comparison rhodecode/templates/pullrequests/pullrequest_show.html @ 3023:c2a206162062 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Basic implementation of cherry picking changesets for pull request, ref #575
author Marcin Kuzminski <marcin@python-works.com>
date Sat, 24 Nov 2012 00:29:38 +0100
parents 9937afa7f093
children 685ebc84c2e9
comparison
equal deleted inserted replaced
3022:0ed42ca7ff9e 3023:c2a206162062
56 <div style="white-space:pre-wrap;padding:3px 3px 5px 20px">${h.literal(c.pull_request.description)}</div> 56 <div style="white-space:pre-wrap;padding:3px 3px 5px 20px">${h.literal(c.pull_request.description)}</div>
57 <div style="padding:4px 4px 10px 20px"> 57 <div style="padding:4px 4px 10px 20px">
58 <div>${_('Created on')}: ${h.fmt_date(c.pull_request.created_on)}</div> 58 <div>${_('Created on')}: ${h.fmt_date(c.pull_request.created_on)}</div>
59 </div> 59 </div>
60 60
61 <div style="min-height:160px"> 61 <div style="overflow: auto;">
62 ##DIFF 62 ##DIFF
63 <div class="table" style="float:left;clear:none"> 63 <div class="table" style="float:left;clear:none">
64 <div id="body" class="diffblock"> 64 <div id="body" class="diffblock">
65 <div style="white-space:pre-wrap;padding:5px">${_('Compare view')}</div> 65 <div style="white-space:pre-wrap;padding:5px">${_('Compare view')}</div>
66 </div> 66 </div>
67 <div id="changeset_compare_view_content"> 67 <div id="changeset_compare_view_content">
68 ##CS 68 ##CS
69 <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Incoming changesets')}</div> 69 <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${ungettext('Showing %s commit','Showing %s commits', len(c.cs_ranges)) % len(c.cs_ranges)}</div>
70 <%include file="/compare/compare_cs.html" /> 70 <%include file="/compare/compare_cs.html" />
71 71
72 ## FILES 72 ## FILES
73 <div id="affected_files"> 73 <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">
74 % if c.files: 74
75 <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Files affected')}</div> 75 % if c.limited_diff:
76 <div class="cs_files"> 76 ${ungettext('%s file changed', '%s files changed', len(c.files)) % len(c.files)}
77 % else:
78 ${ungettext('%s file changed with %s insertions and %s deletions','%s files changed with %s insertions and %s deletions', len(c.files)) % (len(c.files),c.lines_added,c.lines_deleted)}:
79 %endif
80
81 </div>
82 <div class="cs_files">
83 %if not c.files:
84 <span class="empty_data">${_('No files')}</span>
85 %endif
77 %for fid, change, f, stat in c.files: 86 %for fid, change, f, stat in c.files:
78 <div class="cs_${change}"> 87 <div class="cs_${change}">
79 <div class="node">${h.link_to(h.safe_unicode(f),h.url.current(anchor=fid))}</div> 88 <div class="node">${h.link_to(h.safe_unicode(f),h.url.current(anchor=fid))}</div>
80 <div class="changes">${h.fancy_file_stats(stat)}</div> 89 <div class="changes">${h.fancy_file_stats(stat)}</div>
81 </div> 90 </div>
82 %endfor 91 %endfor
83 </div>
84 %else:
85 <div class="ui-btn" style="text-align: center;margin-top:5px">${_('Click to load diff details')}</div>
86 %endif
87 </div> 92 </div>
93 % if c.limited_diff:
94 <h5>${_('Changeset was too big and was cut off...')}</h5>
95 % endif
88 </div> 96 </div>
89 </div> 97 </div>
90 ## REVIEWERS 98 ## REVIEWERS
91 <div style="float:left; border-left:1px dashed #eee"> 99 <div style="float:left; border-left:1px dashed #eee">
92 <h4>${_('Pull request reviewers')}</h4> 100 <h4>${_('Pull request reviewers')}</h4>
93 <div id="reviewers" style="padding:0px 0px 0px 15px"> 101 <div id="reviewers" style="padding:0px 0px 5px 10px">
94 ## members goes here ! 102 ## members goes here !
95 <div class="group_members_wrap"> 103 <div class="group_members_wrap" style="min-height:45px">
96 <ul id="review_members" class="group_members"> 104 <ul id="review_members" class="group_members">
97 %for member,status in c.pull_request_reviewers: 105 %for member,status in c.pull_request_reviewers:
98 <li id="reviewer_${member.user_id}"> 106 <li id="reviewer_${member.user_id}">
99 <div class="reviewers_member"> 107 <div class="reviewers_member">
100 <div style="float:left;padding:0px 3px 0px 0px" class="tooltip" title="${h.tooltip(h.changeset_status_lbl(status[0][1].status if status else 'not_reviewed'))}"> 108 <div style="float:left;padding:0px 3px 0px 0px" class="tooltip" title="${h.tooltip(h.changeset_status_lbl(status[0][1].status if status else 'not_reviewed'))}">
135 AJAX_COMMENT_DELETE_URL = "${url('pullrequest_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}"; 143 AJAX_COMMENT_DELETE_URL = "${url('pullrequest_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}";
136 AJAX_UPDATE_PULLREQUEST = "${url('pullrequest_update',repo_name=c.repo_name,pull_request_id=c.pull_request.pull_request_id)}" 144 AJAX_UPDATE_PULLREQUEST = "${url('pullrequest_update',repo_name=c.repo_name,pull_request_id=c.pull_request.pull_request_id)}"
137 </script> 145 </script>
138 146
139 ## diff block 147 ## diff block
140 <div id="diff_block_container" style="clear:both;">
141 <%namespace name="diff_block" file="/changeset/diff_block.html"/> 148 <%namespace name="diff_block" file="/changeset/diff_block.html"/>
142 %for fid, change, f, stat in c.files: 149 %for fid, change, f, stat in c.files:
143 ${diff_block.diff_block_simple([c.changes[fid]])} 150 ${diff_block.diff_block_simple([c.changes[fid]])}
144 %endfor 151 %endfor
145 </div> 152 % if c.limited_diff:
153 <h4>${_('Changeset was too big and was cut off...')}</h4>
154 % endif
155
146 156
147 ## template for inline comment form 157 ## template for inline comment form
148 <%namespace name="comment" file="/changeset/changeset_file_comment.html"/> 158 <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
149 ${comment.comment_inline_form()} 159 ${comment.comment_inline_form()}
150 160