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

increased values for QueryWindow Size, bug: querywindow to small

Browse Source
This commit is contained in:
Michael Keck
2005-01-20 16:38:46 +00:00
parent 27afa33d33
commit 53f051d2c1
5 changed files with 38 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@@ -1,10 +1,21 @@
---------------------- ----------------------
phpMyAdmin - Changelog phpMyAdmin - Changelog
---------------------- ----------------------
$Id$ $Id$
$Source$ $Source$
2005-01-20 Michael Keck <mkkeck@users.sourceforge.net>
* new js-library: tooltip.js for tooltips (hints)
* libraries/common.lib.php: img tag modified for mouseover / mouseout
(show/hide tooltip)
* header.inc.php: needed div-container for tooltips
* footer.inc.php: linking to js-file tooltip.js
* themes/.../theme_right.css.php: tooltip class
* querywindow.php / tbl_query_box.php: resizing the querywindow if it
to small
* themes/.../layout.inc.php: increased QueryWindowHeight / QueryWindowWidth
2005-01-20 Alexander M. Turek <me@derrabus.de> 2005-01-20 Alexander M. Turek <me@derrabus.de>
* server_engines.php, server_links.inc.php: Use Michael's new icon for * server_engines.php, server_links.inc.php: Use Michael's new icon for
storage engines. storage engines.

27
querywindow.php
View File

