diff --git a/rhodecode/templates/pullrequests/pullrequest.html b/rhodecode/templates/pullrequests/pullrequest.html --- a/rhodecode/templates/pullrequests/pullrequest.html +++ b/rhodecode/templates/pullrequests/pullrequest.html @@ -19,80 +19,22 @@ ${self.context_bar('showpullrequest')}
${self.breadcrumbs()}
- ${h.form(url('pullrequest', repo_name=c.repo_name), method='post', id='pull_request_form')} -
- ##ORG -
-
- - ${h.select('org_repo','',c.org_repos,class_='refs')}:${h.select('org_ref',c.default_org_ref,c.org_refs,class_='refs')} - -
${c.rhodecode_db_repo.description}
-
-
-
-
- -
- ##OTHER, most Probably the PARENT OF THIS FORK -
-
- - ${h.select('other_repo',c.default_other_repo,c.other_repos,class_='refs')}:${c.default_other_repo_info['revs']} - -
-
-
-
-
- ## overview pulled by ajax -
-
- ${_('Detailed compare view')} -
-
-
-

${_('Pull request reviewers')}

-
- ## members goes here ! -
-
    - %for member in [c.default_other_repo_info['user']]: -
  • -
    -
    gravatar
    -
    ${member['firstname']} ${member['lastname']} (${_('owner')})
    - - -
    -
  • - %endfor -
-
+ ${h.form(url('pullrequest', repo_name=c.repo_name), method='post', id='pull_request_form')} -
-
- ${h.text('user', class_='yui-ac-input')} - ${_('Add reviewer to this pull request.')} -
-
-
-
-

${_('Create new pull request')}

-
+
- ${h.text('pullrequest_title',size=30)} + ${h.text('pullrequest_title', class_="large")}
@@ -101,16 +43,96 @@ ${self.context_bar('showpullrequest')}
- ${h.textarea('pullrequest_desc',size=30)} + ${h.textarea('pullrequest_desc',size=30, style="height:100px")} + ${_('Write a short description on this pull request')} +
+
+ +
+
+ +
+
+ ##ORG +
+
+
+ ${_('Origin repository')}: ${c.rhodecode_db_repo.description} +
+ + ${h.select('org_repo','',c.org_repos,class_='refs')}:${h.select('org_ref',c.default_org_ref,c.org_refs,class_='refs')} + +
+
+ + ##OTHER, most Probably the PARENT OF THIS FORK +
+
+ ## filled with JS +
+
+ + ${h.select('other_repo',c.default_other_repo,c.other_repos,class_='refs')}:${c.default_other_repo_info['revs']} + +
+
+
-
- ${h.submit('save',_('Send pull request'),class_="ui-btn large")} - ${h.reset('reset',_('Reset'),class_="ui-btn large")} +
+
+ ${h.submit('save',_('Send pull request'),class_="ui-btn large")} + ${h.reset('reset',_('Reset'),class_="ui-btn large")} +
+
+ +
+ + ## Reviewers +
+

${_('Pull request reviewers')}

+
+ ## members goes here ! +
+
    + %for member in [c.default_other_repo_info['user']]: +
  • +
    +
    gravatar
    +
    ${member['firstname']} ${member['lastname']} (${_('owner')})
    + + +
    +
  • + %endfor +
+
+ +
+
+ ${h.text('user', class_='yui-ac-input')} + ${_('Add reviewer to this pull request.')} +
+
+
+
+
+ +
+ +

${_('Changesets')}

+
+ ## overview pulled by ajax +
+
+ ${_('Detailed compare view')}
+
+
+ ${h.end_form()} @@ -125,8 +147,8 @@ ${self.context_bar('showpullrequest')} var otherrepoChanged = function(){ var sel_box = YUQ('#pull_request_form #other_repo')[0]; var repo_name = sel_box.options[sel_box.selectedIndex].value; - - YUD.get('other_repo_desc').innerHTML = other_repos_info[repo_name]['description']; + var _tmpl = "${_('Destination repository')}: {0}".format(other_repos_info[repo_name]['description']); + YUD.get('other_repo_desc').innerHTML = _tmpl // replace options of other_ref with the ones for the current other_repo var other_ref_selector = YUD.get('other_ref'); var new_select = YUD.createElementFromMarkup(other_repos_info[repo_name]['revs']);