Browse files

Disabled floating of the menubar in designer and fixed designer menu …

…rendering in IE
  • Loading branch information...
1 parent f62c4a1 commit 2776f894446e515cadd9ff530b1e4fb3eb4255bf @roccivic roccivic committed Nov 24, 2011
Showing with 5 additions and 10 deletions.
  1. +1 −1 db_printview.php
  2. +1 −1 js/functions.js
  3. +1 −7 js/pmd/move.js
  4. +1 −0 pmd_general.php
  5. +1 −1 tbl_printview.php
View
2 db_printview.php
@@ -246,7 +246,7 @@
*/
PMA_printButton();
-echo "<div id='PMA_print_view'></div>\n";
+echo "<div id='PMA_disable_floating_menubar'></div>\n";
require './libraries/footer.inc.php';
?>
View
2 js/functions.js
@@ -3694,7 +3694,7 @@ $(document).ready(function() {
* Makes the breadcrumbs and the menu bar float at the top of the viewport
*/
$(document).ready(function () {
- if ($("#floating_menubar").length && $('#PMA_print_view').length == 0) {
+ if ($("#floating_menubar").length && $('#PMA_disable_floating_menubar').length == 0) {
$("#floating_menubar")
.css({
'position': 'fixed',
View
8 js/pmd/move.js
@@ -125,7 +125,7 @@ function MouseDown(e)
cur_click.style.zIndex = 2;
}
if (layer_menu_cur_click) {
- offsetx = isIE ? event.clientX + document.body.scrollLeft : e.pageX;
+ offsetx = e.pageX;
dx = offsetx - parseInt(document.getElementById("layer_menu").style.width);
}
}
@@ -213,10 +213,6 @@ function Main()
{
//alert( document.getElementById('osn_tab').offsetTop);
//---CROSS
- if (isIE) {
- document.getElementById('top_menu').style.position = 'absolute';
- document.getElementById('layer_menu').style.position = 'absolute';
- }
document.getElementById("layer_menu").style.top = -1000 + 'px'; //fast scroll
sm_x += document.getElementById('osn_tab').offsetLeft;
@@ -892,8 +888,6 @@ function General_scroll()
{
document.getElementById('top_menu').style.left = document.body.scrollLeft + 'px';
document.getElementById('top_menu').style.top = document.body.scrollTop + 'px';
- document.getElementById('layer_menu').style.left = document.body.scrollLeft + 'px';
- document.getElementById('layer_menu').style.top = (document.body.scrollTop + document.getElementById('top_menu').offsetHeight) + 'px';
}
,200
);
View
1 pmd_general.php
@@ -821,5 +821,6 @@ class="M_butt" target="_self">';
<img src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/rightarrow1.png" width="0" height="0" alt="" />
<img src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/rightarrow2.png" width="0" height="0" alt="" />
<img src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/uparrow2_m.png" width="0" height="0" alt="" />
+<div id="PMA_disable_floating_menubar"></div>
</body>
</html>
View
2 tbl_printview.php
@@ -441,7 +441,7 @@
*/
PMA_printButton();
-echo "<div id='PMA_print_view'></div>\n";
+echo "<div id='PMA_disable_floating_menubar'></div>\n";
require './libraries/footer.inc.php';
?>

0 comments on commit 2776f89

Please sign in to comment.