diff --git a/rhodecode/public/css/main.less b/rhodecode/public/css/main.less --- a/rhodecode/public/css/main.less +++ b/rhodecode/public/css/main.less @@ -367,26 +367,23 @@ ul.auth_plugins { } .pr-mergeinfo { - clear: both; - margin: .5em 0; - - input { - min-width: 100% !important; + min-width: 95% !important; padding: 0 !important; border: 0; - } +} +.pr-mergeinfo-copy { + padding: 0 0; } .pr-pullinfo { - clear: both; - margin: .5em 0; - - input { - min-width: 100% !important; + min-width: 95% !important; padding: 0 !important; border: 0; - } } +.pr-pullinfo-copy { + padding: 0 0; +} + #pr-title-input { width: 72%; diff --git a/rhodecode/templates/pullrequests/pullrequest_show.mako b/rhodecode/templates/pullrequests/pullrequest_show.mako --- a/rhodecode/templates/pullrequests/pullrequest_show.mako +++ b/rhodecode/templates/pullrequests/pullrequest_show.mako @@ -89,13 +89,17 @@ ${h.show_id(c.ancestor_commit)} % endif -
- %if h.is_hg(c.pull_request.source_repo): - - %elif h.is_git(c.pull_request.source_repo): - - %endif + %if h.is_hg(c.pull_request.source_repo): + <% clone_url = 'hg pull -r {} {}'.format(h.short_id(c.source_ref), c.pull_request.source_repo.clone_url()) %> + %elif h.is_git(c.pull_request.source_repo): + <% clone_url = 'git pull {} {}'.format(c.pull_request.source_repo.clone_url(), c.pull_request.source_ref_parts.name) %> + %endif + +
+ +
+
@@ -126,17 +130,19 @@
% if not c.pull_request.is_closed() and c.pull_request.shadow_merge_ref: -
%if h.is_hg(c.pull_request.target_repo): - + <% clone_url = 'hg clone --update {} {} pull-request-{}'.format(c.pull_request.shadow_merge_ref.name, c.shadow_clone_url, c.pull_request.pull_request_id) %> %elif h.is_git(c.pull_request.target_repo): - + <% clone_url = 'git clone --branch {} {} pull-request-{}'.format(c.pull_request.shadow_merge_ref.name, c.shadow_clone_url, c.pull_request.pull_request_id) %> %endif -
+
+ + +
% else: -
- ${_('Shadow repository data not available')}. -
+
+ ${_('Shadow repository data not available')}. +
% endif