kallithea Changeset - 8b1f64722d46

Changeset - 8b1f64722d46

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Marcin Kuzminski - 13 years ago 2013-05-07 00:06:37
marcin@python-works.com

small ui improvements to pull-request form

1 file changed with 13 insertions and 11 deletions:

rhodecode/templates/pullrequests/pullrequest.html

0 comments (0 inline, 0 general)

rhodecode/templates/pullrequests/pullrequest.html

➞

Show inline comments

@@ @@ -31,50 +31,52 @@ ${self.context_bar('showpullrequest')} @@
              <div class="field">
                 <div class="label">
                     <label for="pullrequest_title">${_('Title')}:</label>
                 </div>
                 <div class="input">
-                    ${h.text('pullrequest_title',size=30)}
+                    ${h.text('pullrequest_title', class_="large")}
                 </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)}
                     ${h.textarea('pullrequest_desc',size=30, style="height:100px")}
                     <span class="help-block">${_('Write a short description on this pull request')}</span>
                 </div>
             </div>
             <div class="field">
                 <div class="label label-textarea">
                     <label for="pullrequest_desc">${_('Changeset flow')}:</label>
                 </div>
                 <div class="input">
                     ##ORG
-                    <div style="float:left">
                     <div>
                         <div>
                             <div style="padding:5px 3px 3px 3px;">
                             <b>${_('Origin repository')}:</b> ${c.rhodecode_db_repo.description}
                             </div>
                             <span style="font-size: 20px">
                             ${h.select('org_repo','',c.org_repos,class_='refs')}:${h.select('org_ref',c.default_org_ref,c.org_refs,class_='refs')}
                             </span>
                             <div style="padding:5px 3px 3px 20px;">${c.rhodecode_db_repo.description}</div>
                         </div>
                     </div>
                     <div style="float:left;font-size:24px;padding:0px 20px">
                         <img height=32 width=32 src="${h.url('/images/arrow_right_64.png')}"/>
                     </div>
                     ##OTHER, most Probably the PARENT OF THIS FORK
-                    <div style="float:left">
+                    <div style="border-top: 1px solid #EEE; margin: 5px 0px 0px 0px">
                         <div>
                             ## filled with JS
                             <div id="other_repo_desc" style="padding:5px 3px 3px 3px;">
                             </div>
                             <span style="font-size: 20px">
                             ${h.select('other_repo',c.default_other_repo,c.other_repos,class_='refs')}:${c.default_other_repo_info['revs']}
                             </span>
                             <div id="other_repo_desc" style="padding:5px 3px 3px 20px;"></div>
                         </div>
                     </div>
                     <div style="clear:both"></div>
                 </div>
             </div>
@@ @@ -142,14 +144,14 @@ ${self.context_bar('showpullrequest')} @@
   var other_repos_info = ${c.other_repos_info|n};
   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 = "<b>${_('Destination repository')}</b>: {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']);
       var new_selectedIndex = new_select.selectedIndex;
       other_ref_selector.innerHTML = ""; // clear old options
       while (new_select.length > 0){ // children will be popped when appened to other_ref_selector

0 comments (0 inline, 0 general)