From 714c4c76d453244f2b082fa77a5736bf10e347ac Mon Sep 17 00:00:00 2001 From: Sebastian Mendel Date: Wed, 9 Nov 2005 09:33:52 +0000 Subject: [PATCH] fixed display issues --- ChangeLog | 1 + db_details_structure.php | 54 +++++++++++++++++++++------------------- 2 files changed, 29 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index b3ae70028..a4aba8a35 100755 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ $Source$ 2005-11-09 Sebastian Mendel * server_databases.php, mysql_charsets-lib.php: bug #1351743 undefined function: pma_getservercollation() + * db_details_structure.php: fixed display issues 2005-11-08 Sebastian Mendel * Documentation.html, browse_foreigners.php, error.php, diff --git a/db_details_structure.php b/db_details_structure.php index 5002bb439..830ccadfa 100644 --- a/db_details_structure.php +++ b/db_details_structure.php @@ -28,11 +28,11 @@ if ( empty( $is_info ) ) { // 1. No tables if ( $num_tables == 0 ) { echo '

' . $strNoTablesFound . '

' . "\n"; - + if ( empty( $db_is_information_schema ) ) { require('./libraries/display_create_table.lib.php'); } // end if (Create Table dialog) - + /** * Displays the footer */ @@ -53,13 +53,13 @@ if ( PMA_MYSQL_INT_VERSION >= 40101 ) { // Display function function PMA_TableHeader( $db_is_information_schema = false ) { $cnt = 0; // Let's count the columns... - + if ( $db_is_information_schema ) { $action_colspan = 3; } else { $action_colspan = 6; } - + echo '' . "\n" .'' . "\n" .'' . "\n" @@ -67,7 +67,7 @@ function PMA_TableHeader( $db_is_information_schema = false ) { .' ' - .' ' . "\n"; if (!($GLOBALS['cfg']['PropertiesNumColumns'] > 1)) { @@ -135,7 +135,7 @@ if ( true == $cfg['PropertiesIconic'] ) { */ ?> - $each_table ) { $each_table['TABLE_ROWS'] = PMA_countRecords( $db, $each_table['TABLE_NAME'], $return = true, $force_exact = true ); } - + $table_encoded = urlencode($each_table['TABLE_NAME']); // MySQL < 5.0.13 returns "view", >= 5.0.13 returns "VIEW" $table_is_view = ( $each_table['TABLE_TYPE'] === 'VIEW' @@ -189,7 +189,7 @@ foreach ( $tables as $keyname => $each_table ) { $browse_table = $titles['NoBrowse']; $search_table = $titles['NoSearch']; } - + if ( ! $db_is_information_schema ) { if ( ! empty($each_table['TABLE_ROWS']) ) { $empty_table = '' + $collation = '' . $each_table['Collation'] . ''; } else { $collation = '---'; } } - + if ( $cfg['ShowStats']) { if (isset($formated_overhead)) { - $overhead = '' . $formated_overhead + $overhead = '' . $formated_overhead . ' ' . $overhead_unit . '' . "\n"; unset($formated_overhead); - $overhead_check .= + $overhead_check .= "document.getElementById('checkbox_tbl_$i').checked = true;"; } else { $overhead = '-'; } } // end if } - + if ( $num_columns > 0 && $num_tables > $num_columns && ( ($row_count % $num_columns) == 0 )) { $row_count = 1; @@ -313,7 +313,7 @@ foreach ( $tables as $keyname => $each_table ) { ' . "\n"; if ( ! empty( $db_collation ) ) { echo ' ' . "\n"; } @@ -391,12 +391,13 @@ if ($cfg['ShowStats']) {
' . "\n" .' ' . $GLOBALS['strAction'] . "\n" .' ' . $GLOBALS['strRecords'] + .' ' . $GLOBALS['strRecords'] .PMA_showHint( $GLOBALS['strApproximateCount'] ) . "\n" .'
- &reload=1&purge=1&sql_query=&zero_rows=" @@ -355,7 +355,7 @@ foreach ( $tables as $keyname => $each_table ) { // Show Summary if ($cfg['ShowStats']) { list($sum_formated, $unit) = PMA_formatByteDown($sum_size, 3, 1); - list($overhead_formated, $overhead_unit) = + list($overhead_formated, $overhead_unit) = PMA_formatByteDown($overhead_size, 3, 1); } ?> @@ -374,8 +374,8 @@ if (!($cfg['PropertiesNumColumns'] > 1)) { echo ' --' . "\n" - . ' ' . $db_collation + . ' ' . $db_collation . '' . "\n" . '
-
 
+ +
@@ -456,14 +458,14 @@ echo '

'; echo ''; if ( $cfg['PropertiesIconic'] ) { - echo ''; } echo $strPrintView . ' '; echo ''; if($cfg['PropertiesIconic']){ - echo ''; } echo $strDataDict . '';