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

Bugfixing, better defaults for query window.

Browse Source
This commit is contained in:
Garvin Hicking
2003-02-28 18:57:34 +00:00
parent 46039e814f
commit 6003d9e95d
9 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@@ -14,6 +14,18 @@ $Source$
* server_privileges.php3: Fixed bug #691910.
2003-02-28 Garvin Hicking <me@supergarv.de>
* config.inc.php3, header.inc.php3, queryframe.php3, querywindow.php3,
tbl_query_box.php3, libraries/common.lib.php3, libraries/config_import.lib.php3,
Documentation.html:
- Finetuneing for query window: Only three tabs, if DefaultTab
is not set to 'full'.
- Inserted nobr-Tags to make german translation for 'sql history' fit inside a tab.
- Improved windowsize of the query window (no a *lot* smaller, hope this will suit
Rabus ;).
- Made the textarea smaller (*1.25 instead of *2) for the window only.
- Fixed a bug when you changed from a table to a database on the left frame and the
query window still wants to show the previous table.
* translators.html: Adjusted to same topmenu as Documentation.html.
With the new 'Transformations' item the bar was too large to fit
on standard 800x600 browser windows.

3
Documentation.html
View File

@@ -1363,7 +1363,8 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
</dt>
<dd>
Number of columns and rows for the textareas.<br />
This value will be emphasized (*2) for sql query textareas.<br />
This value will be emphasized (*2) for sql query textareas and (*1.25) for
sql textareas inside the query window.<br />
The Char* values are used for CHAR and VARCHAR editing (if configured
via $cfg['CharEditing']).
<br /><br />

6
config.inc.php3
View File

@@ -367,7 +367,7 @@ $cfg['BrowseMarkerColor'] = '#FFCC99'; // color of the marker (visually mar
// (blank for no marker)
$cfg['TextareaCols'] = 40; // textarea size (columns) in edit mode
// (this value will be emphasized (*2) for sql
// query textareas)
// query textareas and (*1.25) for query window)
$cfg['TextareaRows'] = 7; // textarea size (rows) in edit mode
$cfg['TextareaAutoSelect'] = TRUE; // autoselect when clicking in the textarea of the querybox
$cfg['CharTextareaCols'] = 40; // textarea size (columns) for CHAR/VARCHAR
@@ -392,8 +392,8 @@ $cfg['QueryFrame'] = TRUE; // displays a new frame where a link
$cfg['QueryFrameJS'] = TRUE; // whether to use JavaScript functions for opening a new window for SQL commands.
// if set to 'false', the target of the querybox is always the right frame.
$cfg['QueryFrameDebug'] = FALSE; // display JS debugging link (DEVELOPERS only)
$cfg['QueryWindowWidth'] = 750; // Width of Query window
$cfg['QueryWindowHeight'] = 300; // Height of Query window
$cfg['QueryWindowWidth'] = 550; // Width of Query window
$cfg['QueryWindowHeight'] = 310; // Height of Query window
$cfg['QueryHistoryDB'] = FALSE; // Set to TRUE if you want DB-based query history.
// If FALSE, this utilizes JS-routines to display
// query history (lost by window close)

4
header.inc.php3
View File

