diff options
| author | Michal Čihař <michal@cihar.com> | 2005-03-07 02:23:46 +0300 |
|---|---|---|
| committer | Michal Čihař <michal@cihar.com> | 2005-03-07 02:23:46 +0300 |
| commit | ffe8be03560dc03b523b2393fc7496ed34a8703a (patch) | |
| tree | 57368963080caa890f71b8ad9e4b1493fb0c7fff | |
| parent | a6a072431eba2bba3aa753fd89bfe2c91b24d06d (diff) | |
Actually use print style in themes, also fixes RFE #1120880.
| -rwxr-xr-x | ChangeLog | 5 | ||||
| -rw-r--r-- | css/phpmyadmin.css.php | 5 | ||||
| -rw-r--r-- | db_printview.php | 7 | ||||
| -rw-r--r-- | libraries/header_meta_style.inc.php | 6 | ||||
| -rw-r--r-- | tbl_printview.php | 3 |
5 files changed, 18 insertions, 8 deletions
@@ -5,6 +5,11 @@ phpMyAdmin - Changelog $Id$ $Source$ +2005-03-07 Michal Čihař <michal@cihar.com> + * db_printview.php, tbl_printview.php, css/phpmyadmin.css.php, + libraries/header_meta_style.inc.php: Actually use print style in themes, + also fixes RFE #1120880. + 2005-03-06 Michael Keck <mkkeck@users.sourceforge.net> * themes/*/img/bd_deltbl.png, themes/*/bd_drop.png: Added disabled versions of drop icons. diff --git a/css/phpmyadmin.css.php b/css/phpmyadmin.css.php index 05eca7faae..aec1352cbd 100644 --- a/css/phpmyadmin.css.php +++ b/css/phpmyadmin.css.php @@ -40,6 +40,11 @@ if ($js_frame == 'left') { if (@file_exists($tmp_file)) { include($tmp_file); } // end of include theme_print.css.php + ?> +table#serverinfo,td.serverinfo,table.noborder,table.noborder td { + border: none; +} + <?php } else { /************************************************************************************ * RIGHT FRAME diff --git a/db_printview.php b/db_printview.php index dcf9ad7784..d6bf7d7045 100644 --- a/db_printview.php +++ b/db_printview.php @@ -7,6 +7,7 @@ * Gets the variables sent or posted to this script, then displays headers */ require_once('./libraries/grab_globals.lib.php'); +$print_view = TRUE; require_once('./header.inc.php'); // Check parameters @@ -212,7 +213,7 @@ else { || (isset($sts_data['Check_time']) && !empty($sts_data['Check_time']))) { echo $needs_break; ?> - <table border="0" cellpadding="1" cellspacing="1" width="100%"> + <table border="0" cellpadding="1" cellspacing="1" width="100%" class="noborder"> <?php if (isset($sts_data['Create_time']) && !empty($sts_data['Create_time'])) { @@ -292,17 +293,15 @@ echo "\n"; <!-- function printPage() { - document.getElementById('print').style.visibility = 'hidden'; // Do print the page if (typeof(window.print) != 'undefined') { window.print(); } - document.getElementById('print').style.visibility = ''; } //--> </script> <?php -echo '<br /><br /> <input type="button" style="visibility: ; width: 100px; height: 25px" id="print" value="' . $strPrint . '" onclick="printPage()">' . "\n"; +echo '<br /><br /> <input type="button" class="print_ignore" style="width: 100px; height: 25px" id="print" value="' . $strPrint . '" onclick="printPage()">' . "\n"; require_once('./footer.inc.php'); ?> diff --git a/libraries/header_meta_style.inc.php b/libraries/header_meta_style.inc.php index d9d77c52fb..3b3a9d4522 100644 --- a/libraries/header_meta_style.inc.php +++ b/libraries/header_meta_style.inc.php @@ -16,7 +16,7 @@ if ($GLOBALS['text_dir'] == 'ltr') { $GLOBALS['cell_align_right'] = 'left'; } // removes the bug with the horizontal scrollbar in IE (it's allways shown, if need it or not) -echo "<?xml version=\"1.0\" encoding=\"" . $GLOBALS['charset'] . "\"?".">"; +echo "<?xml version=\"1.0\" encoding=\"" . $GLOBALS['charset'] . "\"?".">"; ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" @@ -61,10 +61,10 @@ if (!empty($GLOBALS['cfg']['PmaAbsoluteUri'])) { } } // end if... else if... } // end if - document.writeln('<link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : './'; ?>css/phpmyadmin.css.php?lang=<?php echo $GLOBALS['lang']; ?>&js_frame=right&js_isDOM=' + isDOM + '" />'); + document.writeln('<link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : './'; ?>css/phpmyadmin.css.php?lang=<?php echo $GLOBALS['lang']; ?>&js_frame=<?php echo isset($print_view) ? 'print' : 'right'; ?>&js_isDOM=' + isDOM + '" />'); //--> </script> <noscript> - <link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : './'; ?>css/phpmyadmin.css.php?lang=<?php echo $GLOBALS['lang']; ?>&js_frame=right" /> + <link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : './'; ?>css/phpmyadmin.css.php?lang=<?php echo $GLOBALS['lang']; ?>&js_frame=<?php echo isset($print_view) ? 'print' : 'right'; ?>" /> </noscript> <link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : './'; ?>css/print.css" media="print" /> diff --git a/tbl_printview.php b/tbl_printview.php index cc950aad80..448597fecd 100644 --- a/tbl_printview.php +++ b/tbl_printview.php @@ -5,6 +5,7 @@ /** * Gets the variables sent or posted to this script, then displays headers */ +$print_view = TRUE; if (!isset($selected_tbl)) { require_once('./libraries/grab_globals.lib.php'); require_once('./header.inc.php'); @@ -324,7 +325,7 @@ foreach ($the_tables AS $key => $table) { ?> <br /><br /> -<table border="0" cellspacing="0" cellpadding="0"> +<table border="0" cellspacing="0" cellpadding="0" class="noborder"> <tr> <!-- Space usage --> |