increased values for QueryWindow Size, bug: querywindow to small

phpmyadmin · Jan 20, 2005 · 53f051d · 53f051d
1 parent 27afa33
commit 53f051d
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 14 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,10 +1,21 @@
-----------------------
+----------------------
 phpMyAdmin - Changelog
 ----------------------
 
 $Id$
 $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>
     * server_engines.php, server_links.inc.php: Use Michael's new icon for
       storage engines.

diff --git a/querywindow.php b/querywindow.php
@@ -73,7 +73,6 @@ function query_tab_commit(tab) {
 </head>
 
 <body bgcolor="<?php echo ($cfg['QueryFrameJS'] ? $cfg['LeftBgColor'] : $cfg['RightBgColor']); ?>">
-
 <?php
 if ($cfg['QueryFrameJS'] && !isset($no_js)) {
     $querydisplay_tab = (isset($querydisplay_tab) ? $querydisplay_tab : $cfg['QueryWindowDefTab']);
@@ -89,12 +88,12 @@ function query_tab_commit(tab) {
        . '                <td class="navSpacer"><img src="' .$GLOBALS['pmaThemeImage'] . 'spacer.png'  .'" width="1" height="1" border="0" alt="" /></td>';
     }
     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_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(($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($strQuerySQLHistory, '#', '', ' onclick="javascript:query_tab_commit(\'history\');return false;"', '', '', (isset($querydisplay_tab) && $querydisplay_tab == 'history' ? 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));
+        echo PMA_printTab($strAll, '#', '', ' onclick="javascript:query_tab_commit(\'full\');return false;"', '', '', (isset($querydisplay_tab) && $querydisplay_tab == 'full' ? TRUE : FALSE));
     }
 
     if (!$cfg['LightTabs']) {
@@ -112,7 +111,6 @@ function query_tab_commit(tab) {
 
 ?>
 <br />
-
 <?php
 if ($cfg['PropertiesIconic'] == true) {
     // We need to copy the value or else the == 'both' check will always return true
@@ -248,10 +246,25 @@ function query_tab_commit(tab) {
     <input type="hidden" name="auto_commit" value="false" />
     <input type="hidden" name="querydisplay_tab" value="<?php echo $querydisplay_tab; ?>" />
 </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
+}
+?>
 </body>
 </html>
 

diff --git a/tbl_query_box.php b/tbl_query_box.php
@@ -120,11 +120,11 @@
        . '        </noscript>';
 } 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
 }
 ?>
-            <table border="0" cellpadding="2" cellspacing="0">
+            <table border="0" cellpadding="2" cellspacing="0" id="sqlcontainer" name="sqlcontainer">
 <?php
 // for better administration
 $querybox_hidden_fields = '                    <input type="hidden" name="is_js_confirmed" value="0" />' . "\n"

diff --git a/themes/darkblue_orange/layout.inc.php b/themes/darkblue_orange/layout.inc.php
@@ -15,8 +15,8 @@
 $cfg['BrowseMarkerColor']   = '#FFCC99';    // color of the marker (visually marks row
                                             // by clicking on it) in browse mode
 
-$cfg['QueryWindowWidth']    = 550;          // Width of Query window
-$cfg['QueryWindowHeight']   = 310;          // Height of Query window
+$cfg['QueryWindowWidth']    = 600;          // Width of Query window
+$cfg['QueryWindowHeight']   = 400;          // Height of Query window
 
 /**
  * SQL Parser Settings

diff --git a/themes/original/layout.inc.php b/themes/original/layout.inc.php
@@ -15,8 +15,8 @@
 $cfg['BrowseMarkerColor']   = '#FFCC99';    // color of the marker (visually marks row
                                             // by clicking on it) in browse mode
 
-$cfg['QueryWindowWidth']    = 550;          // Width of Query window
-$cfg['QueryWindowHeight']   = 310;          // Height of Query window
+$cfg['QueryWindowWidth']    = 600;          // Width of Query window
+$cfg['QueryWindowHeight']   = 400;          // Height of Query window
 
 /**
  * SQL Parser Settings