diff --git a/db_printview.php b/db_printview.php index 751b953c40..7a7bfc6b6b 100644 --- a/db_printview.php +++ b/db_printview.php @@ -13,9 +13,7 @@ require_once 'libraries/common.inc.php'; /** * Gets the variables sent or posted to this script, then displays headers */ -$print_view = true; -define('PMA_DISPLAY_HEADING', 0); -require_once 'libraries/header.inc.php'; +require_once 'libraries/header_printview.inc.php'; PMA_checkParameters(array('db')); diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php index 96176b7522..3315fca26a 100644 --- a/libraries/Theme.class.php +++ b/libraries/Theme.class.php @@ -57,7 +57,7 @@ class PMA_Theme * @var array valid css types * @access protected */ - var $types = array('left', 'right', 'print'); + var $types = array('left', 'right'); /** * @var integer last modification time for info file diff --git a/libraries/header_meta_style.inc.php b/libraries/header_meta_style.inc.php index eb010a9bea..63cb8d15e8 100644 --- a/libraries/header_meta_style.inc.php +++ b/libraries/header_meta_style.inc.php @@ -44,7 +44,7 @@ if ($GLOBALS['text_dir'] == 'ltr') { echo 'phpMyAdmin'; } ?> - + diff --git a/libraries/header_printview.inc.php b/libraries/header_printview.inc.php index 51f971467d..47188ad472 100644 --- a/libraries/header_printview.inc.php +++ b/libraries/header_printview.inc.php @@ -14,11 +14,6 @@ if (! defined('PHPMYADMIN')) { require_once './libraries/ob.lib.php'; PMA_outBufferPre(); -// Check parameters - -PMA_checkParameters(array('db', 'full_sql_query')); - - // For re-usability, moved http-headers // to a separate file. It can now be included by libraries/header.inc.php, // querywindow.php. @@ -44,29 +39,14 @@ if ($text_dir == 'ltr') { -<?php echo __('SQL result'); ?> - phpMyAdmin <?php echo PMA_VERSION ?> - +<?php echo __('Print view'); ?> - phpMyAdmin <?php echo PMA_VERSION ?> + - -

-

- :
- :
- :
- : phpMyAdmin  / MySQL 
- : ; -
- : - -

- - + " . __('SQL result') . ""; + echo "

"; + echo "" . __('Host') . ": $hostname
"; + echo "" . __('Database') . ": " . htmlspecialchars($db) . "
"; + echo "" . __('Generation Time') . ": " . PMA_localisedDate() . "
"; + echo "" . __('Generated by') . ": $versions
"; + echo "" . __('SQL query') . ": " . htmlspecialchars($full_sql_query) . ";"; + if (isset($num_rows)) { + echo "
"; + echo "" . __('Rows') . ": $num_rows"; + } + echo "

"; } else { $GLOBALS['js_include'][] = 'functions.js'; diff --git a/tbl_printview.php b/tbl_printview.php index ea16713fa6..8db2904e39 100644 --- a/tbl_printview.php +++ b/tbl_printview.php @@ -13,10 +13,8 @@ require_once 'libraries/common.inc.php'; /** * Gets the variables sent or posted to this script, then displays headers */ -$print_view = true; -define('PMA_DISPLAY_HEADING', 0); if (! isset($selected_tbl)) { - include_once 'libraries/header.inc.php'; + include_once 'libraries/header_printview.inc.php'; } require 'libraries/tbl_common.inc.php'; diff --git a/themes/original/css/theme_print.css.php b/themes/original/css/theme_print.css.php deleted file mode 100644 index 3d8551f93d..0000000000 --- a/themes/original/css/theme_print.css.php +++ /dev/null @@ -1,52 +0,0 @@ - -/* For printview */ -body, table, th, td { - color: #000; - background: #fff; -} - -img { - border: 0; -} - -table, th, td { - border: .1em solid #000; -} - -table { - border-collapse: collapse; - border-spacing: 0; -} - -th, td { - padding: .2em; -} - -th.vtop, td.vtop { - vertical-align: top; -} - -th.vbottom, td.vbottom { - vertical-align: bottom; -} - -th { - font-weight: bold; - background: #e5e5e5; -} - -.nowrap { - white-space: nowrap; -} - -.hide { - display: none; -} diff --git a/themes/pmahomme/css/theme_print.css.php b/themes/pmahomme/css/theme_print.css.php deleted file mode 100644 index 59ba3db069..0000000000 --- a/themes/pmahomme/css/theme_print.css.php +++ /dev/null @@ -1,52 +0,0 @@ - -/* For printview */ -body, table, th, td { - color: #000; - background: #fff; -} - -img { - border: 0; -} - -table, th, td { - border: .1em solid #000; -} - -table { - border-collapse: collapse; - border-spacing: 0; -} - -th, td { - padding: .2em; -} - -th.vtop, td.vtop { - vertical-align: top; -} - -th.vbottom, td.vbottom { - vertical-align: bottom; -} - -th { - font-weight: bold; - background: #e5e5e5; -} - -.nowrap { - white-space: nowrap; -} - -.hide { - display: none; -}