diff --git a/ChangeLog b/ChangeLog index c58af3022..efbda9d8a 100755 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,11 @@ $Source$ 2004-08-12 Michal Čihař * 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ř * tbl_replace.php: Do not empty protected values (bug #1006812). diff --git a/browse_foreigners.php b/browse_foreigners.php index a5c965233..003a85c09 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 = '
' . $GLOBALS['strPageNumber'] - . ''; if ($nbTotalPage < 200) { $firstPage = 1; $lastPage = $nbTotalPage; diff --git a/db_details.php b/db_details.php index b37a34e77..32ef6bc3e 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 '' - . '' . $strDocu . ''; + . '' . $strDocu . ''; }else{ echo '(' . $strDocu . '): '; } diff --git a/db_details_links.php b/db_details_links.php index 285be433b..027431407 100644 --- a/db_details_links.php +++ b/db_details_links.php @@ -71,15 +71,15 @@ if ($cfg['LightTabs']) { . ' '; } -echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? ''.$strStructure.'' : '') . $strStructure, 'db_details_structure.php', $url_query); -echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? ''.$strSQL.'' : '') . $strSQL, 'db_details.php', $url_query . '&db_query_force=1'); -echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? ''.$strExport.'' : '') . $strExport, $lnk3, $arg3); -echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? ''.$strSearch.'' : '') . $strSearch, $lnk4, $arg4); -echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? ''.$strQBE.'' : '') . $strQBE, ($num_tables > 0) ? 'db_details_qbe.php' : '', $url_query); +echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? ''.$strStructure.'' : '') . $strStructure, 'db_details_structure.php', $url_query); +echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? ''.$strSQL.'' : '') . $strSQL, 'db_details.php', $url_query . '&db_query_force=1'); +echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? ''.$strExport.'' : '') . $strExport, $lnk3, $arg3); +echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? ''.$strSearch.'' : '') . $strSearch, $lnk4, $arg4); +echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? ''.$strQBE.'' : '') . $strQBE, ($num_tables > 0) ? 'db_details_qbe.php' : '', $url_query); // Displays drop link if ($lnk5) { - echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? ''.$strDrop.'' : '') . $strDrop, $lnk5, $arg5, $att5, $class5); + echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? ''.$strDrop.'' : '') . $strDrop, $lnk5, $arg5, $att5, $class5); } // end if echo "\n"; diff --git a/db_details_structure.php b/db_details_structure.php index 37593a74d..bd9b52789 100644 --- a/db_details_structure.php +++ b/db_details_structure.php @@ -643,14 +643,14 @@ if ($num_tables > 0) { '; if ($cfg['PropertiesIconic']) { - echo ''; + echo ''; } echo $strPrintView . ''; ?>       '; if($cfg['PropertiesIconic']){ - echo ''; + echo ''; } echo $strDataDict . ''; ?> @@ -664,7 +664,7 @@ if ($num_tables > 0) { '; } + if($cfg['PropertiesIconic']){ echo ''; } // if you want navigation: $strDBLink = '' . htmlspecialchars($GLOBALS['db']) . ''; @@ -701,7 +701,7 @@ if ($cfgRelation['commwork']) { '; + echo ''; } echo $strDBComment; ?> @@ -721,7 +721,7 @@ if ($cfgRelation['commwork']) { '; + echo ''; } echo $strDBRename.': '; ?> @@ -743,7 +743,7 @@ if (PMA_MYSQL_INT_VERSION >= 40101) { . ' ' . "\n" . ' '; if ($cfg['PropertiesIconic']) { - echo ''; + echo ''; } echo ' : ' . "\n" . ' ' . "\n" @@ -786,13 +786,13 @@ if ($cfgRelation['pdfwork'] && $num_tables > 0) { '; + echo ''; } ?>PDF '; if ($cfg['PropertiesIconic']) { - echo ''; + echo ''; } echo ''. $strEditPDFPages . ''; ?> @@ -812,7 +812,7 @@ if ($cfgRelation['pdfwork'] && $num_tables > 0) { '; + echo ''; } echo $strDisplayPDF; ?>:  @@ -891,7 +891,7 @@ if ($num_tables > 0 '; if ($cfg['PropertiesIconic']) { - echo ''; + echo ''; } echo $strImportDocSQL . ''; ?> diff --git a/left.php b/left.php index 2bc950f76..3aeeb7044 100644 --- a/left.php +++ b/left.php @@ -373,7 +373,7 @@ if (!$cfg['QueryFrame']) { echo '' . ($cfg['MainPageIconic'] ? '' . $strHome . '' + .' onmouseover="this.style.backgroundColor=\'#ffffff\';" onmouseout="this.style.backgroundColor=\'\';" align="middle" />' : '' . $strHome . '') . ''; // Logout for advanced authentication @@ -382,7 +382,7 @@ if (!$cfg['QueryFrame']) { echo '' . ($cfg['MainPageIconic'] ? '' . $strLogout . '' + .' onmouseover="this.style.backgroundColor=\'#ffffff\';" onmouseout="this.style.backgroundColor=\'\';" align="middle" />' : '' . $strLogout . '') . ''; } // end if @@ -390,12 +390,12 @@ if (!$cfg['QueryFrame']) { echo '' . '' . '' . $strPmaDocumentation . '' + .' onmouseover="this.style.backgroundColor=\'#ffffff\';" onmouseout="this.style.backgroundColor=\'\';" align="middle" />' . ''; echo '' . '' . 'MySQL - ' . $strDocu . '' + .' onmouseover="this.style.backgroundColor=\'#ffffff\';" onmouseout="this.style.backgroundColor=\'\';" align="middle" />' . ''; } ?> diff --git a/libraries/common.lib.php b/libraries/common.lib.php index f93d54400..129426792 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 '' . $GLOBALS['strDocu'] . ''; + return '' . $GLOBALS['strDocu'] . ''; }else{ return '[' . $GLOBALS['strDocu'] . ']'; } case 'chapters': if ($GLOBALS['cfg']['ReplaceHelpImg']) { - return '' . $GLOBALS['strDocu'] . ''; + return '' . $GLOBALS['strDocu'] . ''; } else { return '[' . $GLOBALS['strDocu'] . ']'; } case 'big': if ($GLOBALS['cfg']['ReplaceHelpImg']) { - return '' . $GLOBALS['strDocu'] . ''; + return '' . $GLOBALS['strDocu'] . ''; } else { return '[' . $GLOBALS['strDocu'] . ']'; } @@ -498,7 +498,7 @@ if ($is_minimum_common == FALSE) { case 'searchable': default: if ($GLOBALS['cfg']['ReplaceHelpImg']) { - return '' . $GLOBALS['strDocu'] . ''; + return '' . $GLOBALS['strDocu'] . ''; } else { return '[' . $GLOBALS['strDocu'] . ']'; } @@ -506,7 +506,7 @@ if ($is_minimum_common == FALSE) { } else { // no Type defined, show the old one if ($GLOBALS['cfg']['ReplaceHelpImg']) { - return '' . $GLOBALS['strDocu'] . ''; + return '' . $GLOBALS['strDocu'] . ''; } else { return '[' . $GLOBALS['strDocu'] . ']'; } @@ -516,7 +516,7 @@ if ($is_minimum_common == FALSE) { if (!empty($GLOBALS['cfg']['ManualBaseShort'])) { // the old configuration if ($GLOBALS['cfg']['ReplaceHelpImg']) { - return '' . $GLOBALS['strDocu'] . ''; + return '' . $GLOBALS['strDocu'] . ''; } else { return '[' . $GLOBALS['strDocu'] . ']'; } @@ -596,7 +596,7 @@ if ($is_minimum_common == FALSE) { } if ($GLOBALS['cfg']['PropertiesIconic']) { echo $doedit_goto - . '' . $GLOBALS['strEdit'] .'' + . '' . $GLOBALS['strEdit'] .'' . ''; } else { echo ' [' diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index 966196280..5211b7ad3 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -179,7 +179,7 @@ if (isset($sql_query)) { $goto_documentation = ''; echo ($cfg['ReplaceHelpImg'] ? '' : '(') . $goto_documentation - . ($cfg['ReplaceHelpImg'] ? '' .$strDocu . '' : $strDocu) + . ($cfg['ReplaceHelpImg'] ? '' .$strDocu . '' : $strDocu) . '' . ($cfg['ReplaceHelpImg'] ? '' : ')'); ?> diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 408a6360c..12f223802 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) for keep the form alignment of button < and << ?>
- ')"> */ if (PMA_USR_BROWSER_AGENT != 'IE') { echo ' '; echo ' '; if ($analyzed_sql[0]['querytype'] == 'SELECT') { echo ' '; } diff --git a/main.php b/main.php index 3eb304cd5..589287e64 100644 --- a/main.php +++ b/main.php @@ -319,7 +319,7 @@ if ($server > 0) {
' - . ($cfg['ErrorIconic'] ? '' : '') + . ($cfg['ErrorIconic'] ? '' : '') . '' . $strNoPrivileges .''; } // end create db form or message ?> @@ -451,7 +451,7 @@ if ($server > 0) { $http_logout = ($cfg['Server']['auth_type'] == 'http') ? "\n" . ' ' - . ($cfg['ReplaceHelpImg'] ? 'Info' : '(*)') . '' + . ($cfg['ReplaceHelpImg'] ? 'Info' : '(*)') . '' : ''; echo "\n"; ?> @@ -498,7 +498,7 @@ if (empty($cfg['Lang'])) { if ($cfg['ReplaceHelpImg']){ echo 'Info'; }else{ echo '(*)'; } -?>: " /> : - $tmpcharset) { @@ -624,7 +624,7 @@ if (isset($available_themes_choices) && $available_themes_choices > 1) { . (isset($strTheme) ? $strTheme : 'Theme (Style)') . ':' . "\n"; ?> - $cur_theme) { echo '