nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix to remove scrollbar bug in IE without quirks mode

Browse Source
This commit is contained in:
Sebastian Mendel
2006-07-08 09:35:52 +00:00
parent beca72fb69
commit 757ba7b8da
4 changed files with 53 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -6,6 +6,10 @@ $Id$
$Source$ $Source$
2006-07-08 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* left.php, libraries/header_meta_style.inc.php, libraries/header.inc.php:
fix to remove scrollbar bug in IE without quirks mode
2006-07-07 Marc Delisle <lem9@users.sourceforge.net> 2006-07-07 Marc Delisle <lem9@users.sourceforge.net>
* db_details_qbe.php: deactivated some work in progress * db_details_qbe.php: deactivated some work in progress

26
left.php
View File

@@ -2,18 +2,18 @@
/* $Id$ */ /* $Id$ */
// vim: expandtab sw=4 ts=4 sts=4: // vim: expandtab sw=4 ts=4 sts=4:
/** /**
* display db and table selection * the navigation frame - displays server, db and table selection tree
*/ */
/** /**
* Gets a core script and starts output buffering work * Gets a core script and starts output buffering work
*/ */
require_once('./libraries/common.lib.php'); require_once './libraries/common.lib.php';
// free the session file, for the other frames to be loaded // free the session file, for the other frames to be loaded
session_write_close(); session_write_close();
require_once('./libraries/ob.lib.php'); require_once './libraries/ob.lib.php';
if ($GLOBALS['cfg']['OBGzip']) { if ($GLOBALS['cfg']['OBGzip']) {
$ob_mode = PMA_outBufferModeGet(); $ob_mode = PMA_outBufferModeGet();
if ($ob_mode) { if ($ob_mode) {
@@ -21,8 +21,8 @@ if ($GLOBALS['cfg']['OBGzip']) {
} }
} }
require_once('./libraries/bookmark.lib.php'); require_once './libraries/bookmark.lib.php';
require_once('./libraries/relation.lib.php'); require_once './libraries/relation.lib.php';
$cfgRelation = PMA_getRelationsParam(); $cfgRelation = PMA_getRelationsParam();
/** /**
@@ -52,13 +52,13 @@ $db_start = $db;
// to a seperate file. It can now be included by libraries/header.inc.php, // to a seperate file. It can now be included by libraries/header.inc.php,
// querywindow.php. // querywindow.php.
require_once('./libraries/header_http.inc.php'); require_once './libraries/header_http.inc.php';
/** /**
* Displays the frame * Displays the frame
*/ */
// remove vertical scroll bar bug in ie // xml declaration moves IE into quirks mode, making much trouble with CSS
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" <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -103,6 +103,16 @@ echo '<?xml version="1.0" encoding="' . $GLOBALS['charset'] . '"?>';
} }
//]]> //]]>
</script> </script>
<?php /* remove vertical scroll bar bug in ie */ ?>
<!--[if gte IE 6]>
<style type="text/css">
/* <![CDATA[ */
html {
overflow-y: scroll;
}
/* ]]> */
</style>
<![endif]-->
</head> </head>
<body id="body_leftFrame"> <body id="body_leftFrame">

38
libraries/header.inc.php
View File

