diff --git a/ChangeLog b/ChangeLog index c289fd47d..cf1396cd9 100755 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,15 @@ $Id$ $Source$ +2002-06-22 Olivier L. Müller + * lang/english-utf8.inc.php3, lang/english.inc.php3, lang/french.inc.php3: + shorter term for QBE + * config.inc.php3: added configuration variables for default tabs + * tbl_properties_links.php3: 'Empty' tab is now red as well + * db_details_links.php3, index.php3, left.php3, tbl_properties_links.php3: + moved 'Structure' to the front and use it as default value. + TODO: make that customizable. + 2002-06-22 Robin Johnson * sql.php3: - Fix warning and error from mysql_free_result($cna_all_result); diff --git a/config.inc.php3 b/config.inc.php3 index 26e6a0344..4f24edc46 100755 --- a/config.inc.php3 +++ b/config.inc.php3 @@ -183,6 +183,12 @@ $cfg['GZipDump'] = TRUE; // compression for $cfg['BZipDump'] = TRUE; // dump files +// Default Tabs settings + +$cfg['DefaultTabTable'] = 'Structure'; // not active yet +$cfg['DefaultTabDatabase'] = 'Structure'; // not active yet + + /** * Link to the official MySQL documentation * Be sure to include no trailing slash on the path diff --git a/db_details_links.php3 b/db_details_links.php3 index 3613375d9..aba5a6753 100644 --- a/db_details_links.php3 +++ b/db_details_links.php3 @@ -48,8 +48,8 @@ else { ; font-size: ,*" rows="*"> - + <body bgcolor="#FFFFFF"> diff --git a/lang/english-utf8.inc.php3 b/lang/english-utf8.inc.php3 index 75a8ab47c..4119bdb45 100644 --- a/lang/english-utf8.inc.php3 +++ b/lang/english-utf8.inc.php3 @@ -267,7 +267,7 @@ $strPrintView = 'Print view'; $strPrivileges = 'Privileges'; $strProperties = 'Properties'; -$strQBE = 'Query by Example'; +$strQBE = 'Query'; $strQBEDel = 'Del'; $strQBEIns = 'Ins'; $strQueryOnDb = 'SQL-query on database <b>%s</b>:'; diff --git a/lang/english.inc.php3 b/lang/english.inc.php3 index 74c42f241..36995c2b6 100644 --- a/lang/english.inc.php3 +++ b/lang/english.inc.php3 @@ -266,7 +266,7 @@ $strPrintView = 'Print view'; $strPrivileges = 'Privileges'; $strProperties = 'Properties'; -$strQBE = 'Query by Example'; +$strQBE = 'Query'; $strQBEDel = 'Del'; $strQBEIns = 'Ins'; $strQueryOnDb = 'SQL-query on database <b>%s</b>:'; diff --git a/lang/french.inc.php3 b/lang/french.inc.php3 index 9e869e3c5..0186b5d27 100644 --- a/lang/french.inc.php3 +++ b/lang/french.inc.php3 @@ -267,7 +267,7 @@ $strPrintView = 'Version imprimable'; $strPrivileges = 'Privilèges'; $strProperties = 'Propriétés'; -$strQBE = 'Requête par un exemple'; +$strQBE = 'Requête'; $strQBEDel = 'Effacer'; $strQBEIns = 'Ajouter'; $strQueryOnDb = 'Requête SQL sur la base <b>%s</b> :'; diff --git a/left.php3 b/left.php3 index 13f3f2da7..9e874223b 100755 --- a/left.php3 +++ b/left.php3 @@ -241,7 +241,7 @@ if ($num_dbs > 1) { if (!empty($num_tables)) { echo "\n"; ?> - <nobr><a class="item" href="db_details.php3?<?php echo $common_url_query; ?>" onclick="if (capable) {expandBase('el<?php echo $j; ?>', true); return false} else {return true}"> + <nobr><a class="item" href="db_details_structure.php3?<?php echo $common_url_query; ?>" onclick="if (capable) {expandBase('el<?php echo $j; ?>', true); return false} else {return true}"> <img name="imEx" id="el<?php echo $j; ?>Img" src="images/plus.gif" border="0" width="9" height="9" alt="+" /></a> <?php } else { @@ -252,7 +252,7 @@ if ($num_dbs > 1) { } echo "\n"; ?> - <a class="item" href="db_details.php3?<?php echo $common_url_query; ?>" onclick="if (capable) {expandBase('el<?php echo $j; ?>', false)}"> + <a class="item" href="db_details_structure.php3?<?php echo $common_url_query; ?>" onclick="if (capable) {expandBase('el<?php echo $j; ?>', false)}"> <span class="heada"><?php echo $db; ?><bdo dir="<?php echo($text_dir); ?>">  </bdo></span><span class="headaCnt">(<?php echo $num_tables_disp; ?>)</span></a></nobr> </div> @@ -268,9 +268,9 @@ if ($num_dbs > 1) { echo "\n"; ?> <nobr><img src="images/spacer.gif" border="0" width="9" height="9" alt="" /> - <a target="phpmain" href="sql.php3?<?php echo $common_url_query; ?>&table=<?php echo urlencode($table); ?>&sql_query=<?php echo urlencode('SELECT * FROM ' . PMA_backquote($table)); ?>&pos=0&goto=tbl_properties.php3"> + <a target="phpmain" href="sql.php3?<?php echo $common_url_query; ?>&table=<?php echo urlencode($table); ?>&sql_query=<?php echo urlencode('SELECT * FROM ' . PMA_backquote($table)); ?>&pos=0&goto=tbl_properties_structure.php3"> <img src="images/browse.gif" width="8" height="8" border="0" alt="<?php echo "$strBrowse: $table"; ?>" title="<?php echo "$strBrowse: $table"; ?>" /></a><bdo dir="<?php echo $text_dir; ?>"> </bdo> - <a class="tblItem" id="<?php echo md5($table); ?>" title="<?php echo $url_title; ?>" target="phpmain" href="tbl_properties.php3?<?php echo $common_url_query; ?>&table=<?php echo urlencode($table); ?>"> + <a class="tblItem" id="<?php echo md5($table); ?>" title="<?php echo $url_title; ?>" target="phpmain" href="tbl_properties_structure.php3?<?php echo $common_url_query; ?>&table=<?php echo urlencode($table); ?>"> <?php echo $table; ?></a></nobr><br /> <?php } // end for $t (tables list) @@ -295,12 +295,12 @@ if ($num_dbs > 1) { $url_title = (!empty($tooltip) && isset($tooltip[$table])) ? str_replace('"', '"', $tooltip[$table]) : ''; - $table_list .= ' <nobr><a target="phpmain" href="sql.php3?' . $common_url_query . '&table=' . urlencode($table) . '&sql_query=' . urlencode('SELECT * FROM ' . PMA_backquote($table)) . '&pos=0&goto=tbl_properties.php3">' . "\n"; + $table_list .= ' <nobr><a target="phpmain" href="sql.php3?' . $common_url_query . '&table=' . urlencode($table) . '&sql_query=' . urlencode('SELECT * FROM ' . PMA_backquote($table)) . '&pos=0&goto=tbl_properties_structure.php3">' . "\n"; $table_list .= ' <img src="images/browse.gif" width="8" height="8" border="0" alt="' . $strBrowse . ': ' . $table . '" title="' . $strBrowse . ': ' . $table . '" /></a><bdo dir="' . $text_dir . '"> </bdo>' . "\n"; if (PMA_USR_BROWSER_AGENT == 'IE') { - $table_list .= ' <span class="tblItem"><a class="tblItem" id="' . md5($table) . '" title="' . $url_title . '" target="phpmain" href="tbl_properties.php3?' . $common_url_query . '&table=' . urlencode($table) . '">' . $table . '</a></span></nobr><br />' . "\n"; + $table_list .= ' <span class="tblItem"><a class="tblItem" id="' . md5($table) . '" title="' . $url_title . '" target="phpmain" href="tbl_properties_structure.php3?' . $common_url_query . '&table=' . urlencode($table) . '">' . $table . '</a></span></nobr><br />' . "\n"; } else { - $table_list .= ' <a class="tblItem" id="' . md5($table) . '" title="' . $url_title . '" target="phpmain" href="tbl_properties.php3?' . $common_url_query . '&table=' . urlencode($table) . '">' . $table . '</a></nobr><br />' . "\n"; + $table_list .= ' <a class="tblItem" id="' . md5($table) . '" title="' . $url_title . '" target="phpmain" href="tbl_properties_structure.php3?' . $common_url_query . '&table=' . urlencode($table) . '">' . $table . '</a></nobr><br />' . "\n"; } } // end for $t (tables list) @@ -310,7 +310,7 @@ if ($num_dbs > 1) { } $selected = ' selected="selected"'; - $table_list_header .= ' <a class="item" target="phpmain" href="db_details.php3?' . $common_url_query . '">' . "\n"; + $table_list_header .= ' <a class="item" target="phpmain" href="db_details_structure.php3?' . $common_url_query . '">' . "\n"; $table_list_header .= ' <span class="heada"><b>' . $db . '</b><bdo dir="' . $text_dir . '">  </bdo></span></a><br />' . "\n\n"; } else { $selected = ''; @@ -399,7 +399,7 @@ else if ($num_dbs == 1) { echo "\n"; ?> <div id="el2Parent" class="parent"> - <nobr><a class="item" href="db_details.php3?<?php echo $common_url_query; ?>"> + <nobr><a class="item" href="db_details_structure.php3?<?php echo $common_url_query; ?>"> <span class="heada"><?php echo $db; ?><bdo dir="<?php echo($text_dir); ?>">  </bdo></span><span class="headaCnt">(<?php echo $num_tables_disp; ?>)</span></a></nobr> </div> <div id="el2Child" class="child" style="margin-bottom: 5px"> @@ -412,9 +412,9 @@ else if ($num_dbs == 1) { : ''; echo "\n"; ?> - <nobr><a target="phpmain" href="sql.php3?<?php echo $common_url_query; ?>&table=<?php echo urlencode($table); ?>&sql_query=<?php echo urlencode('SELECT * FROM ' . PMA_backquote($table)); ?>&pos=0&goto=tbl_properties.php3"> + <nobr><a target="phpmain" href="sql.php3?<?php echo $common_url_query; ?>&table=<?php echo urlencode($table); ?>&sql_query=<?php echo urlencode('SELECT * FROM ' . PMA_backquote($table)); ?>&pos=0&goto=tbl_properties_structure.php3"> <img src="images/browse.gif" width="8" height="8" border="0" alt="<?php echo "$strBrowse: $table"; ?>" title="<?php echo "$strBrowse: $table"; ?>" /></a><bdo dir="<?php echo $text_dir; ?>"> </bdo> - <a class="tblItem" id="<?php echo md5($table); ?>" title="<?php echo $url_title; ?>" target="phpmain" href="tbl_properties.php3?<?php echo $common_url_query; ?>&table=<?php echo urlencode($table); ?>"> + <a class="tblItem" id="<?php echo md5($table); ?>" title="<?php echo $url_title; ?>" target="phpmain" href="tbl_properties_structure.php3?<?php echo $common_url_query; ?>&table=<?php echo urlencode($table); ?>"> <?php echo $table; ?></a></nobr><br /> <?php } // end for $j (tables list) diff --git a/tbl_properties_links.php3 b/tbl_properties_links.php3 index f53ea7b28..cce78e9c1 100755 --- a/tbl_properties_links.php3 +++ b/tbl_properties_links.php3 @@ -22,7 +22,7 @@ if ($num_rows > 0) { . urlencode($ln6_stt . PMA_backquote($table)) . '&zero_rows=' . urlencode(sprintf($strTableHasBeenEmptied, htmlspecialchars($table))); - $att6 = 'onclick="return confirmLink(this, \'' . $ln6_stt . PMA_jsFormat($table) . '\')"'; + $att6 = 'class="drop" onclick="return confirmLink(this, \'' . $ln6_stt . PMA_jsFormat($table) . '\')"'; } else { $lnk2 = ''; $arg2 = ''; @@ -45,15 +45,15 @@ $att7 = 'class="drop" onclick="return confirmLink(this, \'DROP TABLE ' . PMA_jsF <tr> <td width="8"> </td> <?php -echo printTab($strSQL,"tbl_properties.php3",$url_query); -echo printTab($strBrowse,$lnk2,$arg2); echo printTab($strStructure,"tbl_properties_structure.php3",$url_query); +echo printTab($strBrowse,$lnk2,$arg2); +echo printTab($strSQL,"tbl_properties.php3",$url_query); echo printTab($strSelect,$lnk4,$arg4); echo printTab($strInsert,"tbl_change.php3",$url_query); -echo printTab($strEmpty,$lnk6,$arg6,$att6); echo printTab($strExport,"tbl_properties_export.php3",$url_query); echo printTab($strOperations,"tbl_properties_operations.php3",$url_query); echo printTab($strOptions,"tbl_properties_options.php3",$url_query); +echo printTab($strEmpty,$lnk6,$arg6,$att6); echo printTab($strDrop,"sql.php3",$arg7,$att7); ?>