';
+
+ // Space usage
+ $html .= '';
+ $html .= '' . __('Space usage:') . '';
+ $html .= '';
+ $html .= '';
+ $html .= '| ' . __('Data') . ' | ';
+ $html .= '' . $data_size . ' | ';
+ $html .= '' . $data_unit . ' | ';
+ $html .= ' ';
+ if (isset($index_size)) {
+ $html .= "\n";
+ $html .= '';
+ $html .= '| ' . __('Index') . ' | ';
+ $html .= '' . $index_size . ' | ';
+ $html .= '' . $index_unit. ' | ';
+ $html .= ' ';
+ }
+ if (isset($free_size)) {
+ $html .= "\n";
+ $html .= '';
+ $html .= '| ';
+ $html .= __('Overhead');
+ $html .= ' | ';
+ $html .= '' . $free_size . ' | ';
+ $html .= '' . $free_unit . ' | ';
+ $html .= ' ';
+ $html .= '';
+ $html .= '| ';
+ $html .= __('Effective');
+ $html .= ' | ';
+ $html .= '' . $effect_size . ' | ';
+ $html .= '' . $effect_unit . ' | ';
+ $html .= ' ';
+ }
+ if (isset($tot_size) && $mergetable == false) {
+ $html .= "\n";
+ $html .= '';
+ $html .= '| ' . __('Total') . ' | ';
+ $html .= '' . $tot_size . ' | ';
+ $html .= '' . $tot_unit . ' | ';
+ $html .= ' ';
+ }
+ $html .= "\n";
+ $html .= ' ';
+
+ return $html;
+}
/**
* return html for Space Usage And Row Statistic
*
@@ -338,55 +411,19 @@ function PMA_getHtmlForSpaceUsageAndRowStatistics(
// Displays them
$html .= '
';
+ $html .= PMA_getHtmlForSpaceUsage(
+ $data_size, $data_unit,
+ isset($index_size)? $index_size : null,
+ isset($index_unit)? $index_unit : null,
+ isset($free_size)? $free_size : null,
+ isset($free_unit)? $free_unit : null,
+ isset($effect_size)? $effect_size : null,
+ isset($effect_unit)? $effect_unit : null,
+ isset($tot_size)? $tot_size : null,
+ isset($tot_unit)? $tot_unit : null,
+ $mergetable
+ );
- $html .= '';
- $html .= "\n";
- $html .= '';
-
- // Space usage
- $html .= '';
- $html .= '' . __('Space usage:') . '';
- $html .= '';
- $html .= '';
- $html .= '| ' . __('Data') . ' | ';
- $html .= '' . $data_size . ' | ';
- $html .= '' . $data_unit . ' | ';
- $html .= ' ';
- if (isset($index_size)) {
- $html .= "\n";
- $html .= '';
- $html .= '| ' . __('Index') . ' | ';
- $html .= '' . $index_size . ' | ';
- $html .= '' . $index_unit. ' | ';
- $html .= ' ';
- }
- if (isset($free_size)) {
- $html .= "\n";
- $html .= '';
- $html .= '| ';
- $html .= __('Overhead');
- $html .= ' | ';
- $html .= '' . $free_size . ' | ';
- $html .= '' . $free_unit . ' | ';
- $html .= ' ';
- $html .= '';
- $html .= '| ';
- $html .= __('Effective');
- $html .= ' | ';
- $html .= '' . $effect_size . ' | ';
- $html .= '' . $effect_unit . ' | ';
- $html .= ' ';
- }
- if (isset($tot_size) && $mergetable == false) {
- $html .= "\n";
- $html .= '';
- $html .= '| ' . __('Total') . ' | ';
- $html .= '' . $tot_size . ' | ';
- $html .= '' . $tot_unit . ' | ';
- $html .= ' ';
- }
- $html .= "\n";
- $html .= ' ';
$html .= ' | ';
$html .= PMA_getHtmlForRowStatistics(
$showtable, $cell_align_left,
@@ -403,6 +440,7 @@ function PMA_getHtmlForSpaceUsageAndRowStatistics(
return $html;
}
+
/**
* return html for Table Structure
*
@@ -447,7 +485,7 @@ function PMA_getHtmlForTableStructure(
$html .= '';
$html .= ' ';
$html .= PMA_getHtmlForPrintViewColumns(
- $columns, $analyzed_sql, $pk_array, $have_rel,
+ $columns, $analyzed_sql, $pk_array, $have_rel,
$res_rel, $db, $table, $cfgRelation
);
$html .= '';
|