##// END OF EJS Templates
added highlight lines field in ChangesetComments, will be used...
added highlight lines field in ChangesetComments, will be used later for attaching comments to blocks

File last commit:

r2720:0f7355d3 beta
r2724:29db53a7 beta
Show More
pullrequest.html
189 lines | 7.0 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">
Added dynamic data loading for other repo we open pull request against...
r2541 <img id="other_repo_gravatar" alt="gravatar" src=""/>
pull requests draft UI
r2244 </div>
<span style="font-size: 20px">
Load generated revs while switching to other sources of pull-requests....
r2720 ${h.select('other_repo',c.default_pull_request ,c.other_repos,class_='refs')}:${h.select('other_ref','',c.default_revs,class_='refs')}
pull requests draft UI
r2244 </span>
Added dynamic data loading for other repo we open pull request against...
r2541 <div id="other_repo_desc" style="padding:5px 3px 3px 42px;"></div>
pull requests draft UI
r2244 </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">
Added autocomplete widget for pull request reviewers, in exchange of 90s style...
r2612 ## members goes here !
<div class="group_members_wrap">
<ul id="review_members" class="group_members">
%for member in c.review_members:
added option to remove members added using autocomplete widget from pull...
r2613 <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>
Added autocomplete widget for pull request reviewers, in exchange of 90s style...
r2612 %endfor
</ul>
white space cleanup
r2673 </div>
Added autocomplete widget for pull request reviewers, in exchange of 90s style...
r2612 <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>
white space cleanup
r2673 <div id="reviewers_container"></div>
Added autocomplete widget for pull request reviewers, in exchange of 90s style...
r2612 </div>
</div>
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">
removed deprecated ui-button
r2607 ${h.submit('save',_('Send pull request'),class_="ui-btn large")}
${h.reset('reset',_('Reset'),class_="ui-btn large")}
pull requests draft UI
r2244 </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">
Added autocomplete widget for pull request reviewers, in exchange of 90s style...
r2612 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);
Added dynamic data loading for other repo we open pull request against...
r2541 var other_repos_info = ${c.other_repos_info|n};
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',
fixed selecting quick compare view for tags/bookmarks in pull-request form
r2710 repo_name='org_repo',
org_ref_type='org_ref_type', org_ref='org_ref',
other_ref_type='other_ref_type', other_ref='other_ref',
repo='other_repo',
as_form=True)}";
Added basic models for saving open pull requests...
r2434
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){
Added dynamic data loading for other repo we open pull request against...
r2541 var sel_box = YUQ('#pull_request_form #other_repo')[0];
var repo_name = sel_box.options[sel_box.selectedIndex].value;
added link for detailed overview in pull-request form
r2396 YUD.get('pull_request_overview_url').href = url;
YUD.setStyle(YUD.get('pull_request_overview_url').parentElement,'display','');
Added dynamic data loading for other repo we open pull request against...
r2541 YUD.get('other_repo_gravatar').src = other_repos_info[repo_name]['gravatar'];
YUD.get('other_repo_desc').innerHTML = other_repos_info[repo_name]['description'];
Load generated revs while switching to other sources of pull-requests....
r2720 YUD.get('other_ref').innerHTML = other_repos_info[repo_name]['revs'];
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>