From 6104714c005e9a01106a5662a6d94816f2ef69bf Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 22 Mar 2008 21:41:20 +0000 Subject: [PATCH] bug #1918531 [compatibility] Navigation is not w3.org valid --- ChangeLog | 2 ++ main.php | 9 ++++++--- navigation.php | 27 ++++++++++++++++++++++++++- 3 files changed, 34 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 05ca657856..85a26e8a86 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA thanks to Falk Nisius - klaf - bug #1812763 [Copy] Table copy when server is in ANSI_QUOTES sql_mode thanks to Tony Marston - tonymarston +- bug #1918531 [compatibility] Navigation isn't w3.org valid + thanks to Michael Keck - mkkeck 2.11.5.0 (2008-03-01) - bug #1862661 [GUI] Warn about rename deleting database diff --git a/main.php b/main.php index 939bbf44c3..0e67a8d65e 100644 --- a/main.php +++ b/main.php @@ -96,12 +96,15 @@ if ($server > 0) { PMA_printListItem($strServerVersion . ': ' . PMA_MYSQL_STR_VERSION, 'li_server_info'); PMA_printListItem($strProtocolVersion . ': ' . PMA_DBI_get_proto_info(), 'li_mysql_proto'); - PMA_printListItem($strServer . ': ' . $server_info, 'li_server_info'); + /** + * @todo tweak the CSS to use same image as li_server_info + */ + PMA_printListItem($strServer . ': ' . $server_info, 'li_server_info2'); PMA_printListItem($strUser . ': ' . htmlspecialchars($mysql_cur_user_and_host), 'li_user_info'); } else { PMA_printListItem($strServerVersion . ': ' . PMA_MYSQL_STR_VERSION, 'li_server_info'); - PMA_printListItem($strServer . ': ' . $server_info, 'li_server_info'); + PMA_printListItem($strServer . ': ' . $server_info, 'li_server_info2'); } if ($cfg['AllowAnywhereRecoding'] && $allow_recoding && PMA_MYSQL_INT_VERSION < 40100) { @@ -298,7 +301,7 @@ echo '

'; echo PMA_Config::getFontsizeForm(); echo '

'; PMA_printListItem($strPmaDocumentation, 'li_pma_docs', 'Documentation.html', null, '_blank'); -PMA_printListItem($strPmaWiki, 'li_pma_docs', 'http://wiki.cihar.com', null, '_blank'); +PMA_printListItem($strPmaWiki, 'li_pma_docs2', 'http://wiki.cihar.com', null, '_blank'); if ($cfg['ShowPhpInfo']) { PMA_printListItem($strShowPHPInfo, 'li_phpinfo', './phpinfo.php?' . $common_url_query); diff --git a/navigation.php b/navigation.php index a677df980b..e8f70fa9d3 100644 --- a/navigation.php +++ b/navigation.php @@ -148,6 +148,31 @@ $pos = $_SESSION['userconf']['navi_limit_offset']; // b_minus.png'; var image_plus = 'b_plus.png'; + + // INIT PMA_setFrameSize + var onloadCnt = 0; + var onLoadHandler = window.onload; + var resizeHandler = window.onresize; + window.document.onresize = resizeHandler; + window.onload = function() { + if (onloadCnt == 0) { + if (typeof(onLoadHandler) == "function") { + onLoadHandler(); + } + if (typeof(PMA_setFrameSize) != 'undefined' && typeof(PMA_setFrameSize) == 'function') { + PMA_setFrameSize(); + } + onloadCnt++; + } + }; + window.onresize = function() { + if (typeof(resizeHandler) == "function") { + resizeHandler(); + } + if (typeof(PMA_saveFrameSize) != 'undefined' && typeof(PMA_saveFrameSize) == 'function') { + PMA_saveFrameSize(); + } + }; // ]]> - +