Mercurial > kallithea

comparison rhodecode/templates/pullrequests/pullrequest_show.html @ 2673:d5e42c00f3c1 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
white space cleanup
author Marcin Kuzminski <marcin@python-works.com>
date Fri, 27 Jul 2012 01:06:50 +0200
parents 731e823d330e
children 7224882c4059
comparison
equal deleted inserted replaced
2672:169807710db2 2673:d5e42c00f3c1
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 %if c.pull_request.is_closed():
23 <div style="padding:10px; font-size:22px;width:100%;text-align: center; color:#88D882">${_('Closed %s') % (h.age(c.pull_request.updated_on))}</div> 23 <div style="padding:10px; font-size:22px;width:100%;text-align: center; color:#88D882">${_('Closed %s') % (h.age(c.pull_request.updated_on))}</div>
24 %endif 24 %endif
25 <h3>${_('Title')}: ${c.pull_request.title} 25 <h3>${_('Title')}: ${c.pull_request.title}
26 <div class="changeset-status-container" style="float:none"> 26 <div class="changeset-status-container" style="float:none">
27 %if c.current_changeset_status: 27 %if c.current_changeset_status:
28 <div title="${_('Pull request status')}" class="changeset-status-lbl">[${h.changeset_status_lbl(c.current_changeset_status)}]</div> 28 <div title="${_('Pull request status')}" class="changeset-status-lbl">[${h.changeset_status_lbl(c.current_changeset_status)}]</div>
29 <div class="changeset-status-ico" style="padding:4px"><img src="${h.url('/images/icons/flag_status_%s.png' % c.current_changeset_status)}" /></div> 29 <div class="changeset-status-ico" style="padding:4px"><img src="${h.url('/images/icons/flag_status_%s.png' % c.current_changeset_status)}" /></div>
30 %endif 30 %endif
31 </div> 31 </div>
32 </h3> 32 </h3>
33 <div style="white-space:pre-wrap;padding:3px 3px 5px 20px">${h.literal(c.pull_request.description)}</div> 33 <div style="white-space:pre-wrap;padding:3px 3px 5px 20px">${h.literal(c.pull_request.description)}</div>
34 <div style="padding:4px 4px 10px 20px"> 34 <div style="padding:4px 4px 10px 20px">
43 </div> 43 </div>
44 <div id="changeset_compare_view_content"> 44 <div id="changeset_compare_view_content">
45 ##CS 45 ##CS
46 <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Incoming changesets')}</div> 46 <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Incoming changesets')}</div>
47 <%include file="/compare/compare_cs.html" /> 47 <%include file="/compare/compare_cs.html" />
48 48
49 ## FILES 49 ## FILES
50 <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Files affected')}</div> 50 <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Files affected')}</div>
51 <div class="cs_files"> 51 <div class="cs_files">
52 %for fid, change, f, stat in c.files: 52 %for fid, change, f, stat in c.files:
53 <div class="cs_${change}"> 53 <div class="cs_${change}">
68 %for member,status in c.pull_request_reviewers: 68 %for member,status in c.pull_request_reviewers:
69 <li id="reviewer_${member.user_id}"> 69 <li id="reviewer_${member.user_id}">
70 <div class="reviewers_member"> 70 <div class="reviewers_member">
71 <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'))}"> 71 <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'))}">
72 <img src="${h.url(str('/images/icons/flag_status_%s.png' % (status[0][1].status if status else 'not_reviewed')))}"/> 72 <img src="${h.url(str('/images/icons/flag_status_%s.png' % (status[0][1].status if status else 'not_reviewed')))}"/>
73 </div> 73 </div>
74 <div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(member.email,14)}"/> </div> 74 <div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(member.email,14)}"/> </div>
75 <div style="float:left">${member.full_name} (${_('owner')})</div> 75 <div style="float:left">${member.full_name} (${_('owner')})</div>
76 <input type="hidden" value="${member.user_id}" name="review_members" /> 76 <input type="hidden" value="${member.user_id}" name="review_members" />
77 %if not c.pull_request.is_closed(): 77 %if not c.pull_request.is_closed():
78 <span class="delete_icon action_button" onclick="removeReviewer(${member.user_id})"></span> 78 <span class="delete_icon action_button" onclick="removeReviewer(${member.user_id})"></span>
79 %endif 79 %endif
80 </div> 80 </div>
81 </li> 81 </li>
82 %endfor 82 %endfor
83 </ul> 83 </ul>
84 </div> 84 </div>
85 %if not c.pull_request.is_closed(): 85 %if not c.pull_request.is_closed():
86 <div class='ac'> 86 <div class='ac'>
87 <div class="reviewer_ac"> 87 <div class="reviewer_ac">
88 ${h.text('user', class_='yui-ac-input')} 88 ${h.text('user', class_='yui-ac-input')}
89 <span class="help-block">${_('Add reviewer to this pull request.')}</span> 89 <span class="help-block">${_('Add reviewer to this pull request.')}</span>
90 <div id="reviewers_container"></div> 90 <div id="reviewers_container"></div>
91 </div> 91 </div>
92 <div style="padding:0px 10px"> 92 <div style="padding:0px 10px">
93 <span id="update_pull_request" class="ui-btn xsmall">${_('save')}</span> 93 <span id="update_pull_request" class="ui-btn xsmall">${_('save')}</span>
94 </div> 94 </div>
95 </div> 95 </div>
96 %endif 96 %endif
97 </div> 97 </div>
98 </div> 98 </div>
99 </div> 99 </div>
100 <script> 100 <script>
101 var _USERS_AC_DATA = ${c.users_array|n}; 101 var _USERS_AC_DATA = ${c.users_array|n};
102 var _GROUPS_AC_DATA = ${c.users_groups_array|n}; 102 var _GROUPS_AC_DATA = ${c.users_groups_array|n};
103 AJAX_COMMENT_URL = "${url('pullrequest_comment',repo_name=c.repo_name,pull_request_id=c.pull_request.pull_request_id)}"; 103 AJAX_COMMENT_URL = "${url('pullrequest_comment',repo_name=c.repo_name,pull_request_id=c.pull_request.pull_request_id)}";
112 %endfor 112 %endfor
113 113
114 ## template for inline comment form 114 ## template for inline comment form
115 <%namespace name="comment" file="/changeset/changeset_file_comment.html"/> 115 <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
116 ${comment.comment_inline_form()} 116 ${comment.comment_inline_form()}
117 117
118 ## render comments and inlines 118 ## render comments and inlines
119 ${comment.generate_comments()} 119 ${comment.generate_comments()}
120 120
121 % if not c.pull_request.is_closed(): 121 % if not c.pull_request.is_closed():
122 ## main comment form and it status 122 ## main comment form and it status
123 ${comment.comments(h.url('pullrequest_comment', repo_name=c.repo_name, 123 ${comment.comments(h.url('pullrequest_comment', repo_name=c.repo_name,
124 pull_request_id=c.pull_request.pull_request_id), 124 pull_request_id=c.pull_request.pull_request_id),
125 c.current_changeset_status, 125 c.current_changeset_status,
153 }); 153 });
154 154
155 // inject comments into they proper positions 155 // inject comments into they proper positions
156 var file_comments = YUQ('.inline-comment-placeholder'); 156 var file_comments = YUQ('.inline-comment-placeholder');
157 renderInlineComments(file_comments); 157 renderInlineComments(file_comments);
158 158
159 YUE.on(YUD.get('update_pull_request'),'click',function(e){ 159 YUE.on(YUD.get('update_pull_request'),'click',function(e){
160 160
161 var reviewers_ids = []; 161 var reviewers_ids = [];
162 var ids = YUQ('#review_members input'); 162 var ids = YUQ('#review_members input');
163 for(var i=0; i<ids.length;i++){ 163 for(var i=0; i<ids.length;i++){
164 var id = ids[i].value 164 var id = ids[i].value
165 reviewers_ids.push(id); 165 reviewers_ids.push(id);