# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1372413013 -7200
# Node ID 33a58b74bbc3cde17147185b6aca6d238b202d67
# Parent  7a59774291257254b72e5645506bde42d796eab4
pull requests: include 'detailed view' and ancestor information in ajax chunk, open diff in another window

diff -r 7a5977429125 -r 33a58b74bbc3 kallithea/templates/compare/compare_cs.html
--- a/kallithea/templates/compare/compare_cs.html	Fri Jun 28 11:50:13 2013 +0200
+++ b/kallithea/templates/compare/compare_cs.html	Fri Jun 28 11:50:13 2013 +0200
@@ -40,12 +40,26 @@
         </tr>
     %endfor
     </table>
-    %if c.ancestor:
-      <div class="ancestor">${_('Ancestor')}:
+    %if c.as_form:
+      <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">
+      ## links should perhaps use ('rev', c.org_rev) instead ...
+      ${h.link_to(_('Show merge diff'),
+        h.url('compare_url',
+          repo_name=c.org_repo.repo_name,
+          org_ref_type=c.org_ref_type, org_ref_name=c.org_ref_name,
+          other_repo=c.other_repo.repo_name,
+          other_ref_type=c.other_ref_type, other_ref_name=c.other_ref_name,
+          merge='1'),
+        )}
+      </div>
+      <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">
+        ${_('Common ancestor')}:
+        %if c.ancestor:
         ${h.link_to(h.short_id(c.ancestor),h.url('changeset_home',repo_name=c.repo_name,revision=c.ancestor))}
+        %else:
+        ${_('No common ancestor found - repositories are unrelated')}
+        %endif
       </div>
-    %endif
-    %if c.as_form:
       ${h.hidden('ancestor_rev',c.ancestor)}
       ${h.hidden('merge_rev',c.cs_ranges[-1].raw_id)}
     %endif
diff -r 7a5977429125 -r 33a58b74bbc3 kallithea/templates/pullrequests/pullrequest.html
--- a/kallithea/templates/pullrequests/pullrequest.html	Fri Jun 28 11:50:13 2013 +0200
+++ b/kallithea/templates/pullrequests/pullrequest.html	Fri Jun 28 11:50:13 2013 +0200
@@ -124,9 +124,6 @@
         <div style="float:left;padding:0px 30px 30px 30px">
            ## overview pulled by ajax
            <div style="float:left" id="pull_request_overview"></div>
-           <div style="float:left;clear:both;padding:10px 10px 10px 0px;display:none">
-                <a id="pull_request_overview_url" href="#">${_('Detailed compare view')}</a>
-           </div>
         </div>
         <div style="clear:both;"></div>
 
@@ -199,9 +196,6 @@
 
       YUD.get('pull_request_overview').innerHTML = "${_('Loading ...')}";
       ypjax(url,'pull_request_overview');
-
-      YUD.get('pull_request_overview_url').href = url; // shouldn't have as_form ... but ...
-      YUD.setStyle(YUD.get('pull_request_overview_url').parentElement,'display','');
   }
 
   ## refresh automatically when something changes (org_repo can't change)