##// END OF EJS Templates
small ui improvements to pull-request form
marcink -
r3815:8b1f6472 beta
parent child Browse files
Show More
@@ -34,7 +34,7
34 <label for="pullrequest_title">${_('Title')}:</label>
34 <label for="pullrequest_title">${_('Title')}:</label>
35 </div>
35 </div>
36 <div class="input">
36 <div class="input">
37 ${h.text('pullrequest_title',size=30)}
37 ${h.text('pullrequest_title', class_="large")}
38 </div>
38 </div>
39 </div>
39 </div>
40
40
@@ -43,7 +43,8
43 <label for="pullrequest_desc">${_('Description')}:</label>
43 <label for="pullrequest_desc">${_('Description')}:</label>
44 </div>
44 </div>
45 <div class="textarea text-area editor">
45 <div class="textarea text-area editor">
46 ${h.textarea('pullrequest_desc',size=30)}
46 ${h.textarea('pullrequest_desc',size=30, style="height:100px")}
47 <span class="help-block">${_('Write a short description on this pull request')}</span>
47 </div>
48 </div>
48 </div>
49 </div>
49
50
@@ -53,25 +54,26
53 </div>
54 </div>
54 <div class="input">
55 <div class="input">
55 ##ORG
56 ##ORG
56 <div style="float:left">
57 <div>
57 <div>
58 <div>
59 <div style="padding:5px 3px 3px 3px;">
60 <b>${_('Origin repository')}:</b> ${c.rhodecode_db_repo.description}
61 </div>
58 <span style="font-size: 20px">
62 <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')}
63 ${h.select('org_repo','',c.org_repos,class_='refs')}:${h.select('org_ref',c.default_org_ref,c.org_refs,class_='refs')}
60 </span>
64 </span>
61 <div style="padding:5px 3px 3px 20px;">${c.rhodecode_db_repo.description}</div>
62 </div>
65 </div>
63 </div>
66 </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
67
68 ##OTHER, most Probably the PARENT OF THIS FORK
68 ##OTHER, most Probably the PARENT OF THIS FORK
69 <div style="float:left">
69 <div style="border-top: 1px solid #EEE; margin: 5px 0px 0px 0px">
70 <div>
70 <div>
71 ## filled with JS
72 <div id="other_repo_desc" style="padding:5px 3px 3px 3px;">
73 </div>
71 <span style="font-size: 20px">
74 <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']}
75 ${h.select('other_repo',c.default_other_repo,c.other_repos,class_='refs')}:${c.default_other_repo_info['revs']}
73 </span>
76 </span>
74 <div id="other_repo_desc" style="padding:5px 3px 3px 20px;"></div>
75 </div>
77 </div>
76 </div>
78 </div>
77 <div style="clear:both"></div>
79 <div style="clear:both"></div>
@@ -145,8 +147,8
145 var otherrepoChanged = function(){
147 var otherrepoChanged = function(){
146 var sel_box = YUQ('#pull_request_form #other_repo')[0];
148 var sel_box = YUQ('#pull_request_form #other_repo')[0];
147 var repo_name = sel_box.options[sel_box.selectedIndex].value;
149 var repo_name = sel_box.options[sel_box.selectedIndex].value;
148
150 var _tmpl = "<b>${_('Destination repository')}</b>: {0}".format(other_repos_info[repo_name]['description']);
149 YUD.get('other_repo_desc').innerHTML = other_repos_info[repo_name]['description'];
151 YUD.get('other_repo_desc').innerHTML = _tmpl
150 // replace options of other_ref with the ones for the current other_repo
152 // replace options of other_ref with the ones for the current other_repo
151 var other_ref_selector = YUD.get('other_ref');
153 var other_ref_selector = YUD.get('other_ref');
152 var new_select = YUD.createElementFromMarkup(other_repos_info[repo_name]['revs']);
154 var new_select = YUD.createElementFromMarkup(other_repos_info[repo_name]['revs']);
General Comments 0
You need to be logged in to leave comments. Login now