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

Frame resizing and Bug #744947

Browse Source
This commit is contained in:
Garvin Hicking
2003-05-29 14:07:37 +00:00
parent 856eff4425
commit f961825edc
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -5,6 +5,13 @@ phpMyAdmin - Changelog
$Id$
$Source$
2003-05-29 Garvin Hicking <me@supergarv.de>
* index.php3: Add frameborder to allow resizing. Introduces a 1px
bar, but cannot be solved. Note that this is only neccessary
for Mozilla, IE5/6 allow resizing with a "0" frameborder
* footer.inc.php3: Only update queryframes DB/Table info when
no error happened in a query.
2003-05-28 Alexander M. Turek <rabus@users.sourceforge.net>
* translators.html: Typo.

10
footer.inc.php3
View File

@@ -23,11 +23,17 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
}
?>
<?php
if (!isset($error_message) || $error_message == '') {
?>
if (top.frames.queryframe && top.frames.queryframe.document && top.frames.queryframe.document.queryframeform) {
top.frames.queryframe.document.queryframeform.db.value = "<?php echo (isset($db) ? addslashes($db) : ''); ?>";
top.frames.queryframe.document.queryframeform.table.value = "<?php echo (isset($table) ? addslashes($table) : ''); ?>";
}
<?php
}
?>
function reload_querywindow () {
if (top.frames.queryframe && top.frames.queryframe.querywindow && !top.frames.queryframe.querywindow.closed && top.frames.queryframe.querywindow.location) {
<?php echo ($cfg['QueryFrameDebug'] ? 'document.writeln("<a href=\'#\' onClick=\'top.frames.queryframe.querywindow.focus(); return false;\'>Query Window</a> can be updated.<br>");' : ''); ?>
@@ -136,4 +142,4 @@ if (isset($GLOBALS['cfg']['OBGzip']) && $GLOBALS['cfg']['OBGzip']
PMA_outBufferPost($GLOBALS['ob_mode']);
}
?>
?>

6
index.php3
View File

@@ -69,7 +69,7 @@ if ($cfg['QueryFrame']) {
if ($cfg['QueryFrameJS']) {
echo '<script type="text/javascript">' . "\n";
echo '<!--' . "\n";
echo ' document.writeln(\'<frameset cols="' . $cfg['LeftWidth'] . ',*" rows="*" framespacing="0" frameborder="0" border="0">\');' . "\n";
echo ' document.writeln(\'<frameset cols="' . $cfg['LeftWidth'] . ',*" rows="*" border="1" frameborder="1" framespacing="0">\');' . "\n";
echo ' document.writeln(\' <frameset rows="*, 50" framespacing="0" frameborder="0" border="0">\');' . "\n";
echo ' document.writeln(\' <frame src="left.php3?' . $url_query . '&amp;hash=' . $phpmain_hash . $phpmain_hash_js . '" name="nav" frameborder="0" />\');' . "\n";
echo ' document.writeln(\' <frame src="queryframe.php3?' . $url_query . '&amp;hash=' . $phpmain_hash . $phpmain_hash_js . '" name="queryframe" frameborder="0" />\');' . "\n";
@@ -87,7 +87,7 @@ if ($cfg['QueryFrame']) {
echo '<noscript>' . "\n";
}
echo '<frameset cols="' . $cfg['LeftWidth'] . ',*" rows="*">' . "\n";
echo '<frameset cols="' . $cfg['LeftWidth'] . ',*" rows="*" border="1" frameborder="1" framespacing="0">' . "\n";
echo ' <frameset rows="*, 50" framespacing="0" frameborder="0" border="0">' . "\n";
echo ' <frame src="left.php3?' . $url_query . '&amp;hash=' . $phpmain_hash . '" name="nav" frameborder="0" />' . "\n";
echo ' <frame src="queryframe.php3?' . $url_query . '&amp;hash=' . $phpmain_hash . '" name="queryframe" frameborder="0" />' . "\n";
@@ -96,7 +96,7 @@ if ($cfg['QueryFrame']) {
} else {
echo '<frameset cols="' . $cfg['LeftWidth'] . ',*" rows="*">' . "\n";
echo '<frameset cols="' . $cfg['LeftWidth'] . ',*" rows="*" border="1" frameborder="1" framespacing="0">' . "\n";
echo ' <frame src="left.php3?' . $url_query . '&amp;hash=' . $phpmain_hash . '" name="nav" frameborder="0" />' . "\n";
echo ' <frame src="' . (empty($db) ? 'main.php3' : $cfg['DefaultTabDatabase']) . '?' . $url_query . '" name="phpmain' . $phpmain_hash . '" frameborder="1" />' . "\n";