##// 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,8 +19,39 b''
19 <div class="title">
19 <div class="title">
20 ${self.breadcrumbs()}
20 ${self.breadcrumbs()}
21 </div>
21 </div>
22
22 ${h.form(url('pullrequest', repo_name=c.repo_name), method='post', id='pull_request_form')}
23 ${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
25 <h3>${_('Create new pull request')}</h3>
26
27 <div class="form">
28 <!-- fields -->
29
30 <div class="fields" style="float:left;width:50%;padding-right:30px;">
31
32 <div class="field">
33 <div class="label">
34 <label for="pullrequest_title">${_('Title')}:</label>
35 </div>
36 <div class="input">
37 ${h.text('pullrequest_title',size=30)}
38 </div>
39 </div>
40
41 <div class="field">
42 <div class="label label-textarea">
43 <label for="pullrequest_desc">${_('Description')}:</label>
44 </div>
45 <div class="textarea text-area editor">
46 ${h.textarea('pullrequest_desc',size=30)}
47 </div>
48 </div>
49
50 <div class="field">
51 <div class="label label-textarea">
52 <label for="pullrequest_desc">${_('Changeset flow')}:</label>
53 </div>
54 <div class="input">
24 ##ORG
55 ##ORG
25 <div style="float:left">
56 <div style="float:left">
26 <div>
57 <div>
@@ -29,7 +60,6 b''
29 </span>
60 </span>
30 <div style="padding:5px 3px 3px 20px;">${c.rhodecode_db_repo.description}</div>
61 <div style="padding:5px 3px 3px 20px;">${c.rhodecode_db_repo.description}</div>
31 </div>
62 </div>
32 <div style="clear:both;padding-top: 10px"></div>
33 </div>
63 </div>
34 <div style="float:left;font-size:24px;padding:0px 20px">
64 <div style="float:left;font-size:24px;padding:0px 20px">
35 <img height=32 width=32 src="${h.url('/images/arrow_right_64.png')}"/>
65 <img height=32 width=32 src="${h.url('/images/arrow_right_64.png')}"/>
@@ -43,15 +73,21 b''
43 </span>
73 </span>
44 <div id="other_repo_desc" style="padding:5px 3px 3px 20px;"></div>
74 <div id="other_repo_desc" style="padding:5px 3px 3px 20px;"></div>
45 </div>
75 </div>
46 <div style="clear:both;padding-top: 10px"></div>
47 </div>
76 </div>
48 <div style="clear:both;padding-top: 10px"></div>
77 <div style="clear:both"></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>
78 </div>
54 </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
55 <div style="float:left; border-left:1px dashed #eee">
91 <div style="float:left; border-left:1px dashed #eee">
56 <h4>${_('Pull request reviewers')}</h4>
92 <h4>${_('Pull request reviewers')}</h4>
57 <div id="reviewers" style="padding:0px 0px 0px 15px">
93 <div id="reviewers" style="padding:0px 0px 0px 15px">
@@ -80,37 +116,21 b''
80 </div>
116 </div>
81 </div>
117 </div>
82 </div>
118 </div>
83 <h3>${_('Create new pull request')}</h3>
84
119
85 <div class="form">
120 <div style="clear:both;padding: 0 0 30px 0;"></div>
86 <!-- fields -->
87
88 <div class="fields">
89
121
90 <div class="field">
122 <h4>${_('Changesets')}</h4>
91 <div class="label">
123 <div style="float:left;padding:0px 30px 30px 30px">
92 <label for="pullrequest_title">${_('Title')}:</label>
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>
93 </div>
128 </div>
94 <div class="input">
95 ${h.text('pullrequest_title',size=30)}
96 </div>
129 </div>
130 <div style="clear:both;"></div>
131
97 </div>
132 </div>
98
133
99 <div class="field">
100 <div class="label label-textarea">
101 <label for="pullrequest_desc">${_('Description')}:</label>
102 </div>
103 <div class="textarea text-area editor">
104 ${h.textarea('pullrequest_desc',size=30)}
105 </div>
106 </div>
107
108 <div class="buttons">
109 ${h.submit('save',_('Send pull request'),class_="ui-btn large")}
110 ${h.reset('reset',_('Reset'),class_="ui-btn large")}
111 </div>
112 </div>
113 </div>
114 ${h.end_form()}
134 ${h.end_form()}
115
135
116 </div>
136 </div>
General Comments 0
You need to be logged in to leave comments. Login now