From 872f122855065baca90ebce7e9866232bc095dfd Mon Sep 17 00:00:00 2001
From: Julian Maurice <julian.maurice@biblibre.com>
Date: Tue, 21 Mar 2017 12:01:45 +0100
Subject: [PATCH] Bug 18066: Fix map positioning in admin/usage_statistics.pl

---
 .../prog/en/modules/admin/usage_statistics.tt      | 45 ++++++++++++----------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt
index 75a1f0b47e..fc8ce60d33 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt
@@ -10,28 +10,31 @@
 
 <script type="text/javascript">
 //<![CDATA[
-    var originalOffset;
-    $(window).scroll(function () {
-        var tbh = $("#mapid");
-        var offsetTop = tbh.offset().top;
-        var s = parseInt($(window).scrollTop(), 10);
-        var fixMe = (s > offsetTop);
-        if ( !originalOffset ) originalOffset = tbh.position().top;
-        var repositionMe = (s < originalOffset);
-        if (fixMe) {
-            tbh.css({
-                'position': 'fixed',
-                    'top': '0',
-                'margin-left': '40%'
-            });
-        }
-        if (repositionMe) {
-            tbh.css({
-                'position': 'absolute',
-                    'top': originalOffset,
-                'margin-left': '40%'
-            });
+    $(document).ready(function() {
+        function positionMap() {
+            var tbh = $("#mapid");
+            var mapContainer = tbh.parent();
+            mapContainer.css('position', 'relative');
+            tbh.css('position', 'absolute');
+            tbh.css('right', 0);
+
+            var offsetTop = mapContainer.offset().top;
+            var s = parseInt($(window).scrollTop(), 10);
+            tbh.css('top', '').css('bottom', '');
+            if (s > offsetTop) {
+                var mapContainerOffsetBottom = offsetTop + mapContainer.innerHeight();
+                if (s + tbh.outerHeight(true) > mapContainerOffsetBottom) {
+                    tbh.css('bottom', 0);
+                } else {
+                    tbh.css('top', s - offsetTop);
+                }
+            } else {
+                tbh.css('top', 0);
+            }
         }
+
+        $(window).scroll(positionMap);
+        positionMap();
     });
 //]]>
 </script>
-- 
2.11.0