##// END OF EJS Templates
upstream » kallithea
RSS

Clone from https://kallithea-scm.org/repos/kallithea

pullrequests: reorganize PR creation page - make it more like the view page
Mads Kiilerich -
r3814:8854ddd5 beta
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -19,73 +19,15 b''
19 19 <div class="title">
20 20 ${self.breadcrumbs()}
21 21 </div>
22 ${h.form(url('pullrequest', repo_name=c.repo_name), method='post', id='pull_request_form')}
23 <div style="float:left;padding:0px 30px 30px 30px">
24 ##ORG
25 <div style="float:left">
26 <div>
27 <span style="font-size: 20px">
28 ${h.select('org_repo','',c.org_repos,class_='refs')}:${h.select('org_ref',c.default_org_ref,c.org_refs,class_='refs')}
29 </span>
30 <div style="padding:5px 3px 3px 20px;">${c.rhodecode_db_repo.description}</div>
31 </div>
32 <div style="clear:both;padding-top: 10px"></div>
33 </div>
34 <div style="float:left;font-size:24px;padding:0px 20px">
35 <img height=32 width=32 src="${h.url('/images/arrow_right_64.png')}"/>
36 </div>
37 22
38 ##OTHER, most Probably the PARENT OF THIS FORK
39 <div style="float:left">
40 <div>
41 <span style="font-size: 20px">
42 ${h.select('other_repo',c.default_other_repo,c.other_repos,class_='refs')}:${c.default_other_repo_info['revs']}
43 </span>
44 <div id="other_repo_desc" style="padding:5px 3px 3px 20px;"></div>
45 </div>
46 <div style="clear:both;padding-top: 10px"></div>
47 </div>
48 <div style="clear:both;padding-top: 10px"></div>
49 ## overview pulled by ajax
50 <div style="float:left" id="pull_request_overview"></div>
51 <div style="float:left;clear:both;padding:10px 10px 10px 0px;display:none">
52 <a id="pull_request_overview_url" href="#">${_('Detailed compare view')}</a>
53 </div>
54 </div>
55 <div style="float:left; border-left:1px dashed #eee">
56 <h4>${_('Pull request reviewers')}</h4>
57 <div id="reviewers" style="padding:0px 0px 0px 15px">
58 ## members goes here !
59 <div class="group_members_wrap">
60 <ul id="review_members" class="group_members">
61 %for member in [c.default_other_repo_info['user']]:
62 <li id="reviewer_${member['user_id']}">
63 <div class="reviewers_member">
64 <div class="gravatar"><img alt="gravatar" src="${member['gravatar_link']}"/> </div>
65 <div style="float:left">${member['firstname']} ${member['lastname']} (${_('owner')})</div>
66 <input type="hidden" value="${member['user_id']}" name="review_members" />
67 <span class="delete_icon action_button" onclick="removeReviewMember(${member['user_id']})"></span>
68 </div>
69 </li>
70 %endfor
71 </ul>
72 </div>
23 ${h.form(url('pullrequest', repo_name=c.repo_name), method='post', id='pull_request_form')}
73 24
74 <div class='ac'>
75 <div class="reviewer_ac">
76 ${h.text('user', class_='yui-ac-input')}
77 <span class="help-block">${_('Add reviewer to this pull request.')}</span>
78 <div id="reviewers_container"></div>
79 </div>
80 </div>
81 </div>
82 </div>
83 25 <h3>${_('Create new pull request')}</h3>
84 26
85 27 <div class="form">
86 28 <!-- fields -->
87 29
88 <div class="fields">
30 <div class="fields" style="float:left;width:50%;padding-right:30px;">
89 31
90 32 <div class="field">
91 33 <div class="label">
@@ -105,12 +47,90 b''
105 47 </div>
106 48 </div>
107 49
108 <div class="buttons">
109 ${h.submit('save',_('Send pull request'),class_="ui-btn large")}
110 ${h.reset('reset',_('Reset'),class_="ui-btn large")}
50 <div class="field">
51 <div class="label label-textarea">
52 <label for="pullrequest_desc">${_('Changeset flow')}:</label>
53 </div>
54 <div class="input">
55 ##ORG
56 <div style="float:left">
57 <div>
58 <span style="font-size: 20px">
59 ${h.select('org_repo','',c.org_repos,class_='refs')}:${h.select('org_ref',c.default_org_ref,c.org_refs,class_='refs')}
60 </span>
61 <div style="padding:5px 3px 3px 20px;">${c.rhodecode_db_repo.description}</div>
62 </div>
63 </div>
64 <div style="float:left;font-size:24px;padding:0px 20px">
65 <img height=32 width=32 src="${h.url('/images/arrow_right_64.png')}"/>
66 </div>
67
68 ##OTHER, most Probably the PARENT OF THIS FORK
69 <div style="float:left">
70 <div>
71 <span style="font-size: 20px">
72 ${h.select('other_repo',c.default_other_repo,c.other_repos,class_='refs')}:${c.default_other_repo_info['revs']}
73 </span>
74 <div id="other_repo_desc" style="padding:5px 3px 3px 20px;"></div>
75 </div>
76 </div>
77 <div style="clear:both"></div>
78 </div>
79 </div>
80
81 <div class="field">
82 <div class="buttons">
83 ${h.submit('save',_('Send pull request'),class_="ui-btn large")}
84 ${h.reset('reset',_('Reset'),class_="ui-btn large")}
85 </div>
86 </div>
87
88 </div>
89
90 ## Reviewers
91 <div style="float:left; border-left:1px dashed #eee">
92 <h4>${_('Pull request reviewers')}</h4>
93 <div id="reviewers" style="padding:0px 0px 0px 15px">
94 ## members goes here !
95 <div class="group_members_wrap">
96 <ul id="review_members" class="group_members">
97 %for member in [c.default_other_repo_info['user']]:
98 <li id="reviewer_${member['user_id']}">
99 <div class="reviewers_member">
100 <div class="gravatar"><img alt="gravatar" src="${member['gravatar_link']}"/> </div>
101 <div style="float:left">${member['firstname']} ${member['lastname']} (${_('owner')})</div>
102 <input type="hidden" value="${member['user_id']}" name="review_members" />
103 <span class="delete_icon action_button" onclick="removeReviewMember(${member['user_id']})"></span>
104 </div>
105 </li>
106 %endfor
107 </ul>
108 </div>
109
110 <div class='ac'>
111 <div class="reviewer_ac">
112 ${h.text('user', class_='yui-ac-input')}
113 <span class="help-block">${_('Add reviewer to this pull request.')}</span>
114 <div id="reviewers_container"></div>
115 </div>
116 </div>
117 </div>
118 </div>
119
120 <div style="clear:both;padding: 0 0 30px 0;"></div>
121
122 <h4>${_('Changesets')}</h4>
123 <div style="float:left;padding:0px 30px 30px 30px">
124 ## overview pulled by ajax
125 <div style="float:left" id="pull_request_overview"></div>
126 <div style="float:left;clear:both;padding:10px 10px 10px 0px;display:none">
127 <a id="pull_request_overview_url" href="#">${_('Detailed compare view')}</a>
111 128 </div>
112 129 </div>
130 <div style="clear:both;"></div>
131
113 132 </div>
133
114 134 ${h.end_form()}
115 135
116 136 </div>
General Comments 0
You need to be logged in to leave comments. Login now