@@ -54,7 +54,7 @@ if (empty($GLOBALS['is_header_sent'])) {
$is_superuser = function_exists('PMA_isSuperuser') && PMA_isSuperuser(); $is_superuser = function_exists('PMA_isSuperuser') && PMA_isSuperuser();
?> ?>
<script type="text/javascript" language="javascript"> <script type="text/javascript" language="javascript">
<!-- // <![CDATA[
// Updates the title of the frameset if possible (ns4 does not allow this) // Updates the title of the frameset if possible (ns4 does not allow this)
if (typeof(parent.document) != 'undefined' && typeof(parent.document) != 'unknown' if (typeof(parent.document) != 'undefined' && typeof(parent.document) != 'unknown'
&& typeof(parent.document.title) == 'string') { && typeof(parent.document.title) == 'string') {
@@ -72,7 +72,7 @@ if (empty($GLOBALS['is_header_sent'])) {
? str_replace('\'', '\\\'', $GLOBALS['strNoDropDatabases']) : ''; ?>'; ? str_replace('\'', '\\\'', $GLOBALS['strNoDropDatabases']) : ''; ?>';
var confirmMsg = '<?php echo(($GLOBALS['cfg']['Confirm']) ? str_replace('\'', '\\\'', $GLOBALS['strDoYouReally']) : ''); ?>'; var confirmMsg = '<?php echo(($GLOBALS['cfg']['Confirm']) ? str_replace('\'', '\\\'', $GLOBALS['strDoYouReally']) : ''); ?>';
var confirmMsgDropDB = '<?php echo(($GLOBALS['cfg']['Confirm']) ? str_replace('\'', '\\\'', $GLOBALS['strDropDatabaseStrongWarning']) : ''); ?>'; var confirmMsgDropDB = '<?php echo(($GLOBALS['cfg']['Confirm']) ? str_replace('\'', '\\\'', $GLOBALS['strDropDatabaseStrongWarning']) : ''); ?>';
//--> // ]]>
</script> </script>
<script src="./js/functions.js" type="text/javascript" language="javascript"></script> <script src="./js/functions.js" type="text/javascript" language="javascript"></script>
<?php <?php
@@ -84,7 +84,7 @@ if (empty($GLOBALS['is_header_sent'])) {
var jsUserEmpty = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strUserEmpty']); ?>'; var jsUserEmpty = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strUserEmpty']); ?>';
var jsPasswordEmpty = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strPasswordEmpty']); ?>'; var jsPasswordEmpty = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strPasswordEmpty']); ?>';
var jsPasswordNotSame = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strPasswordNotSame']); ?>'; var jsPasswordNotSame = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strPasswordNotSame']); ?>';
//--> // ]]>
</script> </script>
<script src="./js/user_password.js" type="text/javascript" language="javascript"></script> <script src="./js/user_password.js" type="text/javascript" language="javascript"></script>
<?php <?php
@@ -96,7 +96,7 @@ if (empty($GLOBALS['is_header_sent'])) {
var jsUserEmpty = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strUserEmpty']); ?>'; var jsUserEmpty = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strUserEmpty']); ?>';
var jsPasswordEmpty = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strPasswordEmpty']); ?>'; var jsPasswordEmpty = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strPasswordEmpty']); ?>';
var jsPasswordNotSame = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strPasswordNotSame']); ?>'; var jsPasswordNotSame = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strPasswordNotSame']); ?>';
//--> // ]]>
</script> </script>
<script src="./js/server_privileges.js" type="text/javascript" language="javascript"></script> <script src="./js/server_privileges.js" type="text/javascript" language="javascript"></script>
<script src="./js/functions.js" type="text/javascript" language="javascript"></script> <script src="./js/functions.js" type="text/javascript" language="javascript"></script>
@@ -107,21 +107,21 @@ if (empty($GLOBALS['is_header_sent'])) {
// js index validation stuff // js index validation stuff
var errorMsg0 = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strFormEmpty']); ?>'; var errorMsg0 = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strFormEmpty']); ?>';
var errorMsg1 = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strNotNumber']); ?>'; var errorMsg1 = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strNotNumber']); ?>';
//--> // ]]>
</script> </script>
<script src="./js/indexes.js" type="text/javascript" language="javascript"></script> <script src="./js/indexes.js" type="text/javascript" language="javascript"></script>
<?php <?php
} elseif (isset($js_to_run) && $js_to_run == 'tbl_change.js') { } elseif (isset($js_to_run) && $js_to_run == 'tbl_change.js') {
echo "\n"; echo "\n";
?> ?>
//--> // ]]>
</script> </script>
<script src="./js/tbl_change.js" type="text/javascript" language="javascript"></script> <script src="./js/tbl_change.js" type="text/javascript" language="javascript"></script>
<?php <?php
} else { } else {
echo "\n"; echo "\n";
?> ?>
//--> // ]]>
</script> </script>
<?php <?php
} }
@@ -130,18 +130,28 @@ if (empty($GLOBALS['is_header_sent'])) {
// Reloads the navigation frame via JavaScript if required // Reloads the navigation frame via JavaScript if required
PMA_reloadNavigation(); PMA_reloadNavigation();
?> ?>
<script src="./js/tooltip.js" type="text/javascript" <script src="./js/tooltip.js" type="text/javascript"
language="javascript"></script> language="javascript"></script>
<meta name="OBGZip" content="<?php echo ($cfg['OBGzip'] ? 'true' : 'false'); ?>" /> <meta name="OBGZip" content="<?php echo ($cfg['OBGzip'] ? 'true' : 'false'); ?>" />
</head> <?php /* remove vertical scroll bar bug in ie */ ?>
<!--[if gte IE 6]>
<style type="text/css">
/* <![CDATA[ */
html {
overflow-y: scroll;
}
/* ]]> */
</style>
<![endif]-->
</head>
<body> <body>
<div id="TooltipContainer" onmouseover="holdTooltip();" onmouseout="swapTooltip('default');"></div> <div id="TooltipContainer" onmouseover="holdTooltip();" onmouseout="swapTooltip('default');"></div>
<?php <?php
// Include possible custom headers // Include possible custom headers
if (file_exists('./config.header.inc.php')) { if (file_exists('./config.header.inc.php')) {
require('./config.header.inc.php'); require './config.header.inc.php';
} }

11
libraries/header_meta_style.inc.php
View File

@@ -18,22 +18,23 @@ if ($GLOBALS['text_dir'] == 'ltr') {
$GLOBALS['cell_align_right'] = 'left'; $GLOBALS['cell_align_right'] = 'left';
} }
// removes the bug with the horizontal scrollbar in IE (it's allways shown, if need it or not) // 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'] . "\"?".">"; // xml declaration moves IE into quirks mode, making much trouble with CSS
/* echo '<?xml version="1.0" encoding="' . $GLOBALS['charset'] . '"?>'; */
?> ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $GLOBALS['available_languages'][$GLOBALS['lang']][2]; ?>" lang="<?php echo $GLOBALS['available_languages'][$GLOBALS['lang']][2]; ?>" dir="<?php echo $GLOBALS['text_dir']; ?>"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $GLOBALS['available_languages'][$GLOBALS['lang']][2]; ?>" lang="<?php echo $GLOBALS['available_languages'][$GLOBALS['lang']][2]; ?>" dir="<?php echo $GLOBALS['text_dir']; ?>">
<head> <head>
<link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="icon" href="./favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
<title><?php <title><?php
if (!empty($page_title)) { if (!empty($page_title)) {
echo htmlspecialchars($page_title); echo htmlspecialchars($page_title);
} else { } else {
echo 'phpMyAdmin'; echo 'phpMyAdmin';
} }
?></title> ?></title>
<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $GLOBALS['charset']; ?>" /> <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $GLOBALS['charset']; ?>" />
<link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : './'; ?>css/phpmyadmin.css.php?<?php echo PMA_generate_common_url(); ?>&amp;js_frame=<?php echo isset($print_view) ? 'print' : 'right'; ?>" /> <link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : './'; ?>css/phpmyadmin.css.php?<?php echo PMA_generate_common_url(); ?>&amp;js_frame=<?php echo isset($print_view) ? 'print' : 'right'; ?>" />
<link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : './'; ?>css/print.css?<?php echo PMA_generate_common_url(); ?>" media="print" /> <link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : './'; ?>css/print.css?<?php echo PMA_generate_common_url(); ?>" media="print" />