Merge remote-tracking branch 'origin/master'

db_printview.php

@@ -246,5 +246,7 @@ if ($num_tables == 0) {
  */
 PMA_printButton();
 
+echo "<div id='PMA_print_view'></div>\n";
+
 require './libraries/footer.inc.php';
 ?>

js/functions.js

@@ -3694,9 +3694,15 @@ $(document).ready(function() {
  * Makes the breadcrumbs and the menu bar float at the top of the viewport
  */
 $(document).ready(function () {
-    if ($("#floating_menubar").length) {
+    if ($("#floating_menubar").length && $('#PMA_print_view').length == 0) {
         $("#floating_menubar")
-            .css('z-index', 500)
+            .css({
+                'position': 'fixed',
+                'top': 0,
+                'left': 0,
+                'width': '100%',
+                'z-index': 500
+            })
             .append($('#serverinfo'))
             .append($('#topmenucontainer'));
         $('body').css(

tbl_printview.php

@@ -441,5 +441,7 @@ foreach ($the_tables as $key => $table) {
  */
 PMA_printButton();
 
+echo "<div id='PMA_print_view'></div>\n";
+
 require './libraries/footer.inc.php';
 ?>

themes/original/css/theme_print.css.php

@@ -36,3 +36,7 @@ th {
     font-weight:       bold;
     background-color:  #e5e5e5;
 }
+
+.hide {
+    display: none;
+}

themes/original/css/theme_right.css.php

@@ -878,13 +878,6 @@ div#tablestatistics table {
     width: 100%;
 }
 
-#floating_menubar {
-    position: fixed;
-    top: 0;
-    left: 0;
-    width: 100%';
-}
-
 #serverinfo {
     background: white;
     font-weight:        bold;

themes/pmahomme/css/theme_print.css.php

@@ -36,3 +36,7 @@ th {
     font-weight:       bold;
     background-color:  #e5e5e5;
 }
+
+.hide {
+    display: none;
+}

themes/pmahomme/css/theme_right.css.php

@@ -1089,13 +1089,6 @@ div#tablestatistics table {
     background-color: #dcdcdc;
 }
 
-#floating_menubar {
-    position: fixed;
-    top: 0;
-    left: 0;
-    width: 100%';
-}
-
 #serverinfo {
     border-bottom:1px solid #fff;
     background:#888;