From 757ba7b8dae408e2b8fdc5489e86508ad6d446ae Mon Sep 17 00:00:00 2001 From: Sebastian Mendel Date: Sat, 8 Jul 2006 09:35:52 +0000 Subject: [PATCH] fix to remove scrollbar bug in IE without quirks mode --- ChangeLog | 4 +++ left.php | 26 +++++++++++++------ libraries/header.inc.php | 40 ++++++++++++++++++----------- libraries/header_meta_style.inc.php | 11 ++++---- 4 files changed, 53 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index cade66d6b..50786ed46 100755 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,10 @@ $Id$ $Source$ +2006-07-08 Sebastian Mendel + * 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 * db_details_qbe.php: deactivated some work in progress diff --git a/left.php b/left.php index 9616b2f07..3de4c7a48 100644 --- a/left.php +++ b/left.php @@ -2,18 +2,18 @@ /* $Id$ */ // 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 */ -require_once('./libraries/common.lib.php'); +require_once './libraries/common.lib.php'; // free the session file, for the other frames to be loaded session_write_close(); -require_once('./libraries/ob.lib.php'); +require_once './libraries/ob.lib.php'; if ($GLOBALS['cfg']['OBGzip']) { $ob_mode = PMA_outBufferModeGet(); if ($ob_mode) { @@ -21,8 +21,8 @@ if ($GLOBALS['cfg']['OBGzip']) { } } -require_once('./libraries/bookmark.lib.php'); -require_once('./libraries/relation.lib.php'); +require_once './libraries/bookmark.lib.php'; +require_once './libraries/relation.lib.php'; $cfgRelation = PMA_getRelationsParam(); /** @@ -52,13 +52,13 @@ $db_start = $db; // to a seperate file. It can now be included by libraries/header.inc.php, // querywindow.php. -require_once('./libraries/header_http.inc.php'); +require_once './libraries/header_http.inc.php'; /** * Displays the frame */ -// remove vertical scroll bar bug in ie -echo ''; +// xml declaration moves IE into quirks mode, making much trouble with CSS +/* echo ''; */ ?> @@ -103,6 +103,16 @@ echo ''; } //]]> + + diff --git a/libraries/header.inc.php b/libraries/header.inc.php index 06afa2cd0..97eea6c8d 100644 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -50,11 +50,11 @@ if (empty($GLOBALS['is_header_sent'])) { (!empty($GLOBALS['cfg']['Server']['host']) ? $GLOBALS['cfg']['TitleServer'] : $GLOBALS['cfg']['TitleDefault'])) ); - // here, the function does not exist with this configuration: $cfg['ServerDefault'] = 0; + // here, the function does not exist with this configuration: $cfg['ServerDefault'] = 0; $is_superuser = function_exists('PMA_isSuperuser') && PMA_isSuperuser(); ?> '; var jsPasswordEmpty = ''; var jsPasswordNotSame = ''; - //--> + // ]]> '; var jsPasswordEmpty = ''; var jsPasswordNotSame = ''; - //--> + // ]]> @@ -107,21 +107,21 @@ if (empty($GLOBALS['is_header_sent'])) { // js index validation stuff var errorMsg0 = ''; var errorMsg1 = ''; - //--> + // ]]> - //--> + // ]]> - //--> + // ]]> - - - + + + + + - -
+ +
"; +// xml declaration moves IE into quirks mode, making much trouble with CSS +/* echo ''; */ ?> - - -<?php + <link rel="icon" href="./favicon.ico" type="image/x-icon" /> + <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> + <title><?php if (!empty($page_title)) { echo htmlspecialchars($page_title); } else { echo 'phpMyAdmin'; } ?> - +