From 9671074354a0f8c3e33575eb47564473f639fa53 Mon Sep 17 00:00:00 2001
From: Rouslan Placella <rouslan@placella.com>
Date: Wed, 23 Nov 2011 22:07:37 +0000
Subject: [PATCH 1/3] Revert "Prevent the menubar from floating in print view"

This reverts commit dab7a58304edd88a913ebe12435ce62e29ccff17.

Conflicts:

	js/functions.js
	themes/original/css/theme_right.css.php
	themes/pmahomme/css/theme_right.css.php
---
 js/functions.js                         | 8 +++++++-
 themes/original/css/theme_right.css.php | 7 -------
 themes/pmahomme/css/theme_right.css.php | 7 -------
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/js/functions.js b/js/functions.js
index 4cdc10bc98..189aeb60d6 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -3696,7 +3696,13 @@ $(document).ready(function() {
 $(document).ready(function () {
     if ($("#floating_menubar").length) {
         $("#floating_menubar")
-            .css('z-index', 500)
+            .css({
+                'position': 'fixed',
+                'top': 0,
+                'left': 0,
+                'width': '100%',
+                'z-index': 500
+            })
             .append($('#serverinfo'))
             .append($('#topmenucontainer'));
         $('body').css(
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index 7c12c14349..1284ae12c1 100644
--- a/themes/original/css/theme_right.css.php
+++ b/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;
diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php
index f5174c6e69..5d4c3f3d04 100644
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/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;

From fad4b4853911040f6173f4f074bf40ed998fd6cf Mon Sep 17 00:00:00 2001
From: Rouslan Placella <rouslan@placella.com>
Date: Wed, 23 Nov 2011 22:25:21 +0000
Subject: [PATCH 2/3] A different solution for preventing the menubar from
 floating in print view

---
 db_printview.php  | 2 ++
 js/functions.js   | 2 +-
 tbl_printview.php | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/db_printview.php b/db_printview.php
index acd0d9f26d..e15b79dc84 100644
--- a/db_printview.php
+++ b/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';
 ?>
diff --git a/js/functions.js b/js/functions.js
index 189aeb60d6..f9e5717e36 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) {
+    if ($("#floating_menubar").length && $('#PMA_print_view').length == 0) {
         $("#floating_menubar")
             .css({
                 'position': 'fixed',
diff --git a/tbl_printview.php b/tbl_printview.php
index 17c9b25ecf..a6844e9939 100644
--- a/tbl_printview.php
+++ b/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';
 ?>

From 6be4f840ed0783b1e48a94e62ea477fbc36cc653 Mon Sep 17 00:00:00 2001
From: Rouslan Placella <rouslan@placella.com>
Date: Wed, 23 Nov 2011 22:32:56 +0000
Subject: [PATCH 3/3] Need to hide the "No indexes found" message in print view

---
 themes/original/css/theme_print.css.php | 4 ++++
 themes/pmahomme/css/theme_print.css.php | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/themes/original/css/theme_print.css.php b/themes/original/css/theme_print.css.php
index 0804342f0b..4cf8e338d0 100644
--- a/themes/original/css/theme_print.css.php
+++ b/themes/original/css/theme_print.css.php
@@ -36,3 +36,7 @@ th {
     font-weight:       bold;
     background-color:  #e5e5e5;
 }
+
+.hide {
+    display: none;
+}
diff --git a/themes/pmahomme/css/theme_print.css.php b/themes/pmahomme/css/theme_print.css.php
index ad5484ae16..428ec8d9f6 100644
--- a/themes/pmahomme/css/theme_print.css.php
+++ b/themes/pmahomme/css/theme_print.css.php
@@ -36,3 +36,7 @@ th {
     font-weight:       bold;
     background-color:  #e5e5e5;
 }
+
+.hide {
+    display: none;
+}