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

2002-06-22 Olivier L. M�ller <om@omnis.ch>

Browse Source 
* 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.
This commit is contained in:
Olivier Müller
2002-06-22 23:41:04 +00:00
parent 6a4882e1f2
commit 598af56d7b
9 changed files with 35 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@@ -6,6 +6,15 @@ $Id$
$Source$ $Source$
2002-06-22 Olivier L. M<>ller <om@omnis.ch>
* 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 <robbat2@users.sourceforge.net> 2002-06-22 Robin Johnson <robbat2@users.sourceforge.net>
* sql.php3: * sql.php3:
- Fix warning and error from mysql_free_result($cna_all_result); - Fix warning and error from mysql_free_result($cna_all_result);

6
config.inc.php3
View File

@@ -183,6 +183,12 @@ $cfg['GZipDump'] = TRUE; // compression for
$cfg['BZipDump'] = TRUE; // dump files $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 * Link to the official MySQL documentation
* Be sure to include no trailing slash on the path * Be sure to include no trailing slash on the path

2
db_details_links.php3
View File

@@ -48,8 +48,8 @@ else {
<tr> <tr>
<td width="8">&nbsp;</td> <td width="8">&nbsp;</td>
<?php <?php
echo printTab($strSQL,"db_details.php3",$url_query."&amp;db_query_force=1");
echo printTab($strStructure,"db_details_structure.php3",$url_query); echo printTab($strStructure,"db_details_structure.php3",$url_query);
echo printTab($strSQL,"db_details.php3",$url_query."&amp;db_query_force=1");
echo printTab($strExport,$lnk3,$arg3); echo printTab($strExport,$lnk3,$arg3);
echo printTab($strSearch,$lnk4,$arg4); echo printTab($strSearch,$lnk4,$arg4);

2
index.php3
View File

@@ -58,7 +58,7 @@ body {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $fo
<frameset cols="<?php echo $cfg['LeftWidth']; ?>,*" rows="*"> <frameset cols="<?php echo $cfg['LeftWidth']; ?>,*" rows="*">
<frame src="left.php3?<?php echo $url_query; ?>" name="nav" frameborder="1" /> <frame src="left.php3?<?php echo $url_query; ?>" name="nav" frameborder="1" />
<frame src="<?php echo (empty($db)) ? 'main.php3' : 'db_details.php3'; ?>?<?php echo $url_query; ?>" name="phpmain" /> <frame src="<?php echo (empty($db)) ? 'main.php3' : 'db_details_structure.php3'; ?>?<?php echo $url_query; ?>" name="phpmain" />
<noframes> <noframes>
<body bgcolor="#FFFFFF"> <body bgcolor="#FFFFFF">

2
lang/english-utf8.inc.php3
View File

@@ -267,7 +267,7 @@ $strPrintView = 'Print view';
$strPrivileges = 'Privileges'; $strPrivileges = 'Privileges';
$strProperties = 'Properties'; $strProperties = 'Properties';
$strQBE = 'Query by Example'; $strQBE = 'Query';
$strQBEDel = 'Del'; $strQBEDel = 'Del';
$strQBEIns = 'Ins'; $strQBEIns = 'Ins';
$strQueryOnDb = 'SQL-query on database <b>%s</b>:'; $strQueryOnDb = 'SQL-query on database <b>%s</b>:';

2
lang/english.inc.php3
View File

@@ -266,7 +266,7 @@ $strPrintView = 'Print view';
$strPrivileges = 'Privileges'; $strPrivileges = 'Privileges';
$strProperties = 'Properties'; $strProperties = 'Properties';
$strQBE = 'Query by Example'; $strQBE = 'Query';
$strQBEDel = 'Del'; $strQBEDel = 'Del';
$strQBEIns = 'Ins'; $strQBEIns = 'Ins';
$strQueryOnDb = 'SQL-query on database <b>%s</b>:'; $strQueryOnDb = 'SQL-query on database <b>%s</b>:';

2
lang/french.inc.php3
View File

@@ -267,7 +267,7 @@ $strPrintView = 'Version imprimable';
$strPrivileges = 'Privil<69>ges'; $strPrivileges = 'Privil<69>ges';
$strProperties = 'Propri<72>t<EFBFBD>s'; $strProperties = 'Propri<72>t<EFBFBD>s';
$strQBE = 'Requ<71>te par un exemple'; $strQBE = 'Requ<71>te';
$strQBEDel = 'Effacer'; $strQBEDel = 'Effacer';
$strQBEIns = 'Ajouter'; $strQBEIns = 'Ajouter';
$strQueryOnDb = 'Requ<71>te SQL sur la base <b>%s</b>&nbsp;:'; $strQueryOnDb = 'Requ<71>te SQL sur la base <b>%s</b>&nbsp;:';

22
left.php3
View File

@@ -241,7 +241,7 @@ if ($num_dbs > 1) {
if (!empty($num_tables)) { if (!empty($num_tables)) {
echo "\n"; 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> <img name="imEx" id="el<?php echo $j; ?>Img" src="images/plus.gif" border="0" width="9" height="9" alt="+" /></a>
<?php <?php
} else { } else {
@@ -252,7 +252,7 @@ if ($num_dbs > 1) {
} }
echo "\n"; 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); ?>">&nbsp;&nbsp;</bdo></span><span class="headaCnt">(<?php echo $num_tables_disp; ?>)</span></a></nobr> <span class="heada"><?php echo $db; ?><bdo dir="<?php echo($text_dir); ?>">&nbsp;&nbsp;</bdo></span><span class="headaCnt">(<?php echo $num_tables_disp; ?>)</span></a></nobr>
</div> </div>
@@ -268,9 +268,9 @@ if ($num_dbs > 1) {
echo "\n"; echo "\n";
?> ?>
<nobr><img src="images/spacer.gif" border="0" width="9" height="9" alt="" /> <nobr><img src="images/spacer.gif" border="0" width="9" height="9" alt="" />
<a target="phpmain" href="sql.php3?<?php echo $common_url_query; ?>&amp;table=<?php echo urlencode($table); ?>&amp;sql_query=<?php echo urlencode('SELECT * FROM ' . PMA_backquote($table)); ?>&amp;pos=0&amp;goto=tbl_properties.php3"> <a target="phpmain" href="sql.php3?<?php echo $common_url_query; ?>&amp;table=<?php echo urlencode($table); ?>&amp;sql_query=<?php echo urlencode('SELECT * FROM ' . PMA_backquote($table)); ?>&amp;pos=0&amp;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; ?>">&nbsp;</bdo> <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; ?>">&nbsp;</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; ?>&amp;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; ?>&amp;table=<?php echo urlencode($table); ?>">
<?php echo $table; ?></a></nobr><br /> <?php echo $table; ?></a></nobr><br />
<?php <?php
} // end for $t (tables list) } // end for $t (tables list)
@@ -295,12 +295,12 @@ if ($num_dbs > 1) {
$url_title = (!empty($tooltip) && isset($tooltip[$table])) $url_title = (!empty($tooltip) && isset($tooltip[$table]))
? str_replace('"', '&quot;', $tooltip[$table]) ? str_replace('"', '&quot;', $tooltip[$table])
: ''; : '';
$table_list .= ' <nobr><a target="phpmain" href="sql.php3?' . $common_url_query . '&amp;table=' . urlencode($table) . '&amp;sql_query=' . urlencode('SELECT * FROM ' . PMA_backquote($table)) . '&amp;pos=0&amp;goto=tbl_properties.php3">' . "\n"; $table_list .= ' <nobr><a target="phpmain" href="sql.php3?' . $common_url_query . '&amp;table=' . urlencode($table) . '&amp;sql_query=' . urlencode('SELECT * FROM ' . PMA_backquote($table)) . '&amp;pos=0&amp;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 . '">&nbsp;</bdo>' . "\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 . '">&nbsp;</bdo>' . "\n";
if (PMA_USR_BROWSER_AGENT == 'IE') { 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 . '&amp;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 . '&amp;table=' . urlencode($table) . '">' . $table . '</a></span></nobr><br />' . "\n";
} else { } else {
$table_list .= ' <a class="tblItem" id="' . md5($table) . '" title="' . $url_title . '" target="phpmain" href="tbl_properties.php3?' . $common_url_query . '&amp;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 . '&amp;table=' . urlencode($table) . '">' . $table . '</a></nobr><br />' . "\n";
} }
} // end for $t (tables list) } // end for $t (tables list)
@@ -310,7 +310,7 @@ if ($num_dbs > 1) {
} }
$selected = ' selected="selected"'; $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 . '">&nbsp;&nbsp;</bdo></span></a><br />' . "\n\n"; $table_list_header .= ' <span class="heada"><b>' . $db . '</b><bdo dir="' . $text_dir . '">&nbsp;&nbsp;</bdo></span></a><br />' . "\n\n";
} else { } else {
$selected = ''; $selected = '';
@@ -399,7 +399,7 @@ else if ($num_dbs == 1) {
echo "\n"; echo "\n";
?> ?>
<div id="el2Parent" class="parent"> <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); ?>">&nbsp;&nbsp;</bdo></span><span class="headaCnt">(<?php echo $num_tables_disp; ?>)</span></a></nobr> <span class="heada"><?php echo $db; ?><bdo dir="<?php echo($text_dir); ?>">&nbsp;&nbsp;</bdo></span><span class="headaCnt">(<?php echo $num_tables_disp; ?>)</span></a></nobr>
</div> </div>
<div id="el2Child" class="child" style="margin-bottom: 5px"> <div id="el2Child" class="child" style="margin-bottom: 5px">
@@ -412,9 +412,9 @@ else if ($num_dbs == 1) {
: ''; : '';
echo "\n"; echo "\n";
?> ?>
<nobr><a target="phpmain" href="sql.php3?<?php echo $common_url_query; ?>&amp;table=<?php echo urlencode($table); ?>&amp;sql_query=<?php echo urlencode('SELECT * FROM ' . PMA_backquote($table)); ?>&amp;pos=0&amp;goto=tbl_properties.php3"> <nobr><a target="phpmain" href="sql.php3?<?php echo $common_url_query; ?>&amp;table=<?php echo urlencode($table); ?>&amp;sql_query=<?php echo urlencode('SELECT * FROM ' . PMA_backquote($table)); ?>&amp;pos=0&amp;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; ?>">&nbsp;</bdo> <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; ?>">&nbsp;</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; ?>&amp;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; ?>&amp;table=<?php echo urlencode($table); ?>">
<?php echo $table; ?></a></nobr><br /> <?php echo $table; ?></a></nobr><br />
<?php <?php
} // end for $j (tables list) } // end for $j (tables list)

8
tbl_properties_links.php3
View File

@@ -22,7 +22,7 @@ if ($num_rows > 0) {
. urlencode($ln6_stt . PMA_backquote($table)) . urlencode($ln6_stt . PMA_backquote($table))
. '&amp;zero_rows=' . '&amp;zero_rows='
. urlencode(sprintf($strTableHasBeenEmptied, htmlspecialchars($table))); . 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 { } else {
$lnk2 = ''; $lnk2 = '';
$arg2 = ''; $arg2 = '';
@@ -45,15 +45,15 @@ $att7 = 'class="drop" onclick="return confirmLink(this, \'DROP TABLE ' . PMA_jsF
<tr> <tr>
<td width="8">&nbsp;</td> <td width="8">&nbsp;</td>
<?php <?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($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($strSelect,$lnk4,$arg4);
echo printTab($strInsert,"tbl_change.php3",$url_query); 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($strExport,"tbl_properties_export.php3",$url_query);
echo printTab($strOperations,"tbl_properties_operations.php3",$url_query); echo printTab($strOperations,"tbl_properties_operations.php3",$url_query);
echo printTab($strOptions,"tbl_properties_options.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); echo printTab($strDrop,"sql.php3",$arg7,$att7);
?> ?>