From f3af27027875fc27d42c86cd33c24e5b35bd544d 2015-01-27 21:24:12
From: Thomas Kluyver <takowl@gmail.com>
Date: 2015-01-27 21:24:12
Subject: [PATCH] Merge pull request #7605 from minrk/f-the-pager

fix the pager and tooltip locations
---

diff --git a/IPython/html/static/notebook/js/tooltip.js b/IPython/html/static/notebook/js/tooltip.js
index 18888f5..d8c61eb 100644
--- a/IPython/html/static/notebook/js/tooltip.js
+++ b/IPython/html/static/notebook/js/tooltip.js
@@ -65,7 +65,7 @@ define([
         this._clocklink = $('<a/>').attr('href', "#");
         this._clocklink.attr('role', "button");
         this._clocklink.addClass('ui-button');
-        this._clocklink.attr('title', 'Tootip is not dismissed while typing for 10 seconds');
+        this._clocklink.attr('title', 'Tooltip is not dismissed while typing for 10 seconds');
         var clockspan = $('<span/>').text('Close');
         clockspan.addClass('ui-icon');
         clockspan.addClass('ui-icon-clock');
@@ -273,33 +273,38 @@ define([
         this.name = content.name;
 
         // do some math to have the tooltip arrow on more or less on left or right
-        // width of the editor
-        var w = $(this.code_mirror.getScrollerElement()).width();
-        // ofset of the editor
-        var o = $(this.code_mirror.getScrollerElement()).offset();
-
-        // whatever anchor/head order but arrow at mid x selection
-        var anchor = this.code_mirror.cursorCoords(false);
-        var head  = this.code_mirror.cursorCoords(true);
-        var xinit = (head.left+anchor.left)/2;
-        var xinter = o.left + (xinit - o.left) / w * (w - 450);
-        var posarrowleft = xinit - xinter;
+        // position of the editor
+        var cm_pos = $(this.code_mirror.getWrapperElement()).position();
+
+        // anchor and head positions are local within CodeMirror element
+        var anchor = this.code_mirror.cursorCoords(false, 'local');
+        var head = this.code_mirror.cursorCoords(true, 'local');
+        // locate the target at the center of anchor, head
+        var center_left = (head.left + anchor.left) / 2;
+        // locate the left edge of the tooltip, at most 450 px left of the arrow
+        var edge_left = Math.max(center_left - 450, 0);
+        // locate the arrow at the cursor. A 24 px offset seems necessary.
+        var arrow_left = center_left - edge_left - 24;
+        
+        // locate left, top within container element
+        var left = (cm_pos.left + edge_left) + 'px';
+        var top = (cm_pos.top + head.bottom + 10) + 'px';
 
         if (this._hidden === false) {
             this.tooltip.animate({
-                'left': xinter - 30 + 'px',
-                'top': (head.bottom + 10) + 'px'
+                left: left,
+                top: top
             });
         } else {
             this.tooltip.css({
-                'left': xinter - 30 + 'px'
+                left: left
             });
             this.tooltip.css({
-                'top': (head.bottom + 10) + 'px'
+                top: top
             });
         }
         this.arrow.animate({
-            'left': posarrowleft + 'px'
+            'left': arrow_left + 'px'
         });
         
         this._hidden = false;
diff --git a/IPython/html/static/notebook/less/pager.less b/IPython/html/static/notebook/less/pager.less
index c36b003..605d136 100644
--- a/IPython/html/static/notebook/less/pager.less
+++ b/IPython/html/static/notebook/less/pager.less
@@ -16,7 +16,7 @@ div#pager {
     z-index: 100;
 
     /* Hack which prevents jquery ui resizable from changing top. */
-    top: inherit !important; 
+    top: auto !important;
 
     pre {
         line-height: @code_line_height;
diff --git a/IPython/html/static/style/style.min.css b/IPython/html/static/style/style.min.css
index f9aaaef..82c662e 100644
--- a/IPython/html/static/style/style.min.css
+++ b/IPython/html/static/style/style.min.css
@@ -10909,7 +10909,7 @@ div#pager {
   /* Display over codemirror */
   z-index: 100;
   /* Hack which prevents jquery ui resizable from changing top. */
-  top: inherit !important;
+  top: auto !important;
 }
 div#pager pre {
   line-height: 1.21429em;
diff --git a/IPython/html/templates/notebook.html b/IPython/html/templates/notebook.html
index 280a3b0..d84c2b4 100644
--- a/IPython/html/templates/notebook.html
+++ b/IPython/html/templates/notebook.html
@@ -287,13 +287,18 @@ data-notebook-path="{{notebook_path}}"
 
 {% block site %}
 
-
 <div id="ipython-main-app">
     <div id="notebook_panel">
         <div id="notebook"></div>
     </div>
 </div>
 
+<div id='tooltip' class='ipython_tooltip' style='display:none'></div>
+
+{% endblock %}
+
+{% block after_site %}
+
 <div id="pager">
     <div id="pager-contents">
         <div id="pager-container" class="container"></div>
@@ -301,12 +306,8 @@ data-notebook-path="{{notebook_path}}"
     <div id='pager-button-area'></div>
 </div>
 
-<div id='tooltip' class='ipython_tooltip' style='display:none'></div>
-
-
 {% endblock %}
 
-
 {% block script %}
 {{super()}}
 <script type="text/javascript">
diff --git a/IPython/html/templates/page.html b/IPython/html/templates/page.html
index 191b34b..3663dff 100644
--- a/IPython/html/templates/page.html
+++ b/IPython/html/templates/page.html
@@ -111,6 +111,9 @@
 {% endblock %}
 </div>
 
+{% block after_site %}
+{% endblock %}
+
 {% block script %}
 {% endblock %}