@@ -247,8 +247,8 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
?>
if (top.frames.queryframe) {
<?php echo (isset($db) ? 'top.frames.queryframe.document.queryframeform.db.value = "' . htmlspecialchars($db) . '";' : ''); ?>
<?php echo (isset($table) ? 'top.frames.queryframe.document.queryframeform.table.value = "' . htmlspecialchars($table) . '";' : ''); ?>
top.frames.queryframe.document.queryframeform.db.value = "<?php echo (isset($db) ? htmlspecialchars($db) : ''); ?>";
top.frames.queryframe.document.queryframeform.table.value = "<?php echo (isset($table) ? htmlspecialchars($table) : ''); ?>";
}
function reload_querywindow () {

10
libraries/common.lib.php3
View File

@@ -130,7 +130,7 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold}
* Includes compatibility code for older config.inc.php3 revisions
* if necessary
*/
if (!isset($cfg['FileRevision']) || (int) substr($cfg['FileRevision'], 13, 3) < 166) {
if (!isset($cfg['FileRevision']) || (int) substr($cfg['FileRevision'], 13, 3) < 167) {
include('./libraries/config_import.lib.php3');
}
@@ -1569,9 +1569,9 @@ if (typeof(document.getElementById) != 'undefined'
$out = '';
if (strlen($link) > 0) {
$out .= '<a href="' . $link . $sep . $args . '"' . $attr . '>'
. '<b>' . $text . '</b></a>';
. '<nobr><b>' . $text . '</b></a></nobr>';
} else {
$out .= '<b>' . $text . '</b>';
$out .= '<nobr><b>' . $text . '</b></nobr>';
}
$out = '[ ' . $out . ' ]&nbsp;&nbsp;&nbsp;';
} else {
@@ -1580,9 +1580,9 @@ if (typeof(document.getElementById) != 'undefined'
. "\n" . ' ';
if (strlen($link) > 0) {
$out .= '<a href="' . $link . $sep . $args . '"' . $attr . '>'
. '<b>' . $text . '</b></a>';
. '<nobr><b>' . $text . '</b></a></nobr>';
} else {
$out .= '<b>' . $text . '</b>';
$out .= '<nobr><b>' . $text . '</b></nobr>';
}
$out .= "\n" . ' '
. '</td>'

4
libraries/config_import.lib.php3
View File

@@ -695,11 +695,11 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')) {
}
if (!isset($cfg['QueryWindowWidth'])) {
$cfg['QueryWindowWidth'] = 750;
$cfg['QueryWindowWidth'] = 550;
}
if (!isset($cfg['QueryWindowHeight'])) {
$cfg['QueryWindowHeight'] = 300;
$cfg['QueryWindowHeight'] = 310;
}
if (!isset($cfg['QueryHistoryMax'])) {

2
queryframe.php3
View File

@@ -75,7 +75,7 @@ function open_querywindow(url) {
if (!querywindow.closed && querywindow.location) {
querywindow.focus();
} else {
querywindow=window.open(url + '&db=' + document.queryframeform.db.value + '&table=' + document.queryframeform.table.value, 'js_querywindow','toolbar=0,location=0,directories=0,status=1,menubar=0,scrollbars=yes,resizable=yes,width=750,height=500');
querywindow=window.open(url + '&db=' + document.queryframeform.db.value + '&table=' + document.queryframeform.table.value, 'js_querywindow','toolbar=0,location=0,directories=0,status=1,menubar=0,scrollbars=yes,resizable=yes,width=<?php echo $cfg['QueryWindowWidth']; ?>,height=<?php echo $cfg['QueryWindowHeight']; ?>');
}
if (!querywindow.opener) {

4
querywindow.php3
View File

@@ -152,7 +152,9 @@ echo "\n";
echo PMA_printTab($strSQL, '#', '', 'onClick="javascript:query_tab_commit(\'sql\');return false;"', '', (isset($querydisplay_tab) && $querydisplay_tab == 'sql' ? TRUE : FALSE));
echo PMA_printTab($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($strAll, '#', '', 'onClick="javascript:query_tab_commit(\'full\');return false;"', '', (isset($querydisplay_tab) && $querydisplay_tab == 'full' ? TRUE : FALSE));
if ($cfg['QueryWindowDefTab'] == 'full') {
echo PMA_printTab($strAll, '#', '', 'onClick="javascript:query_tab_commit(\'full\');return false;"', '', (isset($querydisplay_tab) && $querydisplay_tab == 'full' ? TRUE : FALSE));
}
if (!$cfg['LightTabs']) {
echo '</tr></table>';

2
tbl_query_box.php3
View File

@@ -110,7 +110,7 @@ if (!isset($is_inside_querywindow) ||
<input type="button" name="insert" value="<?php echo($strInsert); ?>" onclick="sqlform.sql_query.value = sqlform.sql_query.value + sqlform.dummy.value" />
<br />
<div style="margin-bottom: 5px">
<textarea name="sql_query" rows="<?php echo $cfg['TextareaRows']; ?>" cols="<?php echo $cfg['TextareaCols'] * 2; ?>" wrap="virtual" dir="<?php echo $text_dir; ?>"<?php echo $auto_sel; ?>>
<textarea name="sql_query" rows="<?php echo $cfg['TextareaRows']; ?>" cols="<?php echo (isset($is_inside_querywindow) && $is_inside_querywindow == TRUE ? ceil($cfg['TextareaCols'] * 1.25) : $cfg['TextareaCols'] * 2); ?>" wrap="virtual" dir="<?php echo $text_dir; ?>"<?php echo $auto_sel; ?>>
<?php echo ((!empty($query_to_display)) ? htmlspecialchars($query_to_display) : 'SELECT * FROM ' . PMA_backquote($table) . ' WHERE 1'); ?>
</textarea><br />
<input type="checkbox" name="show_query" value="1" id="checkbox_show_query" checked="checked" />&nbsp;