The branch, master has been updated
via fad4b4853911040f6173f4f074bf40ed998fd6cf (commit)
via 9671074354a0f8c3e33575eb47564473f639fa53 (commit)
from 4dda62da8978f43d580ab6295326831813b6c674 (commit)
- Log -----------------------------------------------------------------
commit fad4b4853911040f6173f4f074bf40ed998fd6cf
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Wed Nov 23 22:25:21 2011 +0000
A different solution for preventing the menubar from floating in print view
commit 9671074354a0f8c3e33575eb47564473f639fa53
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Wed Nov 23 22:07:37 2011 +0000
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
-----------------------------------------------------------------------
Summary of changes:
db_printview.php | 2 ++
js/functions.js | 10 ++++++++--
tbl_printview.php | 2 ++
themes/original/css/theme_right.css.php | 7 -------
themes/pmahomme/css/theme_right.css.php | 7 -------
5 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/db_printview.php b/db_printview.php
index acd0d9f..e15b79d 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 4cdc10b..f9e5717 100644
--- a/js/functions.js
+++ b/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(
diff --git a/tbl_printview.php b/tbl_printview.php
index 17c9b25..a6844e9 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';
?>
diff --git a/themes/original/css/theme_right.css.php
b/themes/original/css/theme_right.css.php
index 7c12c14..1284ae1 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 f5174c6..5d4c3f3 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;
hooks/post-receive
--
phpMyAdmin
Show replies by date