[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7_1-23438-gf6d0aa3

[Rouslan Placella]

The branch, master has been updated
       via  f6d0aa3873907d577b883cb7a4c417153820bb2d (commit)
       via  2776f894446e515cadd9ff530b1e4fb3eb4255bf (commit)
      from  f62c4a1809458008c778afac98e481f54def216b (commit)


- Log -----------------------------------------------------------------
commit f6d0aa3873907d577b883cb7a4c417153820bb2d
Author: Rouslan Placella <rouslan at placella.com>
Date:   Thu Nov 24 16:14:43 2011 +0000

    Improved the rendering of the designer menu when it's moved to the right

commit 2776f894446e515cadd9ff530b1e4fb3eb4255bf
Author: Rouslan Placella <rouslan at placella.com>
Date:   Thu Nov 24 15:43:04 2011 +0000

    Disabled floating of the menubar in designer and fixed designer menu rendering in IE

-----------------------------------------------------------------------

Summary of changes:
 db_printview.php  |    2 +-
 js/functions.js   |    2 +-
 js/pmd/move.js    |   17 ++++++++---------
 pmd_general.php   |    1 +
 tbl_printview.php |    2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/db_printview.php b/db_printview.php
index e15b79d..5512fa6 100644
--- a/db_printview.php
+++ b/db_printview.php
@@ -246,7 +246,7 @@ if ($num_tables == 0) {
  */
 PMA_printButton();
 
-echo "<div id='PMA_print_view'></div>\n";
+echo "<div id='PMA_disable_floating_menubar'></div>\n";
 
 require './libraries/footer.inc.php';
 ?>
diff --git a/js/functions.js b/js/functions.js
index f9e5717..2081ffc 100644
--- a/js/functions.js
+++ b/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',
diff --git a/js/pmd/move.js b/js/pmd/move.js
index 6bb9717..e7e5439 100644
--- a/js/pmd/move.js
+++ b/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
     );
@@ -936,11 +930,16 @@ function Show_left_menu(id_this) // max/min all tables
 function Top_menu_right(id_this)
 {
     if (id_this.alt == ">") {
-        document.getElementById('top_menu').style.marginLeft = document.getElementById('top_menu').offsetWidth + 'px'; // = 350
+        var top_menu_width = 10;
+        $('#top_menu').children().each(function () {
+            top_menu_width += $(this).outerWidth(true);
+        });
+        var offset = parseInt(document.getElementById('top_menu').offsetWidth - top_menu_width, 10);
+        document.getElementById('top_menu').style.paddingLeft = offset + 'px';
         id_this.alt = "<";
         id_this.src = pmaThemeImage + "pmd/2leftarrow_m.png";
     } else {
-        document.getElementById('top_menu').style.marginLeft = 0;
+        document.getElementById('top_menu').style.paddingLeft = 0;
         id_this.alt = ">";
         id_this.src = pmaThemeImage + "pmd/2rightarrow_m.png";
     }
diff --git a/pmd_general.php b/pmd_general.php
index 21fffc9..aafc5fd 100644
--- a/pmd_general.php
+++ b/pmd_general.php
@@ -821,5 +821,6 @@ if (! empty($_REQUEST['query'])) {
 <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>
diff --git a/tbl_printview.php b/tbl_printview.php
index a6844e9..554608a 100644
--- a/tbl_printview.php
+++ b/tbl_printview.php
@@ -441,7 +441,7 @@ foreach ($the_tables as $key => $table) {
  */
 PMA_printButton();
 
-echo "<div id='PMA_print_view'></div>\n";
+echo "<div id='PMA_disable_floating_menubar'></div>\n";
 
 require './libraries/footer.inc.php';
 ?>


hooks/post-receive
-- 
phpMyAdmin