backport fix signaler un bug sur IE

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@930 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/htdocs/javascript/flyspray.js b/htdocs/javascript/flyspray.js
index 337e0aa..3cd41d1 100644 (file)
--- a/htdocs/javascript/flyspray.js
+++ b/htdocs/javascript/flyspray.js
@@ -19,10 +19,41 @@
  ***************************************************************************/\r
 \r
 function send_bug() {\r
+        var h = windowHeight();\r
+        var y = getScrollY();\r
+        y += (h - 470) /2;\r
        document.getElementById('flyspray_report').style.display = 'block';\r
+        document.getElementById('flyspray_report').style.top = y+'px';\r
        return false;\r
 }\r
 \r
+function getScrollY() {\r
+    var scrOfX = 0, scrOfY = 0;\r
+    if( typeof( window.pageYOffset ) == 'number' ) {\r
+        //Netscape compliant\r
+        scrOfY = window.pageYOffset;\r
+    } else if( document.body && ( document.body.scrollLeft || document.body.scrollTop ) ) {\r
+        //DOM compliant\r
+        scrOfY = document.body.scrollTop;\r
+    } else if( document.documentElement && ( document.documentElement.scrollLeft || document.documentElement.scrollTop ) ) {\r
+        //IE6 standards compliant mode\r
+        scrOfY = document.documentElement.scrollTop;\r
+    }\r
+    return scrOfY;\r
+}\r
+function windowHeight() {\r
+    if( typeof( window.innerWidth ) == 'number' ) {\r
+        //Non-IE\r
+        return window.innerHeight;\r
+    } else if( document.documentElement && ( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) {\r
+        return document.documentElement.clientHeight;\r
+    } else if( document.body && ( document.body.clientWidth || document.body.clientHeight ) ) {\r
+        //IE 4 compatible\r
+        return document.body.clientHeight;\r
+    }\r
+    return 0;\r
+}\r
+\r
 function close_bug(f,send) {\r
        var detail = document.getElementById('flyspray_detail');\r
        detail.value = utf8(detail.value);\r

diff --git a/templates/skin/common.bug.tpl b/templates/skin/common.bug.tpl
index 503a191..5a1c911 100644 (file)
--- a/templates/skin/common.bug.tpl
+++ b/templates/skin/common.bug.tpl
@@ -1,6 +1,6 @@
 <script type="text/javascript" src="javascript/flyspray.js"></script>\r
 \r
-<div id="flyspray_report" style="display:none;position:fixed;width:60%;height:470px;top:20%;left:20%;border: solid 1px;background:white;color:black;text-align:left;padding:10px">\r
+<div id="flyspray_report" style="display:none;position:absolute;width:700px;height:470px;left:20%;border:solid 1px;background:white;color:black;text-align:left;padding:10px">\r
 <form action="http://trackers.polytechnique.org/" method="post" enctype="multipart/form-data">\r
        <h1>Signaler un bug ou demander une amélioration</h1>\r
        <div style="margin-left:10%;margin-right:10%">\r