Files
@ 12c72fbdbfb3
Branch filter:
Location: kallithea/rhodecode/templates/pullrequests/pullrequest.html - annotation
12c72fbdbfb3
7.7 KiB
text/html
pull request: for consistency use org_repo when info is available in several places
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 | 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 f29469677319 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 79818f546538 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 f29469677319 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 f29469677319 f29469677319 c2a206162062 c2a206162062 685ebc84c2e9 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 b262e349a7a5 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 b262e349a7a5 77e376fdc4c6 f29469677319 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 1c2ba03c42b4 77e376fdc4c6 77e376fdc4c6 f285faa3a602 77e376fdc4c6 1c2ba03c42b4 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 f29469677319 f29469677319 f29469677319 51e3d60fed2f 51e3d60fed2f f29469677319 77e376fdc4c6 b262e349a7a5 b262e349a7a5 b262e349a7a5 9364776d1331 9364776d1331 9364776d1331 9364776d1331 ad3573d744ef ad3573d744ef ad3573d744ef ad3573d744ef ad3573d744ef ad3573d744ef ad3573d744ef ad3573d744ef 9364776d1331 9364776d1331 d5e42c00f3c1 d5e42c00f3c1 9364776d1331 9364776d1331 9364776d1331 9364776d1331 d5e42c00f3c1 9364776d1331 9364776d1331 b262e349a7a5 f29469677319 b262e349a7a5 f29469677319 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 7ae36df760ce 7ae36df760ce 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 f29469677319 f29469677319 77e376fdc4c6 77e376fdc4c6 b262e349a7a5 9364776d1331 9364776d1331 9364776d1331 9364776d1331 1c2ba03c42b4 0b86972de820 b262e349a7a5 b4f401524060 a91fa221a3b8 f29469677319 c9b0f1d363c7 c9b0f1d363c7 c9b0f1d363c7 c9b0f1d363c7 c9b0f1d363c7 c9b0f1d363c7 70309536c143 c2a206162062 c2a206162062 a91fa221a3b8 a91fa221a3b8 a91fa221a3b8 a91fa221a3b8 a91fa221a3b8 a91fa221a3b8 b262e349a7a5 a91fa221a3b8 a91fa221a3b8 a91fa221a3b8 a91fa221a3b8 a91fa221a3b8 a91fa221a3b8 a91fa221a3b8 a91fa221a3b8 a91fa221a3b8 a91fa221a3b8 a91fa221a3b8 b262e349a7a5 f29469677319 51e3d60fed2f b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 f29469677319 b262e349a7a5 c5dde6b5e976 5ef64956c385 5ef64956c385 5ef64956c385 5ef64956c385 5ef64956c385 5ef64956c385 c5dde6b5e976 c5dde6b5e976 c5dde6b5e976 c5dde6b5e976 5ef64956c385 c5dde6b5e976 c5dde6b5e976 5ef64956c385 5ef64956c385 5ef64956c385 f29469677319 f29469677319 f29469677319 f29469677319 b262e349a7a5 b262e349a7a5 77e376fdc4c6 | <%inherit file="/base/base.html"/>
<%def name="title()">
${c.repo_name} ${_('New pull request')}
</%def>
<%def name="breadcrumbs_links()">
${h.link_to(_(u'Home'),h.url('/'))}
»
${h.link_to(c.repo_name,h.url('changelog_home',repo_name=c.repo_name))}
»
${_('New pull request')}
</%def>
<%def name="main()">
<div class="box">
<!-- box / title -->
<div class="title">
${self.breadcrumbs()}
</div>
${h.form(url('pullrequest', repo_name=c.repo_name), method='post', id='pull_request_form')}
<div style="float:left;padding:0px 30px 30px 30px">
<input type="hidden" name="rev_start" value="${request.GET.get('rev_start')}" />
<input type="hidden" name="rev_end" value="${request.GET.get('rev_end')}" />
##ORG
<div style="float:left">
<div class="fork_user">
<div class="gravatar">
<img alt="gravatar" src="${h.gravatar_url(c.rhodecode_db_repo.user.email,24)}"/>
</div>
<span style="font-size: 20px">
${h.select('org_repo','',c.org_repos,class_='refs')}:${h.select('org_ref','',c.org_refs,class_='refs')}
</span>
<div style="padding:5px 3px 3px 42px;">${c.rhodecode_db_repo.description}</div>
</div>
<div style="clear:both;padding-top: 10px"></div>
</div>
<div style="float:left;font-size:24px;padding:0px 20px">
<img height=32 width=32 src="${h.url('/images/arrow_right_64.png')}"/>
</div>
##OTHER, most Probably the PARENT OF THIS FORK
<div style="float:left">
<div class="fork_user">
<div class="gravatar">
<img id="other_repo_gravatar" alt="gravatar" src=""/>
</div>
<span style="font-size: 20px">
${h.select('other_repo',c.default_other_repo,c.other_repos,class_='refs')}:${h.select('other_ref',c.default_other_ref,c.default_other_refs,class_='refs')}
</span>
<div id="other_repo_desc" style="padding:5px 3px 3px 42px;"></div>
</div>
<div style="clear:both;padding-top: 10px"></div>
</div>
<div style="clear:both;padding-top: 10px"></div>
## overview pulled by ajax
<div style="float:left" id="pull_request_overview"></div>
<div style="float:left;clear:both;padding:10px 10px 10px 0px;display:none">
<a id="pull_request_overview_url" href="#">${_('Detailed compare view')}</a>
</div>
</div>
<div style="float:left; border-left:1px dashed #eee">
<h4>${_('Pull request reviewers')}</h4>
<div id="reviewers" style="padding:0px 0px 0px 15px">
## members goes here !
<div class="group_members_wrap">
<ul id="review_members" class="group_members">
%for member in c.review_members:
<li id="reviewer_${member.user_id}">
<div class="reviewers_member">
<div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(member.email,14)}"/> </div>
<div style="float:left">${member.full_name} (${_('owner')})</div>
<input type="hidden" value="${member.user_id}" name="review_members" />
<span class="delete_icon action_button" onclick="removeReviewer(${member.user_id})"></span>
</div>
</li>
%endfor
</ul>
</div>
<div class='ac'>
<div class="reviewer_ac">
${h.text('user', class_='yui-ac-input')}
<span class="help-block">${_('Add reviewer to this pull request.')}</span>
<div id="reviewers_container"></div>
</div>
</div>
</div>
</div>
<h3>${_('Create new pull request')}</h3>
<div class="form">
<!-- fields -->
<div class="fields">
<div class="field">
<div class="label">
<label for="pullrequest_title">${_('Title')}:</label>
</div>
<div class="input">
${h.text('pullrequest_title',size=30)}
</div>
</div>
<div class="field">
<div class="label label-textarea">
<label for="pullrequest_desc">${_('description')}:</label>
</div>
<div class="textarea text-area editor">
${h.textarea('pullrequest_desc',size=30)}
</div>
</div>
<div class="buttons">
${h.submit('save',_('Send pull request'),class_="ui-btn large")}
${h.reset('reset',_('Reset'),class_="ui-btn large")}
</div>
</div>
</div>
${h.end_form()}
</div>
<script type="text/javascript">
var _USERS_AC_DATA = ${c.users_array|n};
var _GROUPS_AC_DATA = ${c.users_groups_array|n};
PullRequestAutoComplete('user', 'reviewers_container', _USERS_AC_DATA, _GROUPS_AC_DATA);
var other_repos_info = ${c.other_repos_info|n};
var loadPreview = function(){
YUD.setStyle(YUD.get('pull_request_overview_url').parentElement,'display','none');
//url template
var url = "${h.url('compare_url',
repo_name='__other_repo__',
org_ref_type='__other_ref_type__',
org_ref='__other_ref__',
other_repo='__org_repo__',
other_ref_type='__org_ref_type__',
other_ref='__org_ref__',
as_form=True,
rev_start=request.GET.get('rev_start',''),
rev_end=request.GET.get('rev_end',''))}";
var org_repo = YUQ('#pull_request_form #org_repo')[0].value;
var org_ref = YUQ('#pull_request_form #org_ref')[0].value.split(':');
var other_repo = YUQ('#pull_request_form #other_repo')[0].value;
var other_ref = YUQ('#pull_request_form #other_ref')[0].value.split(':');
var select_refs = YUQ('#pull_request_form select.refs')
var rev_data = {
'org_repo': org_repo,
'org_ref': org_ref[1],
'org_ref_type': org_ref[0],
'other_repo': other_repo,
'other_ref': other_ref[1],
'other_ref_type': other_ref[0],
}; // gather the org/other ref and repo here
for (k in rev_data){
url = url.replace('__'+k+'__',rev_data[k]);
}
ypjax(url,'pull_request_overview', function(data){
var sel_box = YUQ('#pull_request_form #other_repo')[0];
var repo_name = sel_box.options[sel_box.selectedIndex].value;
YUD.get('pull_request_overview_url').href = url;
YUD.setStyle(YUD.get('pull_request_overview_url').parentElement,'display','');
YUD.get('other_repo_gravatar').src = other_repos_info[repo_name]['gravatar'];
YUD.get('other_repo_desc').innerHTML = other_repos_info[repo_name]['description'];
YUD.get('other_ref').innerHTML = other_repos_info[repo_name]['revs'];
// select back the revision that was just compared
setSelectValue(YUD.get('other_ref'), rev_data['other_ref']);
})
}
## refresh automatically when something changes (org_repo can't change)
YUE.on('org_ref', 'change', function(e){
loadPreview();
});
YUE.on('other_repo', 'change', function(e){
var repo_name = e.currentTarget.value;
// replace the <select> of changed repo
YUD.get('other_ref').innerHTML = other_repos_info[repo_name]['revs'];
loadPreview();
});
YUE.on('other_ref', 'change', function(e){
loadPreview();
});
//lazy load overview after 0.5s
setTimeout(loadPreview, 500)
</script>
</%def>
|