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

bug 981939 and problem with db dropdown in original theme

Browse Source
This commit is contained in:
Marc Delisle
2004-07-05 13:18:08 +00:00
parent 750890b04d
commit 03f052c23a
4 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -5,6 +5,12 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2004-07-05 Marc Delisle <lem9@users.sourceforge.net>
* footer.inc.php, index.php, queryframe.php: bug 981939, database
selection in left frame under Opera, and problems with dropdown
in left frame when many databases are there (original theme),
thanks to Michael Keck
2004-07-02 Marc Delisle <lem9@users.sourceforge.net> 2004-07-02 Marc Delisle <lem9@users.sourceforge.net>
* main.php: put Create button on the same line as the input field * main.php: put Create button on the same line as the input field

26
footer.inc.php
View File

@@ -30,18 +30,28 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
$num_tables_disp = ' (-)'; $num_tables_disp = ' (-)';
} }
?> ?>
var dbBoxSetupDone = false;
function dbBoxSetup() {
if (dbBoxSetupDone != true) {
if (parent.frames.queryframe && parent.frames.queryframe.document.left && parent.frames.queryframe.document.left.lightm_db) {
parent.frames.queryframe.document.left.lightm_db.value = '<?php echo addslashes($db); ?>';
dbBoxSetupDone = true;
} else {
setTimeout("dbBoxSetup();",500);
}
}
}
if (parent.frames.queryframe && parent.frames.queryframe.document && parent.frames.queryframe.document.queryframeform) { if (parent.frames.queryframe && parent.frames.queryframe.document && parent.frames.queryframe.document.queryframeform) {
parent.frames.queryframe.document.queryframeform.db.value = "<?php echo (isset($db) ? addslashes($db) : ''); ?>"; parent.frames.queryframe.document.queryframeform.db.value = "<?php echo (isset($db) ? addslashes($db) : ''); ?>";
parent.frames.queryframe.document.queryframeform.table.value = "<?php echo (isset($table) ? addslashes($table) : ''); ?>"; parent.frames.queryframe.document.queryframeform.table.value = "<?php echo (isset($table) ? addslashes($table) : ''); ?>";
} }
if (parent.frames.queryframe && parent.frames.queryframe.document && parent.frames.queryframe.document.left) { if (parent.frames.queryframe && parent.frames.queryframe.document && parent.frames.queryframe.document.left && parent.frames.queryframe.document.left.lightm_db) {
parent.frames.queryframe.document.left.lightm_db.value = "<?php echo (isset($db) ? addslashes($db) : ''); ?>"; selidx = parent.frames.queryframe.document.left.lightm_db.selectedIndex;
for (i=0;i<parent.frames.queryframe.document.left.lightm_db.options.length;i++) { if (parent.frames.queryframe.document.left.lightm_db.options[selidx].value == "<?php echo addslashes($db); ?>") {
if (parent.frames.queryframe.document.left.lightm_db.options[i].selected) { parent.frames.queryframe.document.left.lightm_db.options[selidx].text = "<?php echo addslashes($db) . $num_tables_disp; ?>";
noption=new Option("<?php echo addslashes($db) . $num_tables_disp; ?>","<?php echo addslashes($db); ?>"); } else {
parent.frames.queryframe.document.left.lightm_db.options[i]=noption; parent.frames.queryframe.location.reload();
parent.frames.queryframe.document.left.lightm_db.value = "<?php echo (isset($db) ? addslashes($db) : ''); ?>"; setTimeout("dbBoxSetup();",2000);
}
} }
} }
<?php <?php

2
index.php
View File

@@ -65,7 +65,7 @@ $logo_image = $GLOBALS['pmaThemeImage'] . 'logo_left.png';
$query_frame_height = 0; $query_frame_height = 0;
if (@file_exists($logo_image)) { if (@file_exists($logo_image)) {
$tmp_imgsize = @getimagesize($logo_image); $tmp_imgsize = @getimagesize($logo_image);
$query_frame_height = ($tmp_imgsize[1] + 15); $query_frame_height = ($tmp_imgsize[1] + 15 + ((!isset($_COOKIE['pma_theme']) || $_COOKIE['pma_theme']=='original') ? 25 : 0));
} }
if ($query_frame_height == 0) { if ($query_frame_height == 0) {
$query_frame_height = 60; $query_frame_height = 60;

2
queryframe.php
View File

@@ -229,7 +229,7 @@ if ($num_dbs > 1) {
echo PMA_generate_common_hidden_inputs(); echo PMA_generate_common_hidden_inputs();
echo ' <input type="hidden" name="hash" value="' . $hash . '" />' . "\n"; echo ' <input type="hidden" name="hash" value="' . $hash . '" />' . "\n";
?> ?>
<select name="lightm_db" onchange="this.form.submit();this.blur();"> <select name="lightm_db" onchange="this.form.submit();">
<?php <?php
echo ' <option value="">(' . $strDatabases . ') ...</option>' . "\n"; echo ' <option value="">(' . $strDatabases . ') ...</option>' . "\n";
$table_list = ''; $table_list = '';