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

bug #1918531 [compatibility] Navigation is not w3.org valid

Browse Source
This commit is contained in:
Marc Delisle
2008-03-22 21:41:20 +00:00
parent f207019d2c
commit 6104714c00
3 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -18,6 +18,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
thanks to Falk Nisius - klaf thanks to Falk Nisius - klaf
- bug #1812763 [Copy] Table copy when server is in ANSI_QUOTES sql_mode - bug #1812763 [Copy] Table copy when server is in ANSI_QUOTES sql_mode
thanks to Tony Marston - tonymarston 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) 2.11.5.0 (2008-03-01)
- bug #1862661 [GUI] Warn about rename deleting database - bug #1862661 [GUI] Warn about rename deleting database

9
main.php
View File

@@ -96,12 +96,15 @@ if ($server > 0) {
PMA_printListItem($strServerVersion . ': ' . PMA_MYSQL_STR_VERSION, 'li_server_info'); PMA_printListItem($strServerVersion . ': ' . PMA_MYSQL_STR_VERSION, 'li_server_info');
PMA_printListItem($strProtocolVersion . ': ' . PMA_DBI_get_proto_info(), PMA_printListItem($strProtocolVersion . ': ' . PMA_DBI_get_proto_info(),
'li_mysql_proto'); '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), PMA_printListItem($strUser . ': ' . htmlspecialchars($mysql_cur_user_and_host),
'li_user_info'); 'li_user_info');
} else { } else {
PMA_printListItem($strServerVersion . ': ' . PMA_MYSQL_STR_VERSION, 'li_server_info'); 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) { if ($cfg['AllowAnywhereRecoding'] && $allow_recoding && PMA_MYSQL_INT_VERSION < 40100) {
@@ -298,7 +301,7 @@ echo '<li id="li_select_fontsize">';
echo PMA_Config::getFontsizeForm(); echo PMA_Config::getFontsizeForm();
echo '</li>'; echo '</li>';
PMA_printListItem($strPmaDocumentation, 'li_pma_docs', 'Documentation.html', null, '_blank'); 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']) { if ($cfg['ShowPhpInfo']) {
PMA_printListItem($strShowPHPInfo, 'li_phpinfo', './phpinfo.php?' . $common_url_query); PMA_printListItem($strShowPHPInfo, 'li_phpinfo', './phpinfo.php?' . $common_url_query);

27
navigation.php
View File

@@ -148,6 +148,31 @@ $pos = $_SESSION['userconf']['navi_limit_offset'];
// <![CDATA[ // <![CDATA[
var image_minus = '<?php echo $GLOBALS['pmaThemeImage']; ?>b_minus.png'; var image_minus = '<?php echo $GLOBALS['pmaThemeImage']; ?>b_minus.png';
var image_plus = '<?php echo $GLOBALS['pmaThemeImage']; ?>b_plus.png'; var image_plus = '<?php echo $GLOBALS['pmaThemeImage']; ?>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();
}
};
// ]]> // ]]>
</script> </script>
<?php <?php
@@ -166,7 +191,7 @@ $pos = $_SESSION['userconf']['navi_limit_offset'];
<![endif]--> <![endif]-->
</head> </head>
<body id="body_leftFrame" onload="PMA_setFrameSize();" onresize="PMA_saveFrameSize();"> <body id="body_leftFrame">
<?php <?php
require './libraries/navigation_header.inc.php'; require './libraries/navigation_header.inc.php';
if (! $GLOBALS['server']) { if (! $GLOBALS['server']) {