diff options
| -rwxr-xr-x | ChangeLog | 5 | ||||
| -rw-r--r-- | browse_foreigners.php | 2 | ||||
| -rw-r--r-- | db_details.php | 2 | ||||
| -rw-r--r-- | db_details_links.php | 12 | ||||
| -rw-r--r-- | db_details_structure.php | 20 | ||||
| -rw-r--r-- | left.php | 8 | ||||
| -rw-r--r-- | libraries/common.lib.php | 14 | ||||
| -rw-r--r-- | libraries/display_export.lib.php | 2 | ||||
| -rw-r--r-- | libraries/display_tbl.lib.php | 8 | ||||
| -rw-r--r-- | main.php | 10 | ||||
| -rw-r--r-- | mult_submits.inc.php | 2 | ||||
| -rw-r--r-- | queryframe.php | 10 | ||||
| -rw-r--r-- | querywindow.php | 4 | ||||
| -rw-r--r-- | server_collations.php | 2 | ||||
| -rw-r--r-- | server_databases.php | 8 | ||||
| -rw-r--r-- | server_links.inc.php | 14 | ||||
| -rw-r--r-- | server_privileges.php | 16 | ||||
| -rw-r--r-- | server_processlist.php | 2 | ||||
| -rw-r--r-- | server_status.php | 4 | ||||
| -rw-r--r-- | server_variables.php | 2 | ||||
| -rw-r--r-- | sql.php | 12 | ||||
| -rw-r--r-- | tbl_addfield.php | 12 | ||||
| -rw-r--r-- | tbl_indexes.php | 21 | ||||
| -rw-r--r-- | tbl_properties.inc.php | 7 | ||||
| -rw-r--r-- | tbl_properties_links.php | 18 | ||||
| -rw-r--r-- | tbl_properties_structure.php | 128 | ||||
| -rw-r--r-- | tbl_query_box.php | 30 | ||||
| -rw-r--r-- | themes.php | 4 |
28 files changed, 191 insertions, 188 deletions
@@ -8,6 +8,11 @@ $Source$ 2004-08-12 Michal Čihař <michal@cihar.com> * db_details_structure.php: Inconsistency of drop/empty links (bug #989705). + * tbl_addfield.php, tbl_properties.inc.php, tbl_properties_structure.php: + Change look of adding fields into table (bug #991095). + * many files: I again did some XHTML validation, so removed few of most + obvious errors, but there are still many, mostly missing alt attributtes + for images and wrongly nested tags. 2004-08-11 Michal Čihař <michal@cihar.com> * tbl_replace.php: Do not empty protected values (bug #1006812). diff --git a/browse_foreigners.php b/browse_foreigners.php index a5c9652332..003a85c09a 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -103,7 +103,7 @@ $nbTotalPage = @ceil($the_total / $session_max_rows); if ($the_total > $per_page) { $gotopage = '<br />' . $GLOBALS['strPageNumber'] - . '<select name="goToPage" onChange="goToUrl(this, \'browse_foreigners.php?field=' . urlencode($field) . '&' . PMA_generate_common_url($db, $table) . $pk_uri . '\');">'; + . '<select name="goToPage" onchange="goToUrl(this, \'browse_foreigners.php?field=' . urlencode($field) . '&' . PMA_generate_common_url($db, $table) . $pk_uri . '\');">'; if ($nbTotalPage < 200) { $firstPage = 1; $lastPage = $nbTotalPage; diff --git a/db_details.php b/db_details.php index b37a34e77a..32ef6bc3e9 100644 --- a/db_details.php +++ b/db_details.php @@ -225,7 +225,7 @@ if ($cfg['Bookmark']['db'] && $cfg['Bookmark']['table']) { echo ' ' . $strVar . ' '; if ($cfg['ReplaceHelpImg']){ echo '<a href="./Documentation.html#faqbookmark" target="documentation">' - . '<img src="' .$pmaThemeImage . 'b_help.png" border="0" width="11" height="11" align="absmiddle" alt="' . $strDocu . '" /></a>'; + . '<img src="' .$pmaThemeImage . 'b_help.png" border="0" width="11" height="11" align="middle" alt="' . $strDocu . '" /></a>'; }else{ echo '(<a href="./Documentation.html#faqbookmark" target="documentation">' . $strDocu . '</a>): '; } diff --git a/db_details_links.php b/db_details_links.php index 285be433b6..027431407e 100644 --- a/db_details_links.php +++ b/db_details_links.php @@ -71,15 +71,15 @@ if ($cfg['LightTabs']) { . ' <td class="navSpacer"><img src="' . $GLOBALS['pmaThemeImage'] . 'spacer.png' . '" width="1" height="1" border="0" alt="" /></td>'; } -echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 'b_props.png" width="16" height="16" border="0" hspace="2" align="absmiddle" alt="'.$strStructure.'" />' : '') . $strStructure, 'db_details_structure.php', $url_query); -echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 'b_sql.png" width="16" height="16" border="0" hspace="2" align="absmiddle" alt="'.$strSQL.'" />' : '') . $strSQL, 'db_details.php', $url_query . '&db_query_force=1'); -echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 'b_export.png" width="16" height="16" border="0" hspace="2" align="absmiddle" alt="'.$strExport.'" />' : '') . $strExport, $lnk3, $arg3); -echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 'b_search.png" width="16" height="16" border="0" hspace="2" align="absmiddle" alt="'.$strSearch.'" />' : '') . $strSearch, $lnk4, $arg4); -echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 's_db.png" width="16" height="16" border="0" hspace="2" align="absmiddle" alt="'.$strQBE.'" />' : '') . $strQBE, ($num_tables > 0) ? 'db_details_qbe.php' : '', $url_query); +echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 'b_props.png" width="16" height="16" border="0" hspace="2" align="middle" alt="'.$strStructure.'" />' : '') . $strStructure, 'db_details_structure.php', $url_query); +echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 'b_sql.png" width="16" height="16" border="0" hspace="2" align="middle" alt="'.$strSQL.'" />' : '') . $strSQL, 'db_details.php', $url_query . '&db_query_force=1'); +echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 'b_export.png" width="16" height="16" border="0" hspace="2" align="middle" alt="'.$strExport.'" />' : '') . $strExport, $lnk3, $arg3); +echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 'b_search.png" width="16" height="16" border="0" hspace="2" align="middle" alt="'.$strSearch.'" />' : '') . $strSearch, $lnk4, $arg4); +echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 's_db.png" width="16" height="16" border="0" hspace="2" align="middle" alt="'.$strQBE.'" />' : '') . $strQBE, ($num_tables > 0) ? 'db_details_qbe.php' : '', $url_query); // Displays drop link if ($lnk5) { - echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 'b_deltbl.png" width="16" height="16" border="0" hspace="2" align="absmiddle" alt="'.$strDrop.'" />' : '') . $strDrop, $lnk5, $arg5, $att5, $class5); + echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 'b_deltbl.png" width="16" height="16" border="0" hspace="2" align="middle" alt="'.$strDrop.'" />' : '') . $strDrop, $lnk5, $arg5, $att5, $class5); } // end if echo "\n"; diff --git a/db_details_structure.php b/db_details_structure.php index 37593a74de..bd9b527891 100644 --- a/db_details_structure.php +++ b/db_details_structure.php @@ -643,14 +643,14 @@ if ($num_tables > 0) { <tr><td nowrap="nowrap" colspan="3"><?php echo '<a href="db_printview.php?' . $url_query . '">'; if ($cfg['PropertiesIconic']) { - echo '<img src="' . $pmaThemeImage . 'b_print.png" border="0" width="16" height="16" hspace="2" align="absmiddle" />'; + echo '<img src="' . $pmaThemeImage . 'b_print.png" border="0" width="16" height="16" hspace="2" align="middle" />'; } echo $strPrintView . '</a>'; ?> <?php echo '<a href="./db_datadict.php?' . $url_query . '">'; if($cfg['PropertiesIconic']){ - echo '<img src="' . $pmaThemeImage . 'b_tblanalyse.png" border="0" width="16" height="16" hspace="2" align="absmiddle" />'; + echo '<img src="' . $pmaThemeImage . 'b_tblanalyse.png" border="0" width="16" height="16" hspace="2" align="middle" />'; } echo $strDataDict . '</a>'; ?></td></tr> @@ -664,7 +664,7 @@ if ($num_tables > 0) { <tr> <td class="tblHeaders" colspan="3" nowrap="nowrap"><?php echo PMA_generate_common_hidden_inputs($db); - if($cfg['PropertiesIconic']){ echo '<img src="' . $pmaThemeImage . 'b_newtbl.png" border="0" width="16" height="16" hspace="2" align="absmiddle" />'; } + if($cfg['PropertiesIconic']){ echo '<img src="' . $pmaThemeImage . 'b_newtbl.png" border="0" width="16" height="16" hspace="2" align="middle" />'; } // if you want navigation: $strDBLink = '<a href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?' . PMA_generate_common_url() . '&db=' . urlencode($GLOBALS['db']) . '">' . htmlspecialchars($GLOBALS['db']) . '</a>'; @@ -701,7 +701,7 @@ if ($cfgRelation['commwork']) { <tr> <td colspan="3" class="tblHeaders"><?php if ($cfg['PropertiesIconic']) { - echo '<img src="' . $pmaThemeImage . 'b_comment.png" border="0" width="16" height="16" hspace="2" align="absmiddle" />'; + echo '<img src="' . $pmaThemeImage . 'b_comment.png" border="0" width="16" height="16" hspace="2" align="middle" />'; } echo $strDBComment; ?></td></tr> @@ -721,7 +721,7 @@ if ($cfgRelation['commwork']) { <tr><td colspan="3"><img src="<?php echo $GLOBALS['pmaThemeImage'] . 'spacer.png'; ?>" width="1" height="1" border="0" alt="" /></td></tr> <tr><td colspan="3" class="tblHeaders"><?php if ($cfg['PropertiesIconic']) { - echo '<img src="' . $pmaThemeImage . 'b_edit.png" border="0" width="16" height="16" hspace="2" align="absmiddle" />'; + echo '<img src="' . $pmaThemeImage . 'b_edit.png" border="0" width="16" height="16" hspace="2" align="middle" />'; } echo $strDBRename.': '; ?></td></tr> @@ -743,7 +743,7 @@ if (PMA_MYSQL_INT_VERSION >= 40101) { . ' <tr><td colspan="3"><img src="' . $GLOBALS['pmaThemeImage'] . 'spacer.png' . '" width="1" height="1" border="0" alt="" /></td></tr>' . "\n" . ' <tr><td colspan="3" class="tblHeaders">'; if ($cfg['PropertiesIconic']) { - echo '<img src="' . $pmaThemeImage . 's_asci.png" border="0" width="16" height="16" hspace="2" align="absmiddle" />'; + echo '<img src="' . $pmaThemeImage . 's_asci.png" border="0" width="16" height="16" hspace="2" align="middle" />'; } echo ' <label for="select_db_collation">' . $strCollation . '</label>: ' . "\n" . ' </td></tr>' . "\n" @@ -786,13 +786,13 @@ if ($cfgRelation['pdfwork'] && $num_tables > 0) { <tr><td colspan="3" class="tblHeaders"> <?php if ($cfg['PropertiesIconic']) { - echo '<img src="' . $pmaThemeImage . 'b_pdfdoc.png" border="0" width="16" height="16" hspace="2" align="absmiddle" />'; + echo '<img src="' . $pmaThemeImage . 'b_pdfdoc.png" border="0" width="16" height="16" hspace="2" align="middle" />'; } ?>PDF</td></tr><tr bgcolor="<?php echo $cfg['BgcolorOne']; ?>"> <td colspan="3"><?php echo '<a href="pdf_pages.php?' . $takeaway . '">'; if ($cfg['PropertiesIconic']) { - echo '<img src="' . $pmaThemeImage . 'b_edit.png" border="0" width="16" height="16" hspace="2" align="absmiddle" />'; + echo '<img src="' . $pmaThemeImage . 'b_edit.png" border="0" width="16" height="16" hspace="2" align="middle" />'; } echo ''. $strEditPDFPages . '</a>'; ?></td></tr> @@ -812,7 +812,7 @@ if ($cfgRelation['pdfwork'] && $num_tables > 0) { <?php echo PMA_generate_common_hidden_inputs($db); if ($cfg['PropertiesIconic']) { - echo '<img src="' . $pmaThemeImage . 'b_view.png" border="0" width="16" height="16" hspace="2" align="absmiddle" />'; + echo '<img src="' . $pmaThemeImage . 'b_view.png" border="0" width="16" height="16" hspace="2" align="middle" />'; } echo $strDisplayPDF; ?>: </td></tr> @@ -891,7 +891,7 @@ if ($num_tables > 0 <tr bgcolor="<?php echo $cfg['BgcolorOne']; ?>"><td colspan="3"><?php echo '<a href="db_details_importdocsql.php?' . $takeaway . '">'; if ($cfg['PropertiesIconic']) { - echo '<img src="' . $pmaThemeImage . 'b_docsql.png" border="0" width="16" height="16" hspace="2" align="absmiddle" />'; + echo '<img src="' . $pmaThemeImage . 'b_docsql.png" border="0" width="16" height="16" hspace="2" align="middle" />'; } echo $strImportDocSQL . '</a>'; ?> @@ -373,7 +373,7 @@ if (!$cfg['QueryFrame']) { echo '<a class="item" href="main.php?' . PMA_generate_common_url() . '" target="phpmain' . $hash . '">' . ($cfg['MainPageIconic'] ? '<img src="' . $pmaThemeImage . 'b_home.png" width="16" height="16" border="0" hspace="2" alt="' . $strHome . '" title="' . $strHome . '"' - .' onmouseover="this.style.backgroundColor=\'#ffffff\';" onmouseout="this.style.backgroundColor=\'\';" align="absmiddle" />' + .' onmouseover="this.style.backgroundColor=\'#ffffff\';" onmouseout="this.style.backgroundColor=\'\';" align="middle" />' : '<b>' . $strHome . '</b>') . '</a>'; // Logout for advanced authentication @@ -382,7 +382,7 @@ if (!$cfg['QueryFrame']) { echo '<a class="item" href="index.php?' . PMA_generate_common_url() . '&old_usr=' . urlencode($PHP_AUTH_USER) . '" target="_parent">' . ($cfg['MainPageIconic'] ? '<img src="' . $pmaThemeImage . 's_loggoff.png" width="16" height="16" border="0" hspace="2" alt="' . $strLogout . '" title="' . $strLogout . '"' - .' onmouseover="this.style.backgroundColor=\'#ffffff\';" onmouseout="this.style.backgroundColor=\'\';" align="absmiddle" />' + .' onmouseover="this.style.backgroundColor=\'#ffffff\';" onmouseout="this.style.backgroundColor=\'\';" align="middle" />' : '<b>' . $strLogout . '</b>') . '</a>'; } // end if @@ -390,12 +390,12 @@ if (!$cfg['QueryFrame']) { echo '<img src="' . $GLOBALS['pmaThemeImage'] . 'spacer.png' . '" width="2" height="1" border="0" />' . '<a href="Documentation.html" target="documentation" class="item">' . '<img src="' . $pmaThemeImage . 'b_docs.png" border="0" hspace="1" width="16" height="16" alt="' . $strPmaDocumentation . '" title="' . $strPmaDocumentation . '"' - .' onmouseover="this.style.backgroundColor=\'#ffffff\';" onmouseout="this.style.backgroundColor=\'\';" align="absmiddle" />' + .' onmouseover="this.style.backgroundColor=\'#ffffff\';" onmouseout="this.style.backgroundColor=\'\';" align="middle" />' . '</a>'; echo '' . '<a href="' . $cfg['MySQLManualBase'] . '" target="documentation" class="item">' . '<img src="' . $pmaThemeImage . 'b_sqlhelp.png" border="0" hspace="1" width="16" height="16" alt="MySQL - ' . $strDocu . '" title="MySQL - ' . $strDocu . '"' - .' onmouseover="this.style.backgroundColor=\'#ffffff\';" onmouseout="this.style.backgroundColor=\'\';" align="absmiddle" />' + .' onmouseover="this.style.backgroundColor=\'#ffffff\';" onmouseout="this.style.backgroundColor=\'\';" align="middle" />' . '</a>'; } ?> diff --git a/libraries/common.lib.php b/libraries/common.lib.php index f93d544008..1294267922 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -478,18 +478,18 @@ if ($is_minimum_common == FALSE) { switch ($GLOBALS['cfg']['MySQLManualType']) { case 'old': if ($GLOBALS['cfg']['ReplaceHelpImg']) { - return '<a href="' . $GLOBALS['cfg']['MySQLManualBase'] . '/' . $link[0] . '/' . $link[1] . '/' . $link . '.html" target="mysql_doc"><img src="' . $GLOBALS['pmaThemeImage'] . 'b_help.png" width="11" height="11" border="0" alt="' . $GLOBALS['strDocu'] . '" title="' . $GLOBALS['strDocu'] . '" hspace="2" align="absmiddle" /></a>'; + return '<a href="' . $GLOBALS['cfg']['MySQLManualBase'] . '/' . $link[0] . '/' . $link[1] . '/' . $link . '.html" target="mysql_doc"><img src="' . $GLOBALS['pmaThemeImage'] . 'b_help.png" width="11" height="11" border="0" alt="' . $GLOBALS['strDocu'] . '" title="' . $GLOBALS['strDocu'] . '" hspace="2" align="middle" /></a>'; }else{ return '[<a href="' . $GLOBALS['cfg']['MySQLManualBase'] . '/' . $link[0] . '/' . $link[1] . '/' . $link . '.html" target="mysql_doc">' . $GLOBALS['strDocu'] . '</a>]'; } case 'chapters': if ($GLOBALS['cfg']['ReplaceHelpImg']) { - return '<a href="' . $GLOBALS['cfg']['MySQLManualBase'] . '/manual_' . $chapter . '.html#' . $link . '" target="mysql_doc"><img src="' . $GLOBALS['pmaThemeImage'] . 'b_help.png" width="11" height="11" border="0" alt="' . $GLOBALS['strDocu'] . '" title="' . $GLOBALS['strDocu'] . '" hspace="2" align="absmiddle" /></a>'; + return '<a href="' . $GLOBALS['cfg']['MySQLManualBase'] . '/manual_' . $chapter . '.html#' . $link . '" target="mysql_doc"><img src="' . $GLOBALS['pmaThemeImage'] . 'b_help.png" width="11" height="11" border="0" alt="' . $GLOBALS['strDocu'] . '" title="' . $GLOBALS['strDocu'] . '" hspace="2" align="middle" /></a>'; } else { return '[<a href="' . $GLOBALS['cfg']['MySQLManualBase'] . '/manual_' . $chapter . '.html#' . $link . '" target="mysql_doc">' . $GLOBALS['strDocu'] . '</a>]'; } case 'big': if ($GLOBALS['cfg']['ReplaceHelpImg']) { - return '<a href="' . $GLOBALS['cfg']['MySQLManualBase'] . '#' . $link . '" target="mysql_doc"><img src="' . $GLOBALS['pmaThemeImage'] . 'b_help.png" width="11" height="11" border="0" alt="' . $GLOBALS['strDocu'] . '" title="' . $GLOBALS['strDocu'] . '" hspace="2" align="absmiddle" /></a>'; + return '<a href="' . $GLOBALS['cfg']['MySQLManualBase'] . '#' . $link . '" target="mysql_doc"><img src="' . $GLOBALS['pmaThemeImage'] . 'b_help.png" width="11" height="11" border="0" alt="' . $GLOBALS['strDocu'] . '" title="' . $GLOBALS['strDocu'] . '" hspace="2" align="middle" /></a>'; } else { return '[<a href="' . $GLOBALS['cfg']['MySQLManualBase'] . '#' . $link . '" target="mysql_doc">' . $GLOBALS['strDocu'] . '</a>]'; } @@ -498,7 +498,7 @@ if ($is_minimum_common == FALSE) { case 'searchable': default: if ($GLOBALS['cfg']['ReplaceHelpImg']) { - return '<a href="' . $GLOBALS['cfg']['MySQLManualBase'] . '/' . $link . '.html" target="mysql_doc"><img src="' . $GLOBALS['pmaThemeImage'] . 'b_help.png" width="11" height="11" border="0" alt="' . $GLOBALS['strDocu'] . '" title="' . $GLOBALS['strDocu'] . '" hspace="2" align="absmiddle" /></a>'; + return '<a href="' . $GLOBALS['cfg']['MySQLManualBase'] . '/' . $link . '.html" target="mysql_doc"><img src="' . $GLOBALS['pmaThemeImage'] . 'b_help.png" width="11" height="11" border="0" alt="' . $GLOBALS['strDocu'] . '" title="' . $GLOBALS['strDocu'] . '" hspace="2" align="middle" /></a>'; } else { return '[<a href="' . $GLOBALS['cfg']['MySQLManualBase'] . '/' . $link . '.html" target="mysql_doc">' . $GLOBALS['strDocu'] . '</a>]'; } @@ -506,7 +506,7 @@ if ($is_minimum_common == FALSE) { } else { // no Type defined, show the old one if ($GLOBALS['cfg']['ReplaceHelpImg']) { - return '<a href="' . $GLOBALS['cfg']['MySQLManualBase'] . '/' . $link[0] . '/' . $link[1] . '/' . $link . '.html" target="mysql_doc"><img src="' . $GLOBALS['pmaThemeImage'] . 'b_help.png" width="11" height="11" border="0" alt="' . $GLOBALS['strDocu'] . '" title="' . $GLOBALS['strDocu'] . '" hspace="2" align="absmiddle" /></a>'; + return '<a href="' . $GLOBALS['cfg']['MySQLManualBase'] . '/' . $link[0] . '/' . $link[1] . '/' . $link . '.html" target="mysql_doc"><img src="' . $GLOBALS['pmaThemeImage'] . 'b_help.png" width="11" height="11" border="0" alt="' . $GLOBALS['strDocu'] . '" title="' . $GLOBALS['strDocu'] . '" hspace="2" align="middle" /></a>'; } else { return '[<a href="' . $GLOBALS['cfg']['MySQLManualBase'] . '/' . $link[0] . '/' . $link[1] . '/' . $link . '.html" target="mysql_doc">' . $GLOBALS['strDocu'] . '</a>]'; } @@ -516,7 +516,7 @@ if ($is_minimum_common == FALSE) { if (!empty($GLOBALS['cfg']['ManualBaseShort'])) { // the old configuration if ($GLOBALS['cfg']['ReplaceHelpImg']) { - return '<a href="' . $GLOBALS['cfg']['MySQLManualBase'] . '/' . $link[0] . '/' . $link[1] . '/' . $link . '.html" target="mysql_doc"><img src="' . $GLOBALS['pmaThemeImage'] . 'b_help.png" width="11" height="11" border="0" alt="' . $GLOBALS['strDocu'] . '" title="' . $GLOBALS['strDocu'] . '" hspace="2" align="absmiddle" /></a>'; + return '<a href="' . $GLOBALS['cfg']['MySQLManualBase'] . '/' . $link[0] . '/' . $link[1] . '/' . $link . '.html" target="mysql_doc"><img src="' . $GLOBALS['pmaThemeImage'] . 'b_help.png" width="11" height="11" border="0" alt="' . $GLOBALS['strDocu'] . '" title="' . $GLOBALS['strDocu'] . '" hspace="2" align="middle" /></a>'; } else { return '[<a href="' . $GLOBALS['cfg']['MySQLManualBase'] . '/' . $link[0] . '/' . $link[1] . '/' . $link . '.html" target="mysql_doc">' . $GLOBALS['strDocu'] . '</a>]'; } @@ -596,7 +596,7 @@ if ($is_minimum_common == FALSE) { } if ($GLOBALS['cfg']['PropertiesIconic']) { echo $doedit_goto - . '<img src=" '. $GLOBALS['pmaThemeImage'] . 'b_edit.png" width="16" height="16" border="0" hspace="2" align="absmiddle" alt="' . $GLOBALS['strEdit'] .'" />' + . '<img src=" '. $GLOBALS['pmaThemeImage'] . 'b_edit.png" width="16" height="16" border="0" hspace="2" align="middle" alt="' . $GLOBALS['strEdit'] .'" />' . '</a>'; } else { echo ' [' diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index 9661962804..5211b7ad3e 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -179,7 +179,7 @@ if (isset($sql_query)) { $goto_documentation = '<a href="./Documentation.html#faqexport" target="documentation">'; echo ($cfg['ReplaceHelpImg'] ? '' : '(') . $goto_documentation - . ($cfg['ReplaceHelpImg'] ? '<img src="' . $pmaThemeImage . 'b_help.png" border="0" alt="' .$strDocu . '" width="11" height="11" hspace="2" align="absmiddle" />' : $strDocu) + . ($cfg['ReplaceHelpImg'] ? '<img src="' . $pmaThemeImage . 'b_help.png" border="0" alt="' .$strDocu . '" width="11" height="11" hspace="2" align="middle" />' : $strDocu) . '</a>' . ($cfg['ReplaceHelpImg'] ? '' : ')'); ?> </th> diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 408a6360cc..12f2238028 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -350,7 +350,7 @@ function PMA_displayTableNavigation($pos_next, $pos_prev, $encoded_query) <?php //<form> for keep the form alignment of button < and << ?> <form> <?php echo $GLOBALS['strPageNumber']; ?> - <select name="goToPage" onChange="goToUrl(this, '<?php echo "sql.php?sql_query=".$encoded_query."&session_max_rows=".$session_max_rows."&disp_direction=".$disp_direction."&repeat_cells=".$repeat_cells."&goto=".$goto."&dontlimitchars=".$dontlimitchars."&".PMA_generate_common_url($db, $table)."&"; ?>')"> + <select name="goToPage" onchange="goToUrl(this, '<?php echo "sql.php?sql_query=".$encoded_query."&session_max_rows=".$session_max_rows."&disp_direction=".$disp_direction."&repeat_cells=".$repeat_cells."&goto=".$goto."&dontlimitchars=".$dontlimitchars."&".PMA_generate_common_url($db, $table)."&"; ?>')"> <?php if ($nbTotalPage < 200) { @@ -1872,15 +1872,15 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql) /* IE has trouble with <button> */ if (PMA_USR_BROWSER_AGENT != 'IE') { echo ' <button class="mult_submit" type="submit" name="submit_mult" value="row_edit" title="' . $GLOBALS['strEdit'] . '">' . "\n" - . '<img src="' . $GLOBALS['pmaThemeImage'] . 'b_edit.png" title="' . $GLOBALS['strEdit'] . '" alt="' . $GLOBALS['strEdit'] . '" width="16" height="16" align="absmiddle" />' . (($propicon == 'both') ? ' ' . $GLOBALS['strEdit'] : '') . "\n" + . '<img src="' . $GLOBALS['pmaThemeImage'] . 'b_edit.png" title="' . $GLOBALS['strEdit'] . '" alt="' . $GLOBALS['strEdit'] . '" width="16" height="16" align="middle" />' . (($propicon == 'both') ? ' ' . $GLOBALS['strEdit'] : '') . "\n" . '</button>'; echo ' <button class="mult_submit" type="submit" name="submit_mult" value="row_delete" title="' . $delete_text . '">' . "\n" - . '<img src="' . $GLOBALS['pmaThemeImage'] . 'b_drop.png" title="' . $delete_text . '" alt="' . $delete_text . '" width="16" height="16" align="absmiddle" />' . (($propicon == 'both') ? ' ' . $delete_text : '') . "\n" + . '<img src="' . $GLOBALS['pmaThemeImage'] . 'b_drop.png" title="' . $delete_text . '" alt="' . $delete_text . '" width="16" height="16" align="middle" />' . (($propicon == 'both') ? ' ' . $delete_text : '') . "\n" . '</button>'; if ($analyzed_sql[0]['querytype'] == 'SELECT') { echo ' <button class="mult_submit" type="submit" name="submit_mult" value="row_export" title="' . $GLOBALS['strExport'] . '">' . "\n" - . '<img src="' . $GLOBALS['pmaThemeImage'] . 'b_tblexport.png" title="' . $GLOBALS['strExport'] . '" alt="' . $GLOBALS['strExport'] . '" width="16" height="16" align="absmiddle" />' . (($propicon == 'both') ? ' ' . $GLOBALS['strExport'] : '') . "\n" + . '<img src="' . $GLOBALS['pmaThemeImage'] . 'b_tblexport.png" title="' . $GLOBALS['strExport'] . '" alt="' . $GLOBALS['strExport'] . '" width="16" height="16" align="middle" />' . (($propicon == 'both') ? ' ' . $GLOBALS['strExport'] : '') . "\n" . '</button>'; } @@ -319,7 +319,7 @@ if ($server > 0) { <b><?php echo $strCreateNewDatabase . ': ' . PMA_showMySQLDocu('Reference', 'CREATE_DATABASE'); ?></b><br /> <?php echo '<span class="noPrivileges">' - . ($cfg['ErrorIconic'] ? '<img src="' . $pmaThemeImage . 's_error2.png" width="11" height="11" hspace="2" border="0" align="absmiddle" />' : '') + . ($cfg['ErrorIconic'] ? '<img src="' . $pmaThemeImage . 's_error2.png" width="11" height="11" hspace="2" border="0" align="middle" />' : '') . '' . $strNoPrivileges .'</span>'; } // end create db form or message ?> @@ -451,7 +451,7 @@ if ($server > 0) { $http_logout = ($cfg['Server']['auth_type'] == 'http') ? "\n" . ' <a href="./Documentation.html#login_bug" target="documentation">' - . ($cfg['ReplaceHelpImg'] ? '<img src="' . $pmaThemeImage . 'b_info.png" width="11" height="11" border="0" alt="Info" align="absmiddle" />' : '(*)') . '</a>' + . ($cfg['ReplaceHelpImg'] ? '<img src="' . $pmaThemeImage . 'b_info.png" width="11" height="11" border="0" alt="Info" align="middle" />' : '(*)') . '</a>' : ''; echo "\n"; ?> @@ -498,7 +498,7 @@ if (empty($cfg['Lang'])) { if ($cfg['ReplaceHelpImg']){ echo '<img src="' . $pmaThemeImage . 'b_info.png" border="0" width="11" height="11" alt="Info" hspace="1" vspace="1" />'; }else{ echo '(*)'; } -?></a>: <select name="lang" dir="ltr" onChange="this.form.submit();" style="vertical-align: middle"> +?></a>: <select name="lang" dir="ltr" onchange="this.form.submit();" style="vertical-align: middle"> <?php echo "\n"; @@ -551,7 +551,7 @@ if (isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] <input type="hidden" name="server" value="<?php echo $server; ?>" /> <input type="hidden" name="lang" value="<?php echo $lang; ?>" /> <?php echo $strMySQLCharset;?>: - <select name="convcharset" dir="ltr" onChange="this.form.submit();" style="vertical-align: middle"> + <select name="convcharset" dir="ltr" onchange="this.form.submit();" style="vertical-align: middle"> <?php echo "\n"; foreach ($cfg['AvailableCharsets'] AS $id => $tmpcharset) { @@ -624,7 +624,7 @@ if (isset($available_themes_choices) && $available_themes_choices > 1) { . (isset($strTheme) ? $strTheme : 'Theme (Style)') . '</a>:' . "\n"; ?> - <select name="set_theme" dir="ltr" onChange="this.form.submit();" style="vertical-align: middle"> + <select name="set_theme" dir="ltr" onchange="this.form.submit();" style="vertical-align: middle"> <?php foreach ($available_themes_choices AS $i => $cur_theme) { echo '<option value="' . $cur_theme . '"'; diff --git a/mult_submits.inc.php b/mult_submits.inc.php index 1df27d88a4..c5147264e0 100644 --- a/mult_submits.inc.php +++ b/mult_submits.inc.php @@ -142,7 +142,7 @@ if (!empty($submit_mult) && !empty($what)) { <tr> <th class="tblHeadError" align="left"> <?php - echo ($GLOBALS['cfg']['ErrorIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 's_really.png" border="0" hspace="2" width="11" height="11" valign="absmiddle" />' : ''); + echo ($GLOBALS['cfg']['ErrorIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 's_really.png" border="0" hspace="2" width="11" height="11" valign="middle" />' : ''); echo $strDoYouReally . ': ' . "\n"; ?> </th> diff --git a/queryframe.php b/queryframe.php index dd18642cfe..1c45e29fd2 100644 --- a/queryframe.php +++ b/queryframe.php @@ -163,7 +163,7 @@ if ($cfg['MainPageIconic']) { echo '<a class="item" href="main.php?' . PMA_generate_common_url() . '" target="phpmain' . $hash . '">' . ($cfg['MainPageIconic'] ? '<img src="' . $pmaThemeImage . 'b_home.png" width="16" height="16" border="0" hspace="2" alt="' . $strHome . '" title="' . $strHome . '"' - .' onmouseover="this.style.backgroundColor=\'#ffffff\';" onmouseout="this.style.backgroundColor=\'\';" align="absmiddle" />' + .' onmouseover="this.style.backgroundColor=\'#ffffff\';" onmouseout="this.style.backgroundColor=\'\';" align="middle" />' : '<b>' . $strHome . '</b>') . '</a>'; // Logout for advanced authentication @@ -172,7 +172,7 @@ if ($cfg['MainPageIconic']) { echo '<a class="item" href="index.php?' . PMA_generate_common_url() . '&old_usr=' . urlencode($PHP_AUTH_USER) . '" target="_parent">' . ($cfg['MainPageIconic'] ? '<img src="' . $pmaThemeImage . 's_loggoff.png" width="16" height="16" border="0" hspace="2" alt="' . $strLogout . '" title="' . $strLogout . '"' - .' onmouseover="this.style.backgroundColor=\'#ffffff\';" onmouseout="this.style.backgroundColor=\'\';" align="absmiddle" />' + .' onmouseover="this.style.backgroundColor=\'#ffffff\';" onmouseout="this.style.backgroundColor=\'\';" align="middle" />' : '<b>' . $strLogout . '</b>') . '</a>'; } // end if @@ -189,7 +189,7 @@ if ($cfg['QueryFrameJS']) { } if ($cfg['MainPageIconic']) { $query_frame_link_text = '<img src="' . $pmaThemeImage . 'b_selboard.png" border="0" hspace="1" width="16" height="16" alt="' . $strQueryFrame . '" title="' . $strQueryFrame . '"' - .' onmouseover="this.style.backgroundColor=\'#ffffff\';" onmouseout="this.style.backgroundColor=\'\';" align="absmiddle" />'; + .' onmouseover="this.style.backgroundColor=\'#ffffff\';" onmouseout="this.style.backgroundColor=\'\';" align="middle" />'; } else { echo ($str_spacer_links != '' ? '<br />' : ''); $query_frame_link_text = '<b>' . $strQueryFrame . '</b>'; @@ -209,12 +209,12 @@ if ($cfg['MainPageIconic']) { echo '<img src="' .$GLOBALS['pmaThemeImage'] . 'spacer.png' .'" width="2" height="1" border="0" alt="" />' . '<a href="Documentation.html" target="documentation" class="item">' . '<img src="' . $pmaThemeImage . 'b_docs.png" border="0" hspace="1" width="16" height="16" alt="' . $strPmaDocumentation . '" title="' . $strPmaDocumentation . '"' - . ' onmouseover="this.style.backgroundColor=\'#ffffff\';" onmouseout="this.style.backgroundColor=\'\';" align="absmiddle" />' + . ' onmouseover="this.style.backgroundColor=\'#ffffff\';" onmouseout="this.style.backgroundColor=\'\';" align="middle" />' . '</a>'; echo '' . '<a href="' . $cfg['MySQLManualBase'] . '" target="documentation" class="item">' . '<img src="' . $pmaThemeImage . 'b_sqlhelp.png" border="0" hspace="1" width="16" height="16" alt="MySQL - ' . $strDocu . '" title="MySQL - ' . $strDocu . '"' - .' onmouseover="this.style.backgroundColor=\'#ffffff\';" onmouseout="this.style.backgroundColor=\'\';" align="absmiddle" />' + .' onmouseover="this.style.backgroundColor=\'#ffffff\';" onmouseout="this.style.backgroundColor=\'\';" align="middle" />' . '</a>'; } diff --git a/querywindow.php b/querywindow.php index 920d508291..b50245e77d 100644 --- a/querywindow.php +++ b/querywindow.php @@ -89,8 +89,8 @@ if ($cfg['QueryFrameJS'] && !isset($no_js)) { . ' <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="absmiddle" 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="absmiddle" 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_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') { diff --git a/server_collations.php b/server_collations.php index 835f587df5..ea78d0d0e7 100644 --- a/server_collations.php +++ b/server_collations.php @@ -19,7 +19,7 @@ require('./server_links.inc.php'); * Displays the sub-page heading */ echo '<h2>' . "\n" - . ' ' . ($GLOBALS['cfg']['MainPageIconic'] ? '<img src="'. $GLOBALS['pmaThemeImage'] . 's_asci.png" border="0" hspace="2" align="absmiddle" />' : '') + . ' ' . ($GLOBALS['cfg']['MainPageIconic'] ? '<img src="'. $GLOBALS['pmaThemeImage'] . 's_asci.png" border="0" hspace="2" align="middle" />' : '') . '' . $strCharsetsAndCollations . "\n" . '</h2>' . "\n"; diff --git a/server_databases.php b/server_databases.php index c3dbf66185..9c54111441 100644 --- a/server_databases.php +++ b/server_databases.php @@ -93,7 +93,7 @@ require('./server_links.inc.php'); * Displays the sub-page heading */ echo '<h2>' . "\n" - . ($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $pmaThemeImage . 's_db.png" border="0" hsape="2" align="absmiddle" width="16" height="16" />' : '') + . ($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $pmaThemeImage . 's_db.png" border="0" hsape="2" align="middle" width="16" height="16" />' : '') . ' ' . (empty($dbstats) ? $strDatabases : $strDatabasesStats) . "\n" . '</h2>' . "\n"; @@ -358,7 +358,7 @@ if (count($statistics) > 0) { echo ' ' . ($GLOBALS['cfg']['PropertiesIconic'] ? '<tr><td colspan="2">' : '<li>') . "\n" . ' <b>' . "\n" . ' <a href="./server_databases.php?' . $url_query . '&dbstats=1" title="' . $strDatabasesStatsEnable . '">' . "\n" - . ' ' . ($GLOBALS['cfg']['PropertiesIconic'] ? '<img src="' .$pmaThemeImage . 'b_dbstatistics.png" width="16" height="16" border="0" hspace="2" align="absmiddle" />' : '') . "\n" + . ' ' . ($GLOBALS['cfg']['PropertiesIconic'] ? '<img src="' .$pmaThemeImage . 'b_dbstatistics.png" width="16" height="16" border="0" hspace="2" align="middle" />' : '') . "\n" . ' ' . $strDatabasesStatsEnable . "\n" . ' </a>' . "\n" . ' </b>' . "\n" @@ -369,7 +369,7 @@ if (count($statistics) > 0) { echo ' ' . ($GLOBALS['cfg']['PropertiesIconic'] ? '<tr><td colspan="2">' : '<li>') . "\n" . ' <b>' . "\n" . ' <a href="./server_databases.php?' . $url_query . '" title="' . $strDatabasesStatsDisable . '">' . "\n" - . ' ' . ($GLOBALS['cfg']['PropertiesIconic'] ? '<img src="' .$pmaThemeImage . 'b_dbstatistics.png" width="16" height="16" border="0" hspace="2" align="absmiddle" />' : '') . "\n" + . ' ' . ($GLOBALS['cfg']['PropertiesIconic'] ? '<img src="' .$pmaThemeImage . 'b_dbstatistics.png" width="16" height="16" border="0" hspace="2" align="middle" />' : '') . "\n" . ' ' . $strDatabasesStatsDisable . "\n" . ' </a>' . "\n" . ' </b>' . "\n" @@ -378,7 +378,7 @@ if (count($statistics) > 0) { if ($is_superuser || $cfg['AllowUserDropDatabase']) { echo ' ' . ($GLOBALS['cfg']['PropertiesIconic'] ? '<tr><td colspan="2">' : '<li>') . "\n" . ' <b>' . "\n" - . ' ' . ($GLOBALS['cfg']['PropertiesIconic'] ? '<img src="' .$pmaThemeImage . 'b_deltbl.png" width="16" height="16" border="0" hspace="2" align="absmiddle" />' : '') . "\n" + . ' ' . ($GLOBALS['cfg']['PropertiesIconic'] ? '<img src="' .$pmaThemeImage . 'b_deltbl.png" width="16" height="16" border="0" hspace="2" align="middle" />' : '') . "\n" . ' ' . $strDropSelectedDatabases . "\n" . ' </b>' . "\n" . ' ' . ($GLOBALS['cfg']['PropertiesIconic'] ? '</td></tr><tr><td width="20" nowrap="nowrap"> </td><td nowrap="nowrap" align="left" width="400">' : '<br />') . "\n" diff --git a/server_links.inc.php b/server_links.inc.php index 8a3edb0db8..8dd7caedef 100644 --- a/server_links.inc.php +++ b/server_links.inc.php @@ -51,21 +51,21 @@ if ($cfg['LightTabs']) { . ' <td nowrap="nowrap"><img src="' .$GLOBALS['pmaThemeImage'] . 'spacer.png' .'" width="2" height="1" border="0" alt="" /></td>' . ' <td class="navSpacer"><img src="' .$GLOBALS['pmaThemeImage'] . 'spacer.png' . '" width="1" height="1" border="0" alt="" /></td>'; } -echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 's_db.png" width="16" height="16" border="0" hspace="2" align="absmiddle" alt="'.$strDatabases.'" />' : '') . $strDatabases, 'server_databases.php', $url_query); +echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 's_db.png" width="16" height="16" border="0" hspace="2" align="middle" alt="'.$strDatabases.'" />' : '') . $strDatabases, 'server_databases.php', $url_query); if ($cfg['ShowMysqlInfo']) { - echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 's_status.png" width="16" height="16" border="0" hspace="2" align="absmiddle" alt="'.$strStatus.'" />' : '') . $strStatus, 'server_status.php', $url_query); + echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 's_status.png" width="16" height="16" border="0" hspace="2" align="middle" alt="'.$strStatus.'" />' : '') . $strStatus, 'server_status.php', $url_query); } if ($cfg['ShowMysqlVars']) { - echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 's_vars.png" width="16" height="16" border="0" hspace="2" align="absmiddle" alt="'.$strServerTabVariables.'" />' : '') . $strServerTabVariables, 'server_variables.php', $url_query); + echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 's_vars.png" width="16" height="16" border="0" hspace="2" align="middle" alt="'.$strServerTabVariables.'" />' : '') . $strServerTabVariables, 'server_variables.php', $url_query); } if (PMA_MYSQL_INT_VERSION >= 40100) { - echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 's_asci.png" width="16" height="16" border="0" hspace="2" align="absmiddle" alt="'.$strCharsets.'" />' : '') . $strCharsets, 'server_collations.php', $url_query); + echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 's_asci.png" width="16" height="16" border="0" hspace="2" align="middle" alt="'.$strCharsets.'" />' : '') . $strCharsets, 'server_collations.php', $url_query); } if ($is_superuser) { - echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 's_rights.png" width="16" height="16" border="0" hspace="2" align="absmiddle" alt="'.$strPrivileges.'" />' : '') . $strPrivileges, 'server_privileges.php', $url_query); + echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 's_rights.png" width="16" height="16" border="0" hspace="2" align="middle" alt="'.$strPrivileges.'" />' : '') . $strPrivileges, 'server_privileges.php', $url_query); } -echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 's_process.png" width="16" height="16" border="0" hspace="2" align="absmiddle" alt="'.$strServerTabProcesslist.'" />' : '') . $strServerTabProcesslist, 'server_processlist.php', $url_query); -echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 'b_export.png" width="16" height="16" border="0" hspace="2" align="absmiddle" alt="'.$strExport.'" />' : '') . $strExport, 'server_export.php', $url_query); +echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 's_process.png" width="16" height="16" border="0" hspace="2" align="middle" alt="'.$strServerTabProcesslist.'" />' : '') . $strServerTabProcesslist, 'server_processlist.php', $url_query); +echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 'b_export.png" width="16" height="16" border="0" hspace="2" align="middle" alt="'.$strExport.'" />' : '') . $strExport, 'server_export.php', $url_query); if (!$cfg['LightTabs']) { echo ' <td nowrap="nowrap"><img src="' .$GLOBALS['pmaThemeImage'] . 'spacer.png' . '" width="2" height="1" border="0" alt="" /></td>' . ' </tr></table>' . "\n" diff --git a/server_privileges.php b/server_privileges.php index 1b9804e77e..4b58e1d655 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -29,7 +29,7 @@ if (!empty($pred_tablename)) { if (!$is_superuser) { require('./server_links.inc.php'); echo '<h2>' . "\n" - . ' ' . ($GLOBALS['cfg']['MainPageIconic'] ? '<img src="'. $GLOBALS['pmaThemeImage'] . 'b_usrlist.png" border="0" hspace="2" align="absmiddle" />' : '') + . ' ' . ($GLOBALS['cfg']['MainPageIconic'] ? '<img src="'. $GLOBALS['pmaThemeImage'] . 'b_usrlist.png" border="0" hspace="2" align="middle" />' : '') . ' ' . $strPrivileges . "\n" . '</h2>' . "\n" . $strNoPrivileges . "\n"; @@ -910,7 +910,7 @@ if (empty($adduser) && empty($checkprivs)) { if (!isset($username)) { // No username is given --> display the overview echo '<h2>' . "\n" - . ' ' . ($GLOBALS['cfg']['MainPageIconic'] ? '<img src="'. $GLOBALS['pmaThemeImage'] . 'b_usrlist.png" border="0" hspace="2" align="absmiddle" />' : '') + . ' ' . ($GLOBALS['cfg']['MainPageIconic'] ? '<img src="'. $GLOBALS['pmaThemeImage'] . 'b_usrlist.png" border="0" hspace="2" align="middle" />' : '') . $strUserOverview . "\n" . '</h2>' . "\n"; $oldPrivTables = FALSE; @@ -971,7 +971,7 @@ if (empty($adduser) && empty($checkprivs)) { . ' <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '">' . ($row['Grant_priv'] == 'Y' ? $strYes : $strNo) . '</td>' . "\n" . ' <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '" align="center"><a href="server_privileges.php?' . $url_query . '&username=' . urlencode($row['User']) . '&hostname=' . urlencode($row['Host']) . '">'; if ($GLOBALS['cfg']['PropertiesIconic']) { - echo '<img src="' . $GLOBALS['pmaThemeImage'] . 'b_usredit.png" width="16" height="16" border="0" hspace="2" align="absmiddle" alt="' . $strEdit . '" />'; + echo '<img src="' . $GLOBALS['pmaThemeImage'] . 'b_usredit.png" width="16" height="16" border="0" hspace="2" align="middle" alt="' . $strEdit . '" />'; } else { echo $strEdit; } @@ -999,12 +999,12 @@ if (empty($adduser) && empty($checkprivs)) { . ' </table>' . "\n" . ' <br /><table border="0" cellpading="3" cellspacing="0">' . "\n" . ' <tr bgcolor="' . $cfg['BgcolorOne'] . '"><td ' - . ($cfg['PropertiesIconic'] ? 'colspan="3"><b><a href="server_privileges.php?' . $url_query . '&adduser=1"><img src="' . $pmaThemeImage . 'b_usradd.png" width="16" height="16" hspace="2" border="0" align="absmiddle" />' : 'width="20" nowrap="nowrap" align="center" valign="top"><b>•</b></td><td><b><a href="server_privileges.php?' . $url_query . '&adduser=1">' ). "\n" + . ($cfg['PropertiesIconic'] ? 'colspan="3"><b><a href="server_privileges.php?' . $url_query . '&adduser=1"><img src="' . $pmaThemeImage . 'b_usradd.png" width="16" height="16" hspace="2" border="0" align="middle" />' : 'width="20" nowrap="nowrap" align="center" valign="top"><b>•</b></td><td><b><a href="server_privileges.php?' . $url_query . '&adduser=1">' ). "\n" . ' ' . $strAddUser . '</a></b>' . "\n" . ' ' . "\n" . ' </td></tr>' . "\n" . ' <tr><td colspan="2"></td></tr>' . ' <tr bgcolor="' . $cfg['BgcolorOne'] . '"><td ' - . ($cfg['PropertiesIconic'] ? 'colspan="3"><b><img src="' . $pmaThemeImage . 'b_usrdrop.png" width="16" height="16" hspace="2" border="0" align="absmiddle" />' : 'width="20" nowrap="nowrap" align="center" valign="top"><b>•</b></td><td><b>' ). "\n" + . ($cfg['PropertiesIconic'] ? 'colspan="3"><b><img src="' . $pmaThemeImage . 'b_usrdrop.png" width="16" height="16" hspace="2" border="0" align="middle" />' : 'width="20" nowrap="nowrap" align="center" valign="top"><b>•</b></td><td><b>' ). "\n" . ' <b>' . $strRemoveSelectedUsers . '</b>' . "\n" . ' </td></tr>' . "\n" . ' <tr bgcolor="' . $cfg['BgcolorOne'] . '"><td width="16" class="nowrap"> </td><td valign="top"><input type="radio" title="' . $strJustDelete . ' ' . $strJustDeleteDescr . '" name="mode" id="radio_mode_1" value="1" checked="checked" /></td>' . "\n" @@ -1035,7 +1035,7 @@ if (empty($adduser) && empty($checkprivs)) { } else { // A user was selected -> display the user's properties echo '<h2>' . "\n" - . ($cfg['PropertiesIconic'] ? '<img src="' . $pmaThemeImage . 'b_usredit.png" width="16" height="16" border="0" hspace="2" align="absmiddle" />' : '' ) + . ($cfg['PropertiesIconic'] ? '<img src="' . $pmaThemeImage . 'b_usredit.png" width="16" height="16" border="0" hspace="2" align="middle" />' : '' ) . ' ' . $strUser . ' <i><a class="h2" href="server_privileges.php?' . $url_query . '&username=' . urlencode($username) . '&hostname=' . urlencode($hostname) . '">\'' . htmlspecialchars($username) . '\'@\'' . htmlspecialchars($hostname) . '\'</a></i>' . "\n"; if (!empty($dbname)) { echo ' - ' . $strDatabase . ' <i><a class="h2" href="' . $cfg['DefaultTabDatabase'] . '?' . $url_query . '&db=' . urlencode($dbname) . '&reload=1">' . htmlspecialchars($dbname) . '</a></i>' . "\n"; @@ -1295,7 +1295,7 @@ if (empty($adduser) && empty($checkprivs)) { } else if (!empty($adduser)) { // Add a new user echo '<h2>' . "\n" - . ($cfg['PropertiesIconic'] ? '<img src="' . $pmaThemeImage . 'b_usradd.png" width="16" height="16" border="0" hspace="2" align="absmiddle" />' : '' ) + . ($cfg['PropertiesIconic'] ? '<img src="' . $pmaThemeImage . 'b_usradd.png" width="16" height="16" border="0" hspace="2" align="middle" />' : '' ) . ' ' . $strAddUser . "\n" . '</h2>' . "\n" . '<form name="usersForm" action="server_privileges.php" method="post" onsubmit="return checkAddUser(this);">' . "\n" @@ -1315,7 +1315,7 @@ if (empty($adduser) && empty($checkprivs)) { } else { // check the privileges for a particular database. echo '<h2>' . "\n" - . ($cfg['PropertiesIconic'] ? '<img src="' . $pmaThemeImage . 'b_usrcheck.png" width="16" height="16" border="0" hspace="2" align="absmiddle" />' : '' ) + . ($cfg['PropertiesIconic'] ? '<img src="' . $pmaThemeImage . 'b_usrcheck.png" width="16" height="16" border="0" hspace="2" align="middle" />' : '' ) . ' ' . sprintf($strUsersHavingAccessToDb, htmlspecialchars($checkprivs)) . "\n" . '</h2>' . "\n" . '<table border="0" cellpadding="2" cellspacing="1">' . "\n" diff --git a/server_processlist.php b/server_processlist.php index 0412a75439..e2c4f0ac6f 100644 --- a/server_processlist.php +++ b/server_processlist.php @@ -31,7 +31,7 @@ require('./server_links.inc.php'); * Displays the sub-page heading */ echo '<h2>' . "\n" - . ($cfg['MainPageIconic'] ? '<img src="' . $pmaThemeImage . 's_process.png" width="16" height="16" border="0" hspace="2" align="absmiddle" />' : '' ) + . ($cfg['MainPageIconic'] ? '<img src="' . $pmaThemeImage . 's_process.png" width="16" height="16" border="0" hspace="2" align="middle" />' : '' ) . ' ' . $strProcesslist . "\n" . '</h2>' . "\n"; diff --git a/server_status.php b/server_status.php index 0b8c256b68..b74d0772dc 100644 --- a/server_status.php +++ b/server_status.php @@ -20,7 +20,7 @@ require('./server_links.inc.php'); */ if (!empty($innodbstatus)) { echo '<h2>' . "\n" - . ($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 's_status.png" width="16" height="16" border="0" hspace="2" align="absmiddle" />' : '' ) + . ($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 's_status.png" width="16" height="16" border="0" hspace="2" align="middle" />' : '' ) . ' ' . $strInnodbStat . "\n" . '</h2>' . "\n"; $res = PMA_DBI_query('SHOW INNODB STATUS;'); @@ -36,7 +36,7 @@ if (!empty($innodbstatus)) { * Displays the sub-page heading */ echo '<h2>' . "\n" - . ($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 's_status.png" width="16" height="16" border="0" hspace="2" align="absmiddle" />' : '' ) + . ($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 's_status.png" width="16" height="16" border="0" hspace="2" align="middle" />' : '' ) . ' ' . $strServerStatus . "\n" . '</h2>' . "\n"; diff --git a/server_variables.php b/server_variables.php index 4cf6cb37b4..9bee7c4390 100644 --- a/server_variables.php +++ b/server_variables.php @@ -19,7 +19,7 @@ require('./server_links.inc.php'); * Displays the sub-page heading */ echo '<h2>' . "\n" - . ($cfg['MainPageIconic'] ? '<img src="' . $pmaThemeImage . 's_vars.png" width="16" height="16" border="0" hspace="2" align="absmiddle" />' : '' ) + . ($cfg['MainPageIconic'] ? '<img src="' . $pmaThemeImage . 's_vars.png" width="16" height="16" border="0" hspace="2" align="middle" />' : '' ) . '' . $strServerVars . "\n" . '</h2>' . "\n"; @@ -212,7 +212,7 @@ if ($do_confirm) { echo ' <tr>' . "\n" . ' <td class="tblHeadError">' . "\n"; if($cfg['ErrorIconic']){ - echo ' <img src="' .$pmaThemeImage .'s_really.png" border="0" hspace="2" align="absmiddle" />'; + echo ' <img src="' .$pmaThemeImage .'s_really.png" border="0" hspace="2" align="middle" />'; } } echo $strDoYouReally . "\n" @@ -713,7 +713,7 @@ else { . '&goto=' . urlencode($lnk_goto); echo ' <!-- Insert a new row -->' . "\n" - . ' <a href="tbl_change.php' . $url_query . '">' . ($cfg['PropertiesIconic'] ? '<img src="' . $pmaThemeImage . 'b_insrow.png" border="0" height="16" width="16" align="absmiddle" hspace="2" />' : '') . $strInsertNewRow . '</a>'; + . ' <a href="tbl_change.php' . $url_query . '">' . ($cfg['PropertiesIconic'] ? '<img src="' . $pmaThemeImage . 'b_insrow.png" border="0" height="16" width="16" align="middle" hspace="2" />' : '') . $strInsertNewRow . '</a>'; if ($disp_mode[9] == '1') { echo ' '; } @@ -734,14 +734,14 @@ else { . ' <a href="sql.php' . $url_query . ((isset($dontlimitchars) && $dontlimitchars == '1') ? '&dontlimitchars=1' : '') . '" target="print_view">' - . ($cfg['PropertiesIconic'] ? '<img src="' . $pmaThemeImage . 'b_print.png" border="0" height="16" width="16" align="absmiddle" hspace="2" />' : '') + . ($cfg['PropertiesIconic'] ? '<img src="' . $pmaThemeImage . 'b_print.png" border="0" height="16" width="16" align="middle" hspace="2" />' : '') . $strPrintView . '</a>' . "\n"; if (!$dontlimitchars) { echo ' ' . "\n" . ' <a href="sql.php' . $url_query . '&dontlimitchars=1' . '" target="print_view">' - . ($cfg['PropertiesIconic'] ? '<img src="' . $pmaThemeImage . 'b_print.png" border="0" height="16" width="16" align="absmiddle" hspace="2" />' : '') + . ($cfg['PropertiesIconic'] ? '<img src="' . $pmaThemeImage . 'b_print.png" border="0" height="16" width="16" align="middle" hspace="2" />' : '') . $strPrintViewFull . '</a> ' . "\n"; } } // end displays "printable view" @@ -764,7 +764,7 @@ else { . '&unlim_num_rows=' . $unlim_num_rows . $single_table . '">' - . ($cfg['PropertiesIconic'] ? '<img src="' . $pmaThemeImage . 'b_tblexport.png" border="0" height="16" width="16" align="absmiddle" hspace="2" />' : '') + . ($cfg['PropertiesIconic'] ? '<img src="' . $pmaThemeImage . 'b_tblexport.png" border="0" height="16" width="16" align="middle" hspace="2" />' : '') . $strExport . '</a>' . "\n"; } @@ -793,7 +793,7 @@ else { ?> <table border="0" cellpadding="2" cellspacing="0"> <tr><td class="tblHeaders" colspan="2"><?php - echo ($cfg['PropertiesIconic'] ? '<img src="' . $pmaThemeImage . 'b_bookmark.png" border="0" width="16" height="16" hspace="2" align="absmiddle" />' : '') + echo ($cfg['PropertiesIconic'] ? '<img src="' . $pmaThemeImage . 'b_bookmark.png" border="0" width="16" height="16" hspace="2" align="middle" />' : '') . $strBookmarkThis; ?></td></tr> <form action="sql.php" method="post" onsubmit="return emptyFormElements(this, 'fields[label]');"> diff --git a/tbl_addfield.php b/tbl_addfield.php index d88cde8c43..6f10a47ecd 100644 --- a/tbl_addfield.php +++ b/tbl_addfield.php @@ -28,6 +28,9 @@ if (isset($submit_num_fields)) { if (isset($orig_after_field)) { $after_field = $orig_after_field; } + if (isset($orig_field_where)) { + $field_where = $orig_field_where; + } $regenerate = TRUE; } else if (isset($submit)) { $query = ''; @@ -88,10 +91,10 @@ if (isset($submit_num_fields)) { } // end if (auto_increment) } - if ($after_field != '--end--') { - // Only the first field can be added somewhere else than at the end + if ($field_where != 'last') { + // Only the first field can be added somewhere other than at the end if ($i == 0) { - if ($after_field == '--first--') { + if ($field_where == 'first') { $query .= ' FIRST'; } else { $query .= ' AFTER ' . PMA_backquote(urldecode($after_field)); @@ -221,6 +224,9 @@ if (isset($submit_num_fields)) { if (isset($orig_after_field)) { $after_field = $orig_after_field; } + if (isset($orig_field_where)) { + $field_where = $orig_field_where; + } $regenerate = true; } } // end do alter table diff --git a/tbl_indexes.php b/tbl_indexes.php index 00c4687d2f..0637b301dd 100644 --- a/tbl_indexes.php +++ b/tbl_indexes.php @@ -271,9 +271,9 @@ else if (!defined('PMA_IDX_INCLUDED') ?> <!-- Build index form --> -<table border="0" cellpadding="2" cellspacing="1"> <form action="./tbl_indexes.php" method="post" name="index_frm" onsubmit="if (typeof(this.elements['index'].disabled) != 'undefined') {this.elements['index'].disabled = false}"> +<table border="0" cellpadding="2" cellspacing="1"> <tr><td class="tblHeaders" colspan="2"> <?php echo PMA_generate_common_hidden_inputs($db, $table); ?> <?php @@ -290,7 +290,7 @@ else if (!defined('PMA_IDX_INCLUDED') <tr> <td align="right"><b><?php echo $strIndexName; ?></b> </th> <td> - <input type="text" name="index" value="<?php echo htmlspecialchars($index); ?>" size="25" onFocus="this.select()" /> + <input type="text" name="index" value="<?php echo htmlspecialchars($index); ?>" size="25" onfocus="this.select()" /> </td> </tr> <tr><td align="right"><?php @@ -301,7 +301,7 @@ else if (!defined('PMA_IDX_INCLUDED') <tr> <td align="right"><b><?php echo $strIndexType; ?></b> </td> <td> - <select name="index_type" onChange="return checkIndexName()"> + <select name="index_type" onchange="return checkIndexName()"> <?php echo "\n"; for ($i = 0; $i < $index_types_cnt; $i++) { @@ -360,7 +360,7 @@ else if (!defined('PMA_IDX_INCLUDED') </select> </td> <td bgcolor="<?php echo $bgcolor; ?>"> - <input type="text" size="5" name="sub_part[]"<?php echo $sub_part; ?> onFocus="this.select()" /> + <input type="text" size="5" name="sub_part[]"<?php echo $sub_part; ?> onfocus="this.select()" /> </td> </tr> <?php @@ -384,16 +384,17 @@ else if (!defined('PMA_IDX_INCLUDED') </table></td></tr> <tr><td colspan="2" class="tblFooters" align="center"> <input type="submit" name="do_save_data" value="<?php echo $strSave; ?>" /></td></tr> +</table> </form> -</table><?php +<?php } else { /** * Display indexes */ ?> <!-- Indexes form --> - <table border="0" cellpadding="2" cellspacing="1"> <form action="./tbl_indexes.php" method="post"> + <table border="0" cellpadding="2" cellspacing="1"> <tr><td class="tblHeaders" colspan="7"> <?php echo PMA_generate_common_hidden_inputs($db, $table); ?> <?php @@ -408,8 +409,8 @@ else if (!defined('PMA_IDX_INCLUDED') $propicon = (string)$cfg['PropertiesIconic']; if ($cfg['PropertiesIconic'] === true || $propicon == 'both') { - $edit_link_text = '<img src="' . $pmaThemeImage . 'b_edit.png" width="16" height="16" hspace="2" border="0" title="' . $strEdit . '" alt="' . $strEdit . '">'; - $drop_link_text = '<img src="' . $pmaThemeImage . 'b_drop.png" width="16" height="16" hspace="2" border="0" title="' . $strDrop . '" alt="' . $strDrop . '">'; + $edit_link_text = '<img src="' . $pmaThemeImage . 'b_edit.png" width="16" height="16" hspace="2" border="0" title="' . $strEdit . '" alt="' . $strEdit . '" />'; + $drop_link_text = '<img src="' . $pmaThemeImage . 'b_drop.png" width="16" height="16" hspace="2" border="0" title="' . $strDrop . '" alt="' . $strDrop . '" />'; } //print_r($cfg['PropertiesIconic']); if ($cfg['PropertiesIconic'] === false || $propicon == 'both') { @@ -505,7 +506,7 @@ else if (!defined('PMA_IDX_INCLUDED') // none indexes echo "\n" . ' <tr><td colspan=7" align="center">' . "\n"; if ($cfg['ErrorIconic']) { - echo '<img src="' . $pmaThemeImage . 's_warn.png" width="16" height="16" border="0" alt="Warning" hspace="2" align="absmiddle" />'; + echo '<img src="' . $pmaThemeImage . 's_warn.png" width="16" height="16" border="0" alt="Warning" hspace="2" align="middle" />'; } echo ' <b>' . $strNoIndex . '</b></td></tr>' . "\n\n"; } @@ -515,7 +516,7 @@ else if (!defined('PMA_IDX_INCLUDED') echo ' <input type="submit" name="create_index" value="' . $strGo . '" onclick="return checkFormElementInRange(this.form, \'idx_num_fields\', 1)" style="vertical-align: middle;" />' . "\n"; echo '</td></tr> '; ?> -</form></table> +</table></form> <?php } // end display indexes diff --git a/tbl_properties.inc.php b/tbl_properties.inc.php index a999ff6b87..0065cd85e6 100644 --- a/tbl_properties.inc.php +++ b/tbl_properties.inc.php @@ -31,6 +31,7 @@ if ($action == 'tbl_create.php') { else if ($action == 'tbl_addfield.php') { echo "\n"; ?> + <input type="hidden" name="field_where" value="<?php echo $field_where; ?>" /> <input type="hidden" name="after_field" value="<?php echo $after_field; ?>" /> <?php } @@ -42,6 +43,12 @@ if (isset($num_fields)) { <?php } +if (isset($field_where)) { + ?> + <input type="hidden" name="orig_field_where" value="<?php echo $field_where; ?>" /> + <?php +} + if (isset($after_field)) { ?> <input type="hidden" name="orig_after_field" value="<?php echo $after_field; ?>" /> diff --git a/tbl_properties_links.php b/tbl_properties_links.php index 3f29da563c..97990bf10e 100644 --- a/tbl_properties_links.php +++ b/tbl_properties_links.php @@ -76,15 +76,15 @@ if ($cfg['LightTabs']) { . ' <td class="navSpacer"><img src="' . $GLOBALS['pmaThemeImage'] . 'spacer.png' . '" width="1" height="1" border="0" alt="" /></td>'; } -echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 'b_props.png" width="16" height="16" border="0" hspace="2" align="absmiddle" alt="'.$strStructure.'" />' : '') . $strStructure, 'tbl_properties_structure.php', $url_query) - . PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 'b_browse.png" width="16" height="16" border="0" hspace="2" align="absmiddle" alt="'.$strBrowse.'" />' : '') . $strBrowse, $lnk2, $arg2) - . PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 'b_sql.png" width="16" height="16" border="0" hspace="2" align="absmiddle" alt="'.$strSQL.'" />' : '') . $strSQL, 'tbl_properties.php', $url_query) - . PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 'b_search.png" width="16" height="16" border="0" hspace="2" align="absmiddle" alt="'.$strSearch.'" />' : '') . $strSearch, $lnk4, $arg4) - . PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 'b_insrow.png" width="16" height="16" border="0" hspace="2" align="absmiddle" alt="'.$strInsert.'" />' : '') . $strInsert, 'tbl_change.php', $url_query) - . PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 'b_tblexport.png" width="16" height="16" border="0" hspace="2" align="absmiddle" alt="'.$strExport.'" />' : '') . $strExport, 'tbl_properties_export.php', $url_query . '&single_table=true') - . PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 'b_tblops.png" width="16" height="16" border="0" hspace="2" align="absmiddle" alt="'.$strOperations.'" />' : '') . $strOperations, 'tbl_properties_operations.php', $url_query) - . PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 'b_empty.png" width="16" height="16" border="0" hspace="2" align="absmiddle" alt="'.$strEmpty.'" />' : '') . $strEmpty, $lnk6, $arg6, $att6, $class6) - . PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 'b_deltbl.png" width="16" height="16" border="0" hspace="2" align="absmiddle" alt="'.$strDrop.'" />' : '') . $strDrop, 'sql.php', $arg7, $att7, $class7) +echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 'b_props.png" width="16" height="16" border="0" hspace="2" align="middle" alt="'.$strStructure.'" />' : '') . $strStructure, 'tbl_properties_structure.php', $url_query) + . PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 'b_browse.png" width="16" height="16" border="0" hspace="2" align="middle" alt="'.$strBrowse.'" />' : '') . $strBrowse, $lnk2, $arg2) + . PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 'b_sql.png" width="16" height="16" border="0" hspace="2" align="middle" alt="'.$strSQL.'" />' : '') . $strSQL, 'tbl_properties.php', $url_query) + . PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 'b_search.png" width="16" height="16" border="0" hspace="2" align="middle" alt="'.$strSearch.'" />' : '') . $strSearch, $lnk4, $arg4) + . PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 'b_insrow.png" width="16" height="16" border="0" hspace="2" align="middle" alt="'.$strInsert.'" />' : '') . $strInsert, 'tbl_change.php', $url_query) + . PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 'b_tblexport.png" width="16" height="16" border="0" hspace="2" align="middle" alt="'.$strExport.'" />' : '') . $strExport, 'tbl_properties_export.php', $url_query . '&single_table=true') + . PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 'b_tblops.png" width="16" height="16" border="0" hspace="2" align="middle" alt="'.$strOperations.'" />' : '') . $strOperations, 'tbl_properties_operations.php', $url_query) + . PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 'b_empty.png" width="16" height="16" border="0" hspace="2" align="middle" alt="'.$strEmpty.'" />' : '') . $strEmpty, $lnk6, $arg6, $att6, $class6) + . PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 'b_deltbl.png" width="16" height="16" border="0" hspace="2" align="middle" alt="'.$strDrop.'" />' : '') . $strDrop, 'sql.php', $arg7, $att7, $class7) . "\n"; if (!$cfg['LightTabs']) { diff --git a/tbl_properties_structure.php b/tbl_properties_structure.php index 29f966278f..b2ed968f9b 100644 --- a/tbl_properties_structure.php +++ b/tbl_properties_structure.php @@ -83,7 +83,7 @@ $fields_cnt = PMA_DBI_num_rows($fields_rs); <?php echo PMA_MYSQL_INT_VERSION >= 40100 ? ' <th>' . $strCollation . '</th>' . "\n" : ''; ?> <th id="th4"><?php echo $strAttr; ?></th> <th id="th5"><?php echo $strNull; ?></th> - <th id="th5"><?php echo $strDefault; ?></th> + <th id="th6"><?php echo $strDefault; ?></th> <th id="th7"><?php echo $strExtra; ?></th> <th colspan="6" id="th8"><?php echo $strAction; ?></th> </tr> @@ -277,7 +277,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { <td align="center" bgcolor="<?php echo $bgcolor; ?>"> <input type="checkbox" name="selected_fld[]" value="<?php echo $field_encoded; ?>" id="checkbox_row_<?php echo $i; ?>" <?php echo $checked; ?> /> </td> - <td <?php echo $click_mouse; ?> bgcolor="<?php echo $bgcolor; ?>" nowrap="nowrap"> <label onClick="javascript: return (document.getElementById('checkbox_row_<?php echo $i; ?>') ? false : true)" for="checkbox_row_<?php echo $i; ?>"><?php echo $field_name; ?></label> </td> + <td <?php echo $click_mouse; ?> bgcolor="<?php echo $bgcolor; ?>" nowrap="nowrap"> <label onclick="return (document.getElementById('checkbox_row_<?php echo $i; ?>') ? false : true)" for="checkbox_row_<?php echo $i; ?>"><?php echo $field_name; ?></label> </td> <td <?php echo $click_mouse; ?> bgcolor="<?php echo $bgcolor; ?>"<?php echo $type_nowrap; ?>><?php echo $type; echo $type_mime; ?><bdo dir="ltr"></bdo></td> <?php echo PMA_MYSQL_INT_VERSION >= 40100 ? ' <td bgcolor="' . $bgcolor . '" ' . $click_mouse . '>' . (empty($field_charset) ? ' ' : '<dfn title="' . PMA_getCollationDescr($field_charset) . '">' . $field_charset . '</dfn>') . '</td>' . "\n" : '' ?> <td <?php echo $click_mouse; ?> bgcolor="<?php echo $bgcolor; ?>" nowrap="nowrap"><?php echo $strAttribute; ?></td> @@ -285,7 +285,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { <td <?php echo $click_mouse; ?> bgcolor="<?php echo $bgcolor; ?>" nowrap="nowrap"><?php if (isset($row['Default'])) echo $row['Default']; ?> </td> <td <?php echo $click_mouse; ?> bgcolor="<?php echo $bgcolor; ?>" nowrap="nowrap"><?php echo $row['Extra']; ?> </td> <td align="center" bgcolor="<?php echo $bgcolor; ?>"> - <a href="tbl_alter.php?<?php echo $url_query; ?>&field=<?php echo $field_encoded; ?>"> + <a href="tbl_alter.php?<?php echo $url_query; ?>&field=<?php echo $field_encoded; ?>"> <?php echo $titles['Change']; ?></a> </td> <td align="center" bgcolor="<?php echo $bgcolor; ?>"> @@ -294,7 +294,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { if ($fields_cnt > 1) { echo "\n"; ?> - <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' DROP ' . PMA_backquote($row['Field'])); ?>&cpurge=1&purgekey=<?php echo urlencode($row['Field']); ?>&zero_rows=<?php echo urlencode(sprintf($strFieldHasBeenDropped, htmlspecialchars($row['Field']))); ?>" + <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' DROP ' . PMA_backquote($row['Field'])); ?>&cpurge=1&purgekey=<?php echo urlencode($row['Field']); ?>&zero_rows=<?php echo urlencode(sprintf($strFieldHasBeenDropped, htmlspecialchars($row['Field']))); ?>" onclick="return confirmLink(this, 'ALTER TABLE <?php echo PMA_jsFormat($table); ?> DROP <?php echo PMA_jsFormat($row['Field']); ?>')"> <?php echo $titles['Drop']; ?></a> <?php @@ -311,7 +311,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { } else { echo "\n"; ?> - <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ( empty($primary) ? '' : ' DROP PRIMARY KEY,') . ' ADD PRIMARY KEY(' . PMA_backquote($row['Field']) . ')'); ?>&zero_rows=<?php echo urlencode(sprintf($strAPrimaryKey, htmlspecialchars($row['Field']))); ?>" + <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ( empty($primary) ? '' : ' DROP PRIMARY KEY,') . ' ADD PRIMARY KEY(' . PMA_backquote($row['Field']) . ')'); ?>&zero_rows=<?php echo urlencode(sprintf($strAPrimaryKey, htmlspecialchars($row['Field']))); ?>" onclick="return confirmLink(this, 'ALTER TABLE <?php echo PMA_jsFormat($table) . ( empty($primary) ? '' : ' DROP PRIMARY KEY,'); ?> ADD PRIMARY KEY(<?php echo PMA_jsFormat($row['Field']); ?>)')"> <?php echo $titles['Primary']; ?></a> <?php @@ -326,7 +326,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { } else { echo "\n"; ?> - <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD INDEX(' . PMA_backquote($row['Field']) . ')'); ?>&zero_rows=<?php echo urlencode(sprintf($strAnIndex ,htmlspecialchars($row['Field']))); ?>"> + <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD INDEX(' . PMA_backquote($row['Field']) . ')'); ?>&zero_rows=<?php echo urlencode(sprintf($strAnIndex ,htmlspecialchars($row['Field']))); ?>"> <?php echo $titles['Index']; ?></a> <?php } @@ -340,7 +340,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { } else { echo "\n"; ?> - <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD UNIQUE(' . PMA_backquote($row['Field']) . ')'); ?>&zero_rows=<?php echo urlencode(sprintf($strAnIndex , htmlspecialchars($row['Field']))); ?>"> + <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD UNIQUE(' . PMA_backquote($row['Field']) . ')'); ?>&zero_rows=<?php echo urlencode(sprintf($strAnIndex , htmlspecialchars($row['Field']))); ?>"> <?php echo $titles['Unique']; ?></a> <?php } @@ -353,7 +353,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { echo "\n"; ?> <td align="center" bgcolor="<?php echo $bgcolor; ?>" nowrap="nowrap"> - <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD FULLTEXT(' . PMA_backquote($row['Field']) . ')'); ?>&zero_rows=<?php echo urlencode(sprintf($strAnIndex , htmlspecialchars($row['Field']))); ?>"> + <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD FULLTEXT(' . PMA_backquote($row['Field']) . ')'); ?>&zero_rows=<?php echo urlencode(sprintf($strAnIndex , htmlspecialchars($row['Field']))); ?>"> <?php echo $titles['IdxFulltext']; ?></a> </td> <?php @@ -383,10 +383,10 @@ $checkall_url = 'tbl_properties_structure.php?' . PMA_generate_common_url($db,$t <tr> <td> <img src="<?php echo $pmaThemeImage . 'arrow_' . $text_dir . '.png'; ?>" border="0" width="38" height="22" alt="<?php echo $strWithChecked; ?>" /> - <a href="<?php echo $checkall_url; ?>&checkall=1" onClick="setCheckboxes('fieldsForm', true); return false;"> + <a href="<?php echo $checkall_url; ?>&checkall=1" onclick="setCheckboxes('fieldsForm', true); return false;"> <?php echo $strCheckAll; ?></a> / - <a href="<?php echo $checkall_url; ?>" onClick="setCheckboxes('fieldsForm', false); return false;"> + <a href="<?php echo $checkall_url; ?>" onclick="setCheckboxes('fieldsForm', false); return false;"> <?php echo $strUncheckAll; ?></a> <i><?php echo $strWithChecked; ?></i> @@ -441,69 +441,69 @@ if ($cfg['PropertiesIconic']) { */ ?> <!-- TABLE WORK --> -<table border="0" cellpadding="2" cellspacing="0"> - <tr><td> - <!-- Printable view of the table --> - <a href="tbl_printview.php?<?php echo $url_query; ?>"><?php - if ($cfg['PropertiesIconic']) { - echo '<img src="' . $pmaThemeImage . 'b_print.png" border="0" hspace="2" align="absmiddle" width="16" height="16" />'; - } - echo $strPrintView; - ?></a> - +<!-- Printable view of the table --> +<a href="tbl_printview.php?<?php echo $url_query; ?>"><?php + if ($cfg['PropertiesIconic']) { + echo '<img src="' . $pmaThemeImage . 'b_print.png" border="0" hspace="2" align="middle" width="16" height="16" alt="' . $strPrintView . '"/>'; + } + echo $strPrintView; + ?></a> + <?php // if internal relations are available, or the table type is INNODB // ($tbl_type comes from tbl_properties_table_info.php) if ($cfg['Server']['relation'] || $tbl_type=="INNODB") { - ?> - <!-- Work on Relations --> - <a href="tbl_relation.php?<?php echo $url_query; ?>"><?php - if ($cfg['PropertiesIconic']) { - echo '<img src="' . $pmaThemeImage . 'b_relations.png" border="0" hspace="2" align="absmiddle" width="16" height="16" />'; - } - echo $strRelationView; - ?></a> - <?php +?> +<!-- Work on Relations --> +<a href="tbl_relation.php?<?php echo $url_query; ?>"><?php + if ($cfg['PropertiesIconic']) { + echo '<img src="' . $pmaThemeImage . 'b_relations.png" border="0" hspace="2" align="middle" width="16" height="16" alt="' . $strRelationView . '"/>'; + } + echo $strRelationView; +?></a> +<?php } ?> - <!-- Let MySQL propose the optimal structure --> - <a href="sql.php?<?php echo $url_query; ?>&session_max_rows=all&sql_query=<?php echo urlencode('SELECT * FROM ' . PMA_backquote($table) . ' PROCEDURE ANALYSE()'); ?>"><?php - if ($cfg['PropertiesIconic']) { - echo '<img src="' . $pmaThemeImage . 'b_tblanalyse.png" border="0" hspace="2" align="absmiddle" width="16" height="16" />'; - } - echo $strStructPropose; - ?></a><?php - echo PMA_showMySQLDocu('Extending_MySQL', 'procedure_analyse') . "\n"; - ?> - </td></tr> - <!-- Add some new fields --> - <form method="post" action="tbl_addfield.php" - onsubmit="return checkFormElementInRange(this, 'num_fields', 1)"> - <tr><td> - <?php - echo PMA_generate_common_hidden_inputs($db, $table); - if ($cfg['PropertiesIconic']) { - echo '<img src="' . $pmaThemeImage . 'b_insrow.png" width="16" height="16" border="0" hspace="2" align="absmiddle" />'; - } - echo $strAddNewField . ': '; - ?> - <input type="text" name="num_fields" size="2" maxlength="2" value="1" style="vertical-align: middle" onFocus="this.select()" /> - <select name="after_field" style="vertical-align: middle"> - <option value="--end--"><?php echo $strAtEndOfTable; ?></option> - <option value="--first--"><?php echo $strAtBeginningOfTable; ?></option> - <optgroup label="<?php printf($strAfter, ''); ?>" title="<?php printf($strAfter, ''); ?>"> +<!-- Let MySQL propose the optimal structure --> +<a href="sql.php?<?php echo $url_query; ?>&session_max_rows=all&sql_query=<?php echo urlencode('SELECT * FROM ' . PMA_backquote($table) . ' PROCEDURE ANALYSE()'); ?>"><?php + if ($cfg['PropertiesIconic']) { + echo '<img src="' . $pmaThemeImage . 'b_tblanalyse.png" border="0" hspace="2" align="middle" width="16" height="16" alt="' . $strStructPropose . '" />'; + } + echo $strStructPropose; +?></a><?php + echo PMA_showMySQLDocu('Extending_MySQL', 'procedure_analyse') . "\n"; +?><br /> +<!-- Add some new fields --> +<form method="post" action="tbl_addfield.php" + onsubmit="return checkFormElementInRange(this, 'num_fields', 1)"> + <?php + echo PMA_generate_common_hidden_inputs($db, $table); + if ($cfg['PropertiesIconic']) { + echo '<img src="' . $pmaThemeImage . 'b_insrow.png" width="16" height="16" border="0" hspace="2" align="middle" alt="' . $strAddNewField . '"/>'; + } + echo $strAddNewField . ': '; + ?> + <input type="text" name="num_fields" size="2" maxlength="2" value="1" style="vertical-align: middle" onfocus="this.select()" /> + <input type="radio" name="field_where" id="radio_field_where_last" value="last" checked="checked" /> + <label for="radio_field_where_last"><?php echo $strAtEndOfTable; ?></label> + <input type="radio" name="field_where" id="radio_field_where_first" value="first" /> + <label for="radio_field_where_first"><?php echo $strAtBeginningOfTable; ?></label> + <input type="radio" name="field_where" id="radio_field_where_after" value="after" /> <?php -foreach ($aryFields AS $junk => $fieldname) { - echo ' <option value="' . htmlspecialchars($fieldname) . '">' . htmlspecialchars($fieldname) . '</option>' . "\n"; +$fieldOptions = '</label><select name="after_field" style="vertical-align: middle" onclick="this.form.field_where[2].checked=true" onchange="this.form.field_where[2].checked=true">'; +foreach ($aryFields AS $fieldname) { +$fieldOptions .= '<option value="' . htmlspecialchars($fieldname) . '">' . htmlspecialchars($fieldname) . '</option>' . "\n"; } unset($aryFields); +$fieldOptions .= '</select><label for="radio_field_where_after">'; ?> - </optgroup> - </select> - <input type="submit" value="<?php echo $strGo; ?>" style="vertical-align: middle" /> - </td></tr></form> -</table> + <?php + echo str_replace('<label for="radio_field_where_after"></label>', '', '<label for="radio_field_where_after">' . sprintf($strAfter, $fieldOptions) . '</label>') . "\n"; + ?> + <input type="submit" value="<?php echo $strGo; ?>" style="vertical-align: middle" /> +</form> + <hr /> <?php @@ -630,9 +630,9 @@ if ($cfg['ShowStats']) { ?> <tr> <td colspan="3" align="center" bgcolor="<?php echo $cfg['BgcolorTwo']; ?>"> - <a href="sql.php?<?php echo $url_query; ?>&pos=0&sql_query=<?php echo urlencode('OPTIMIZE TABLE ' . PMA_backquote($table)); ?>"><?php + <a href="sql.php?<?php echo $url_query; ?>&pos=0&sql_query=<?php echo urlencode('OPTIMIZE TABLE ' . PMA_backquote($table)); ?>"><?php if ($cfg['PropertiesIconic']) { - echo '<img src="' . $pmaThemeImage . 'b_tbloptimize.png" width="16" height="16" border="0" hspace="2" align="absmiddle" alt="' . $strOptimizeTable. '" />'; + echo '<img src="' . $pmaThemeImage . 'b_tbloptimize.png" width="16" height="16" border="0" hspace="2" align="middle" alt="' . $strOptimizeTable. '" />'; } echo $strOptimizeTable; ?></a> diff --git a/tbl_query_box.php b/tbl_query_box.php index 292584b98b..7ee34e0611 100644 --- a/tbl_query_box.php +++ b/tbl_query_box.php @@ -117,7 +117,7 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS'] && isset($is_inside_querywindow) . ' </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"> <?php } ?> @@ -170,7 +170,7 @@ if (!isset($is_inside_querywindow) || <td valign="middle"> <?php if ($cfg['PropertiesIconic']) { - echo '<input type="button" name="insert" value="<<" onclick="insertValueQuery()" title="' . $strInsert. '" />'; + echo '<input type="button" name="insert" value="<<" onclick="insertValueQuery()" title="' . $strInsert. '" />'; } else { echo '<input type="button" name="insert" value="' . $strInsert . '" onclick="insertValueQuery()" />'; } @@ -423,7 +423,7 @@ if (!isset($is_inside_querywindow) || } echo ' </select>' . " \n"; echo ' ' . $strVar; - echo ' ' . $cfg['ReplaceHelpImg'] ? '<a href="./Documentation.html#faqbookmark" target="documentation"><img src="' . $pmaThemeImage . 'b_help.png" width="11" height="11" align="absmiddle" alt="' . $strDocu . '" hspace="2" border="0" /></a>' : '(<a href="./Documentation.html#faqbookmark" target="documentation">' . $strDocu . '</a>)'; + echo ' ' . $cfg['ReplaceHelpImg'] ? '<a href="./Documentation.html#faqbookmark" target="documentation"><img src="' . $pmaThemeImage . 'b_help.png" width="11" height="11" align="middle" alt="' . $strDocu . '" hspace="2" border="0" /></a>' : '(<a href="./Documentation.html#faqbookmark" target="documentation">' . $strDocu . '</a>)'; echo ': <input type="text" name="bookmark_variable" class="textfield" size="10" style="vertical-align: middle" /><br />' . "\n"; echo ' <input type="radio" name="action_bookmark" value="0" id="radio_bookmark0" checked="checked" style="vertical-align: middle" /><label for="radio_bookmark0">' . $strSubmit . '</label>' . "\n"; echo ' <input type="radio" name="action_bookmark" value="1" id="radio_bookmark1" style="vertical-align: middle" /><label for="radio_bookmark1">' . $strBookmarkView . '</label>' . "\n"; @@ -440,14 +440,6 @@ if (!isset($is_inside_querywindow) || if (!isset($is_inside_querywindow) || (isset($is_inside_querywindow) && $is_inside_querywindow == TRUE && isset($querydisplay_tab) && (($querydisplay_tab == 'files') || $querydisplay_tab == 'sql' || $querydisplay_tab == 'full' || ($querydisplay_tab == 'history' && $bookmark_go)))) { if ($form_items > 0) { -?><!-- not needed - <table border="0"> - <tr> - <td valign="top"> - <input type="submit" name="SQL" value="<?php echo $strGo; ?>" /> - </td> -//--> -<?php if ( $cfg['Bookmark']['db'] && $cfg['Bookmark']['table'] && (!isset($is_inside_querywindow) @@ -457,13 +449,11 @@ if (!isset($is_inside_querywindow) || (isset($is_inside_querywindow) && $is_insi //&& $querydisplay_tab != 'history'))) { && $querydisplay_tab == 'sql'))) { ?> - <tr><td<?php echo $queryframe_thcolspan; ?>><img src="<?php echo $GLOBALS['pmaThemeImage'] . 'spacer.png'; ?>" border="0" width="1" height="1" /></td></tr> - <tr><th<?php echo $queryframe_thcolspan; ?> align="left"><?php echo $strBookmarkThis; ?>:</th> + <tr><td<?php echo $queryframe_thcolspan; ?>><img src="<?php echo $GLOBALS['pmaThemeImage'] . 'spacer.png'; ?>" border="0" width="1" height="1" alt="" /></td></tr> + <tr><th<?php echo $queryframe_thcolspan; ?> align="left"><?php echo $strBookmarkThis; ?>:</th></tr> <tr bgcolor="<?php echo $cfg['BgcolorTwo']; ?>"> <td<?php echo $queryframe_thcolspan; ?>> <b><?php echo $strBookmarkOptions; ?>:</b> - </td></tr> - </td> </tr> <tr bgcolor="<?php echo $cfg['BgcolorOne']; ?>"> @@ -474,17 +464,11 @@ if (!isset($is_inside_querywindow) || (isset($is_inside_querywindow) && $is_insi </tr> <tr bgcolor="<?php echo $cfg['BgcolorOne']; ?>"> <td align="right"<?php echo $queryframe_thcolspan; ?>> - <input type="submit" name="SQLbookmark" value="<?php echo $strGo . ' & ' . $strBookmarkThis; ?>" onClick="if(document.forms['sqlform'].elements['bkm_label'].value==''){ alert('Please insert a Bookmark-Titel ');forms['sqlform'].elements['bkm_label'].focus();return false; }"/> + <input type="submit" name="SQLbookmark" value="<?php echo $strGo . ' & ' . $strBookmarkThis; ?>" onclick="if(document.forms['sqlform'].elements['bkm_label'].value==''){ alert('Please insert a Bookmark-Titel ');forms['sqlform'].elements['bkm_label'].focus();return false; }"/> </td> </tr> <?php } -?> -<!-- not needed - </tr> - </table> -//--> -<?php } else { echo ' <tr><td' . $queryframe_thcolspan . '>' . "\n"; // TODO: Add a more complete warning that no items (like for file import) where found. @@ -515,7 +499,7 @@ if (!isset($is_inside_querywindow) || //if (!isset($is_inside_querywindow) || !$is_inside_querywindow) echo "<li>\n"; if ($cfg['PropertiesIconic']) { $imgInsertTextfiles = '<img src="' . $pmaThemeImage. 'b_tblimport.png" ' - . 'width="16" height="16" hspace="2" border="0" align="absmiddle" alt="' . $strInsertTextfiles. '" />'; + . 'width="16" height="16" hspace="2" border="0" align="middle" alt="' . $strInsertTextfiles. '" />'; }else{ $imgInsertTextfiles = ''; } diff --git a/themes.php b/themes.php index ebba8d5199..c848a65951 100644 --- a/themes.php +++ b/themes.php @@ -81,7 +81,7 @@ echo "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?".">"; <th class="tblHeaders"><b>phpMyAdmin - <?php echo ($strTheme ? $strTheme : 'Theme / Style'); ?></b></th> </tr> <tr> - <td><img src="<?php echo $GLOBALS['pmaThemeImage'] . 'spacer.png'; ?>" width="1" height="1" border="0" /></td> + <td><img src="<?php echo $GLOBALS['pmaThemeImage'] . 'spacer.png'; ?>" width="1" height="1" border="0" alt="" /></td> </tr> <?php if ($handleThemes = opendir($path_to_themes)) { // open themes @@ -122,7 +122,7 @@ if ($handleThemes = opendir($path_to_themes)) { // open themes </td> </tr> <tr> - <td><img src="<?php echo $GLOBALS['pmaThemeImage'] . 'spacer.png'; ?>" width="1" height="1" border="0" /></td> + <td><img src="<?php echo $GLOBALS['pmaThemeImage'] . 'spacer.png'; ?>" width="1" height="1" border="0" alt="" /></td> </tr> <?php } // end 'screen output' |