##// END OF EJS Templates
When using tags in git use the link to Commit instead of messing with Tag object
When using tags in git use the link to Commit instead of messing with Tag object

File last commit:

r2492:79818f54 beta
r2537:952dd2c9 beta
Show More
pullrequest.html
192 lines | 7.6 KiB | text/html | HtmlLexer
pull requests draft UI
r2244 <%inherit file="/base/base.html"/>
<%def name="title()">
Added basic models for saving open pull requests...
r2434 ${c.repo_name} ${_('New pull request')}
pull requests draft UI
r2244 </%def>
<%def name="breadcrumbs_links()">
Takumi IINO
i18n 'Home' in breadcrumbs
r2492 ${h.link_to(_(u'Home'),h.url('/'))}
pull requests draft UI
r2244 &raquo;
${h.link_to(c.repo_name,h.url('changelog_home',repo_name=c.repo_name))}
&raquo;
Added basic models for saving open pull requests...
r2434 ${_('New pull request')}
pull requests draft UI
r2244 </%def>
<%def name="main()">
<div class="box">
<!-- box / title -->
<div class="title">
${self.breadcrumbs()}
</div>
Added basic models for saving open pull requests...
r2434 ${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>
pull requests draft UI
r2244 ##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">
created pull-request overview
r2395 ${h.select('org_repo','',c.org_repos,class_='refs')}:${h.select('org_ref','',c.org_refs,class_='refs')}
pull requests draft UI
r2244 </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">
created pull-request overview
r2395 <img height=32 width=32 src="${h.url('/images/arrow_right_64.png')}"/>
pull requests draft UI
r2244 </div>
Added basic models for saving open pull requests...
r2434
pull requests draft UI
r2244 ##OTHER, most Probably the PARENT OF THIS FORK
<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">
Added basic models for saving open pull requests...
r2434 ${h.select('other_repo',c.default_pull_request ,c.other_repos,class_='refs')}:${h.select('other_ref','',c.other_refs,class_='refs')}
pull requests draft UI
r2244 </span>
<div style="padding:5px 3px 3px 42px;">${c.rhodecode_db_repo.description}</div>
</div>
<div style="clear:both;padding-top: 10px"></div>
</div>
Added basic models for saving open pull requests...
r2434 <div style="clear:both;padding-top: 10px"></div>
## overview pulled by ajax
<div style="float:left" id="pull_request_overview"></div>
added link for detailed overview in pull-request form
r2396 <div style="float:left;clear:both;padding:10px 10px 10px 0px;display:none">
<a id="pull_request_overview_url" href="#">${_('Detailed compare view')}</a>
Added basic models for saving open pull requests...
r2434 </div>
pull requests draft UI
r2244 </div>
created pull-request overview
r2395 <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">
Added basic models for saving open pull requests...
r2434 <div class="text" style="padding: 0px 0px 6px;">${_('Chosen reviewers')}</div>
created pull-request overview
r2395 ${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>
Added basic models for saving open pull requests...
r2434 </table>
created pull-request overview
r2395 </div>
Added basic models for saving open pull requests...
r2434 </div>
created pull-request overview
r2395 <h3>${_('Create new pull request')}</h3>
Added basic models for saving open pull requests...
r2434
pull requests draft UI
r2244 <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>
Added basic models for saving open pull requests...
r2434 ${h.end_form()}
pull requests draft UI
r2244 </div>
created pull-request overview
r2395 <script type="text/javascript">
MultiSelectWidget('review_members','available_members','pull_request_form');
Added basic models for saving open pull requests...
r2434
created pull-request overview
r2395 var loadPreview = function(){
added link for detailed overview in pull-request form
r2396 YUD.setStyle(YUD.get('pull_request_overview_url').parentElement,'display','none');
Added basic models for saving open pull requests...
r2434 var url = "${h.url('compare_url',
created pull-request overview
r2395 repo_name='org_repo',
org_ref_type='branch', org_ref='org_ref',
other_ref_type='branch', other_ref='other_ref',
Added basic models for saving open pull requests...
r2434 repo='other_repo',
as_form=True)}";
created pull-request overview
r2395 var select_refs = YUQ('#pull_request_form select.refs')
Added basic models for saving open pull requests...
r2434
created pull-request overview
r2395 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);
Added basic models for saving open pull requests...
r2434
created pull-request overview
r2395 key = select_ref.name;
val = select_ref_data[1];
url = url.replace(key,val);
Added basic models for saving open pull requests...
r2434
created pull-request overview
r2395 }else{
key = select_ref.name;
val = select_ref.value;
url = url.replace(key,val);
}
}
Added basic models for saving open pull requests...
r2434
added link for detailed overview in pull-request form
r2396 ypjax(url,'pull_request_overview', function(data){
YUD.get('pull_request_overview_url').href = url;
YUD.setStyle(YUD.get('pull_request_overview_url').parentElement,'display','');
Added basic models for saving open pull requests...
r2434 })
created pull-request overview
r2395 }
YUE.on('refresh','click',function(e){
loadPreview()
})
Added basic models for saving open pull requests...
r2434
//lazy load overview after 0.5s
setTimeout(loadPreview, 500)
created pull-request overview
r2395 </script>
pull requests draft UI
r2244 </%def>