##// END OF EJS Templates
added optional args to tox script, and fixed mysql commands
added optional args to tox script, and fixed mysql commands

File last commit:

r2541:1c2ba03c beta
r2587:c1c66976 beta
Show More
pullrequest.html
196 lines | 7.9 KiB | text/html | HtmlLexer
<%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('/'))}
&raquo;
${h.link_to(c.repo_name,h.url('changelog_home',repo_name=c.repo_name))}
&raquo;
${_('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">
<div style="padding:0px 5px 5px 5px">
<span>
<a id="refresh" href="#">
<img class="icon" title="${_('Refresh')}" alt="${_('Refresh')}" src="${h.url('/images/icons/arrow_refresh.png')}"/>
${_('refresh overview')}
</a>
</span>
</div>
##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_pull_request ,c.other_repos,class_='refs')}:${h.select('other_ref','',c.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">
##TODO: make this nicer :)
<table class="table noborder">
<tr>
<td>
<div>
<div style="float:left">
<div class="text" style="padding: 0px 0px 6px;">${_('Chosen reviewers')}</div>
${h.select('review_members',[x[0] for x in c.review_members],c.review_members,multiple=True,size=8,style="min-width:210px")}
<div id="remove_all_elements" style="cursor:pointer;text-align:center">
${_('Remove all elements')}
<img alt="remove" style="vertical-align:text-bottom" src="${h.url('/images/icons/arrow_right.png')}"/>
</div>
</div>
<div style="float:left;width:20px;padding-top:50px">
<img alt="add" id="add_element"
style="padding:2px;cursor:pointer"
src="${h.url('/images/icons/arrow_left.png')}"/>
<br />
<img alt="remove" id="remove_element"
style="padding:2px;cursor:pointer"
src="${h.url('/images/icons/arrow_right.png')}"/>
</div>
<div style="float:left">
<div class="text" style="padding: 0px 0px 6px;">${_('Available reviewers')}</div>
${h.select('available_members',[],c.available_members,multiple=True,size=8,style="min-width:210px")}
<div id="add_all_elements" style="cursor:pointer;text-align:center">
<img alt="add" style="vertical-align:text-bottom" src="${h.url('/images/icons/arrow_left.png')}"/>
${_('Add all elements')}
</div>
</div>
</div>
</td>
</tr>
</table>
</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-button")}
${h.reset('reset',_('Reset'),class_="ui-button")}
</div>
</div>
</div>
${h.end_form()}
</div>
<script type="text/javascript">
MultiSelectWidget('review_members','available_members','pull_request_form');
var other_repos_info = ${c.other_repos_info|n};
var loadPreview = function(){
YUD.setStyle(YUD.get('pull_request_overview_url').parentElement,'display','none');
var url = "${h.url('compare_url',
repo_name='org_repo',
org_ref_type='branch', org_ref='org_ref',
other_ref_type='branch', other_ref='other_ref',
repo='other_repo',
as_form=True)}";
var select_refs = YUQ('#pull_request_form select.refs')
for(var i=0;i<select_refs.length;i++){
var select_ref = select_refs[i];
var select_ref_data = select_ref.value.split(':');
var key = null;
var val = null;
if(select_ref_data.length>1){
key = select_ref.name+"_type";
val = select_ref_data[0];
url = url.replace(key,val);
key = select_ref.name;
val = select_ref_data[1];
url = url.replace(key,val);
}else{
key = select_ref.name;
val = select_ref.value;
url = url.replace(key,val);
}
}
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'];
})
}
YUE.on('refresh','click',function(e){
loadPreview()
})
//lazy load overview after 0.5s
setTimeout(loadPreview, 500)
</script>
</%def>