Mercurial > kallithea
changeset 3815:8b1f64722d46 beta
small ui improvements to pull-request form
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Tue, 07 May 2013 00:06:37 +0200 |
parents | 8854ddd51b48 |
children | 6e4e8a03afc4 |
files | rhodecode/templates/pullrequests/pullrequest.html |
diffstat | 1 files changed, 13 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/templates/pullrequests/pullrequest.html Mon Apr 08 23:34:02 2013 +0200 +++ b/rhodecode/templates/pullrequests/pullrequest.html Tue May 07 00:06:37 2013 +0200 @@ -34,7 +34,7 @@ <label for="pullrequest_title">${_('Title')}:</label> </div> <div class="input"> - ${h.text('pullrequest_title',size=30)} + ${h.text('pullrequest_title', class_="large")} </div> </div> @@ -43,7 +43,8 @@ <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> @@ -53,25 +54,26 @@ </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> @@ -145,8 +147,8 @@ 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']);