@@ -73,7 +73,6 @@ var confirmMsg = '<?php echo(($GLOBALS['cfg']['Confirm']) ? str_replace('\'', '
</head> </head>
<body bgcolor="<?php echo ($cfg['QueryFrameJS'] ? $cfg['LeftBgColor'] : $cfg['RightBgColor']); ?>"> <body bgcolor="<?php echo ($cfg['QueryFrameJS'] ? $cfg['LeftBgColor'] : $cfg['RightBgColor']); ?>">
<?php <?php
if ($cfg['QueryFrameJS'] && !isset($no_js)) { if ($cfg['QueryFrameJS'] && !isset($no_js)) {
$querydisplay_tab = (isset($querydisplay_tab) ? $querydisplay_tab : $cfg['QueryWindowDefTab']); $querydisplay_tab = (isset($querydisplay_tab) ? $querydisplay_tab : $cfg['QueryWindowDefTab']);
@@ -89,12 +88,12 @@ if ($cfg['QueryFrameJS'] && !isset($no_js)) {
. ' <td class="navSpacer"><img src="' .$GLOBALS['pmaThemeImage'] . 'spacer.png' .'" width="1" height="1" border="0" alt="" /></td>'; . ' <td class="navSpacer"><img src="' .$GLOBALS['pmaThemeImage'] . 'spacer.png' .'" width="1" height="1" border="0" alt="" /></td>';
} }
echo "\n"; echo "\n";
echo PMA_printTab(($GLOBALS['cfg']['PropertiesIconic'] != false ? '<img src="' . $GLOBALS['pmaThemeImage'] . 'b_sql.png" width="16" height="16" border="0" hspace="2" align="middle" alt="'.$strSQL.'" />' : '') . $strSQL, '#', '', 'onclick="javascript:query_tab_commit(\'sql\');return false;"', '', '', (isset($querydisplay_tab) && $querydisplay_tab == 'sql' ? TRUE : FALSE)); echo PMA_printTab(($GLOBALS['cfg']['PropertiesIconic'] != false ? '<img src="' . $GLOBALS['pmaThemeImage'] . 'b_sql.png" width="16" height="16" border="0" hspace="2" align="middle" alt="'.$strSQL.'" />' : '') . $strSQL, '#', '', ' onclick="javascript:query_tab_commit(\'sql\');return false;"', '', '', (isset($querydisplay_tab) && $querydisplay_tab == 'sql' ? TRUE : FALSE));
echo PMA_printTab(($GLOBALS['cfg']['PropertiesIconic'] != false ? '<img src="' . $GLOBALS['pmaThemeImage'] . 'b_import.png" width="16" height="16" border="0" hspace="2" align="middle" alt="'.$strImportFiles.'" />' : '') . $strImportFiles, '#', '', 'onclick="javascript:query_tab_commit(\'files\');return false;"', '', '', (isset($querydisplay_tab) && $querydisplay_tab == 'files' ? TRUE : FALSE)); echo PMA_printTab(($GLOBALS['cfg']['PropertiesIconic'] != false ? '<img src="' . $GLOBALS['pmaThemeImage'] . 'b_import.png" width="16" height="16" border="0" hspace="2" align="middle" alt="'.$strImportFiles.'" />' : '') . $strImportFiles, '#', '', ' onclick="javascript:query_tab_commit(\'files\');return false;"', '', '', (isset($querydisplay_tab) && $querydisplay_tab == 'files' ? TRUE : FALSE));
echo PMA_printTab($strQuerySQLHistory, '#', '', 'onclick="javascript:query_tab_commit(\'history\');return false;"', '', '', (isset($querydisplay_tab) && $querydisplay_tab == 'history' ? TRUE : FALSE)); echo PMA_printTab($strQuerySQLHistory, '#', '', ' onclick="javascript:query_tab_commit(\'history\');return false;"', '', '', (isset($querydisplay_tab) && $querydisplay_tab == 'history' ? TRUE : FALSE));
if ($cfg['QueryWindowDefTab'] == 'full') { if ($cfg['QueryWindowDefTab'] == 'full') {
echo PMA_printTab($strAll, '#', '', 'onclick="javascript:query_tab_commit(\'full\');return false;"', '', '', (isset($querydisplay_tab) && $querydisplay_tab == 'full' ? TRUE : FALSE)); echo PMA_printTab($strAll, '#', '', ' onclick="javascript:query_tab_commit(\'full\');return false;"', '', '', (isset($querydisplay_tab) && $querydisplay_tab == 'full' ? TRUE : FALSE));
} }
if (!$cfg['LightTabs']) { if (!$cfg['LightTabs']) {
@@ -112,7 +111,6 @@ if ($cfg['QueryFrameJS'] && !isset($no_js)) {
?> ?>
<br /> <br />
<?php <?php
if ($cfg['PropertiesIconic'] == true) { if ($cfg['PropertiesIconic'] == true) {
// We need to copy the value or else the == 'both' check will always return true // We need to copy the value or else the == 'both' check will always return true
@@ -248,10 +246,25 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
<input type="hidden" name="auto_commit" value="false" /> <input type="hidden" name="auto_commit" value="false" />
<input type="hidden" name="querydisplay_tab" value="<?php echo $querydisplay_tab; ?>" /> <input type="hidden" name="querydisplay_tab" value="<?php echo $querydisplay_tab; ?>" />
</form> </form>
<?php
}
$tmp_querydisplay_tab = (isset($querydisplay_tab) ? $querydisplay_tab : $cfg['QueryWindowDefTab']);
if ($tmp_querydisplay_tab == 'sql' || $tmp_querydisplay_tab == $cfg['QueryWindowDefTab']) {
?>
<script type="text/jscript" language="javascript">
<!--
if (document.getElementById && typeof(document.getElementById('sqlcontainer'))!='undefined') {
var newWidth = document.getElementById('sqlcontainer').offsetWidth + 40;
var newHeight = document.getElementById('sqlcontainer').offsetHeight + 100;
self.resizeTo(newWidth, newHeight);
}
//-->
</script>
<?php <?php
} }
?> ?>
</body> </body>
</html> </html>

4
tbl_query_box.php
View File

@@ -120,11 +120,11 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS'] && isset($is_inside_querywindow)
. ' </noscript>'; . ' </noscript>';
} else { } else {
?> ?>
<form method="post" action="read_dump.php"<?php if ($is_upload) echo ' enctype="multipart/form-data"'; ?> onsubmit="return checkSqlQuery(this)" name="sqlform"> <form method="post" action="read_dump.php"<?php if ($is_upload) echo ' enctype="multipart/form-data"'; ?> onsubmit="return checkSqlQuery(this)" name="sqlform" style="padding: 0px; magin: 0px;">
<?php <?php
} }
?> ?>
<table border="0" cellpadding="2" cellspacing="0"> <table border="0" cellpadding="2" cellspacing="0" id="sqlcontainer" name="sqlcontainer">
<?php <?php
// for better administration // for better administration
$querybox_hidden_fields = ' <input type="hidden" name="is_js_confirmed" value="0" />' . "\n" $querybox_hidden_fields = ' <input type="hidden" name="is_js_confirmed" value="0" />' . "\n"

4
themes/darkblue_orange/layout.inc.php
View File

@@ -15,8 +15,8 @@ $cfg['BrowsePointerColor'] = '#CCCCFF'; // color of the pointer in browse mo
$cfg['BrowseMarkerColor'] = '#FFCC99'; // color of the marker (visually marks row $cfg['BrowseMarkerColor'] = '#FFCC99'; // color of the marker (visually marks row
// by clicking on it) in browse mode // by clicking on it) in browse mode
$cfg['QueryWindowWidth'] = 550; // Width of Query window $cfg['QueryWindowWidth'] = 600; // Width of Query window
$cfg['QueryWindowHeight'] = 310; // Height of Query window $cfg['QueryWindowHeight'] = 400; // Height of Query window
/** /**
* SQL Parser Settings * SQL Parser Settings

4
themes/original/layout.inc.php
View File

@@ -15,8 +15,8 @@ $cfg['BrowsePointerColor'] = '#CCFFCC'; // color of the pointer in browse mo
$cfg['BrowseMarkerColor'] = '#FFCC99'; // color of the marker (visually marks row $cfg['BrowseMarkerColor'] = '#FFCC99'; // color of the marker (visually marks row
// by clicking on it) in browse mode // by clicking on it) in browse mode
$cfg['QueryWindowWidth'] = 550; // Width of Query window $cfg['QueryWindowWidth'] = 600; // Width of Query window
$cfg['QueryWindowHeight'] = 310; // Height of Query window $cfg['QueryWindowHeight'] = 400; // Height of Query window
/** /**
* SQL Parser Settings * SQL Parser Settings