'
- . $value
- . '';
- } else {
- $html .= '';
- $html .= ($column=="labelColumn") ? __("Label column") : __("Spatial column");
- $html .= ' ';
-
- $html .= '';
-
- if ($column == "labelColumn") {
- $html .= '' . __("-- None --") . ' ';
- }
-
- $html .= PMA_getHtmlForOptionsList(
- $columnCandidates, array($visualizationSettings[$column])
- );
-
- $html .= ' ';
-
- return $html;
-}
-
-/**
- * Function to get HTML for the option of using open street maps
- *
- * @param boolean $isSelected the default value
- *
- * @return string HTML string
- */
-function PMA_getHtmlForUseOpenStreetMaps($isSelected)
-{
- $html = '';
- $html .= '';
- $html .= '
';
- $html .= '' . __('Display GIS Visualization') . ' ';
-
- $html .= '';
- $html .= '
';
-
- $html .= '
';
- $html .= '
';
- $html .= '
';
- $html .= PMA_Util::getImage('b_saveimage', __('Save'));
- $html .= ' ';
-
$url_params['sql_query'] = $sql_query;
$url_params['saveToFile'] = 'download';
$url = 'tbl_gis_visualization.php' . PMA_URL_getCommon($url_params);
- $html .= '
';
- $html .= PMA_getHtmlForGisDownloadLink($url, 'png', 'PNG');
- $html .= PMA_getHtmlForGisDownloadLink($url, 'pdf', 'PDF');
- if ($svg_support) {
- $html .= PMA_getHtmlForGisDownloadLink($url, 'svg', 'SVG');
- }
- $html .= ' ';
- $html .= '
';
-
- $html .= '
';
-
- $html .= '';
- $html .= $visualization;
- $html .= '
';
-
- $html .= '
';
- $html .= ' ';
- $html .= '
' . __('Showing tables:') . ' '
- . htmlspecialchars($tbl_list) . ' ' . "\n";
- $html .= 'NULL ';
- }
- } else {
- $row['Default'] = htmlspecialchars($row['Default']);
- }
- $field_name = htmlspecialchars($row['Field']);
-
- if (! $tbl_is_view) {
- // here, we have a TIMESTAMP that SHOW FULL COLUMNS reports as having
- // the NULL attribute, but SHOW CREATE TABLE says the contrary.
- // Believe the latter.
- /**
- * @todo merge this logic with the one in tbl_structure.php
- * or move it in a function similar to $GLOBALS['dbi']->getColumnsFull()
- * but based on SHOW CREATE TABLE because information_schema
- * cannot be trusted in this case (MySQL bug)
- */
- $analyzed_for_field
- = $analyzed_sql[0]['create_table_fields'][$field_name];
- if (! empty($analyzed_for_field['type'])
- && $analyzed_for_field['type'] == 'TIMESTAMP'
- && $analyzed_for_field['timestamp_not_null']
- ) {
- $row['Null'] = '';
- }
- }
-
- $html .= "\n";
- $html .= ' ';
-
- $html .= ' ' . $field_name . "\n";
- if ($primary && $primary->hasColumn($field_name)) {
- $html .= ' (' . __('Primary') . ') ';
- }
- $html .= "\n";
- $html .= ' ';
- $html .= '' . htmlspecialchars($type) . ' ';
- $html .= '';
- $html .= (($row['Null'] == '' || $row['Null'] == 'NO')
- ? __('No')
- : __('Yes'));
- $html .= ' ';
- $html .= '';
- if (isset($row['Default'])) {
- $html .= $row['Default'];
- }
- $html .= ' ';
- if ($have_rel) {
- $html .= ' ';
- $foreigner = PMA_searchColumnInForeigners($res_rel, $field_name);
- if ($foreigner) {
- $html .= htmlspecialchars(
- $foreigner['foreign_table']
- . ' -> ' . $foreigner['foreign_field']
- );
- }
- $html .= ' ' . "\n";
- }
- $html .= ' ';
- $comments = PMA_getComments($db, $table);
- if (isset($comments[$field_name])) {
- $html .= htmlspecialchars($comments[$field_name]);
- }
- $html .= ' ' . "\n";
- if ($cfgRelation['mimework']) {
- $mime_map = PMA_getMIME($db, $table, true);
-
- $html .= ' ';
- if (isset($mime_map[$field_name])) {
- $html .= htmlspecialchars(
- str_replace('_', '/', $mime_map[$field_name]['mimetype'])
- );
- }
- $html .= ' ' . "\n";
- }
- $html .= ' ';
-
- // Rows Statistic
- $html .= "\n";
- $html .= '';
- $html .= '' . __('Row Statistics:') . ' ';
- $html .= '';
- if (isset($showtable['Row_format'])) {
- $html .= "\n";
- $html .= '';
- $html .= '' . __('Format') . ' ';
- $html .= '';
- if ($showtable['Row_format'] == 'Fixed') {
- $html .= __('static');
- } elseif ($showtable['Row_format'] == 'Dynamic') {
- $html .= __('dynamic');
- } else {
- $html .= $showtable['Row_format'];
- }
- $html .= ' ';
- $html .= ' ';
- }
- if (isset($showtable['Rows'])) {
- $html .= "\n";
- $html .= '';
- $html .= '' . __('Rows') . ' ';
- $html .= '';
- $html .= PMA_Util::formatNumber($showtable['Rows'], 0);
- $html .= ' ';
- $html .= ' ';
- }
- if (isset($showtable['Avg_row_length'])
- && $showtable['Avg_row_length'] > 0
- ) {
- $html .= "\n";
- $html .= '';
- $html .= '' . __('Row length') . ' ø ';
- $html .= '';
- $html .= PMA_Util::formatNumber(
- $showtable['Avg_row_length'], 0
- );
- $html .= ' ';
- $html .= ' ';
- }
- if (isset($showtable['Data_length'])
- && $showtable['Rows'] > 0
- && $mergetable == false
- ) {
- $html .= "\n";
- $html .= '';
- $html .= '' . __('Row size') . ' ø ';
- $html .= '';
- $html .= $avg_size . ' ' . $avg_unit;
- $html .= ' ';
- $html .= ' ';
- }
- if (isset($showtable['Auto_increment'])) {
- $html .= "\n";
- $html .= '';
- $html .= '' . __('Next autoindex') . ' ';
- $html .= '';
- $html .= PMA_Util::formatNumber(
- $showtable['Auto_increment'], 0
- );
- $html .= ' ';
- $html .= ' ';
- }
- if (isset($showtable['Create_time'])) {
- $html .= "\n";
- $html .= '';
- $html .= '' . __('Creation') . ' ';
- $html .= '';
- $html .= PMA_Util::localisedDate(
- strtotime($showtable['Create_time'])
- );
- $html .= ' ';
- $html .= ' ';
- }
- if (isset($showtable['Update_time'])) {
- $html .= "\n";
- $html .= '';
- $html .= '' . __('Last update') . ' ';
- $html .= '';
- $html .= PMA_Util::localisedDate(
- strtotime($showtable['Update_time'])
- );
- $html .= ' ';
- $html .= ' ';
- }
- if (isset($showtable['Check_time'])) {
- $html .= "\n";
- $html .= '';
- $html .= '' . __('Last check') . ' ';
- $html .= '';
- $html .= PMA_Util::localisedDate(
- strtotime($showtable['Check_time'])
- );
- $html .= ' ';
- $html .= ' ';
- }
-
- return $html;
+ return PMA\Template::get('printview/row_statistics')
+ ->render(array(
+ 'showtable' => $showtable,
+ 'cell_align_left' => $cell_align_left,
+ 'avg_size' => $avg_size,
+ 'avg_unit' => $avg_unit,
+ 'mergetable' => $mergetable
+ ));
}
/**
@@ -296,56 +113,20 @@ function PMA_getHtmlForSpaceUsage(
$free_size, $free_unit, $effect_size, $effect_unit,
$tot_size, $tot_unit, $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 .= '
';
-
- return $html;
+ return PMA\Template::get('printview/space_usage')
+ ->render(array(
+ 'data_size' => $data_size,
+ 'data_unit' => $data_unit,
+ 'index_size' => $index_size,
+ 'index_unit' => $index_unit,
+ 'free_size' => $free_size,
+ 'free_unit' => $free_unit,
+ 'effect_size' => $effect_size,
+ 'effect_unit' => $effect_unit,
+ 'tot_size' => $tot_size,
+ 'tot_unit' => $tot_unit,
+ 'mergetable' => $mergetable
+ ));
}
/**
* return html for Space Usage And Row Statistic
@@ -360,7 +141,6 @@ function PMA_getHtmlForSpaceUsage(
function PMA_getHtmlForSpaceUsageAndRowStatistics(
$showtable, $db, $table, $cell_align_left
) {
- $html = '';
$nonisam = false;
if (isset($showtable['Type'])
&& ! preg_match('@ISAM|HEAP@i', $showtable['Type'])
@@ -376,73 +156,57 @@ function PMA_getHtmlForSpaceUsageAndRowStatistics(
$showtable['Data_length']
);
if ($mergetable == false) {
- list($index_size, $index_unit)
- = PMA_Util::formatByteDown(
- $showtable['Index_length']
- );
+ list($index_size, $index_unit) = PMA_Util::formatByteDown(
+ $showtable['Index_length']
+ );
}
if (isset($showtable['Data_free']) && $showtable['Data_free'] > 0) {
- list($free_size, $free_unit)
- = PMA_Util::formatByteDown(
- $showtable['Data_free']
- );
- list($effect_size, $effect_unit)
- = PMA_Util::formatByteDown(
- $showtable['Data_length'] + $showtable['Index_length']
- - $showtable['Data_free']
- );
+ list($free_size, $free_unit) = PMA_Util::formatByteDown(
+ $showtable['Data_free']
+ );
+ list($effect_size, $effect_unit) = PMA_Util::formatByteDown(
+ $showtable['Data_length'] + $showtable['Index_length']
+ - $showtable['Data_free']
+ );
} else {
unset($free_size);
unset($free_unit);
- list($effect_size, $effect_unit)
- = PMA_Util::formatByteDown(
- $showtable['Data_length'] + $showtable['Index_length']
- );
+ list($effect_size, $effect_unit) = PMA_Util::formatByteDown(
+ $showtable['Data_length'] + $showtable['Index_length']
+ );
}
list($tot_size, $tot_unit) = PMA_Util::formatByteDown(
$showtable['Data_length'] + $showtable['Index_length']
);
- $num_rows = (isset($showtable['Rows']) ? $showtable['Rows'] : 0);
+ $num_rows = (isset($showtable['Rows']) ? $showtable['Rows'] : 0);
if ($num_rows > 0) {
- list($avg_size, $avg_unit)
- = PMA_Util::formatByteDown(
- ($showtable['Data_length'] + $showtable['Index_length'])
- / $showtable['Rows'],
- 6,
- 1
- );
+ list($avg_size, $avg_unit) = PMA_Util::formatByteDown(
+ ($showtable['Data_length'] + $showtable['Index_length'])
+ / $showtable['Rows'],
+ 6, 1
+ );
}
- // Displays them
- $html .= ' ';
- $html .= PMA_getHtmlForRowStatistics(
- $showtable, $cell_align_left,
- isset($avg_size)? $avg_size: 0,
- isset($avg_unit)? $avg_unit: 0,
- $mergetable
- );
- $html .= "\n";
- $html .= '
';
- $html .= '';
- $html .= '';
- $html .= '
';
- } // end if ($nonisam == false)
-
- return $html;
+ return PMA\Template::get(
+ 'printview/space_usage_and_row_statistics'
+ )->render(array(
+ 'data_size' => $data_size,
+ 'data_unit' => $data_unit,
+ 'index_size' => $index_size,
+ 'index_unit' => $index_unit,
+ 'free_size' => $free_size,
+ 'free_unit' => $free_unit,
+ 'effect_size' => $effect_size,
+ 'effect_unit' => $effect_unit,
+ 'tot_size' => $tot_size,
+ 'tot_unit' => $tot_unit,
+ 'mergetable' => $mergetable,
+ 'showtable' => $showtable,
+ 'cell_align_left' => $cell_align_left,
+ 'avg_size' => $avg_size,
+ 'avg_unit' => $avg_unit
+ ));
+ }
}
/**
@@ -467,50 +231,20 @@ function PMA_getHtmlForTableStructure(
$res_rel, $db, $table, $cfgRelation,
$cfg, $showtable, $cell_align_left
) {
- /**
- * Displays the table structure
- */
- $html = '';
- $html .= '';
- $html .= '';
- $html .= '' . __('Column') . ' ';
- $html .= '' . __('Type') . ' ';
- $html .= '' . __('Null') . ' ';
- $html .= '' . __('Default') . ' ';
- if ($have_rel) {
- $html .= '' . __('Links to') . ' ' . "\n";
- }
- $html .= ' ' . __('Comments') . ' ' . "\n";
- if ($cfgRelation['mimework']) {
- $html .= ' MIME ' . "\n";
- }
- $html .= ' ';
- $html .= ' ';
- $html .= '';
- $html .= PMA_getHtmlForPrintViewColumns(
- $tbl_is_view, $columns, $analyzed_sql, $have_rel,
- $res_rel, $db, $table, $cfgRelation
- );
- $html .= ' ';
- $html .= '
';
- if (! $tbl_is_view && !$GLOBALS['dbi']->isSystemSchema($db)) {
- /**
- * Displays indexes
- */
- $html .= PMA_Index::getHtmlForIndexes($table, $db, true);
-
- /**
- * Displays Space usage and row statistics
- *
- */
- if ($cfg['ShowStats']) {
- $html .= PMA_getHtmlForSpaceUsageAndRowStatistics(
- $showtable, $db, $table, $cell_align_left
- );
- } // end if ($cfg['ShowStats'])
- }
-
- return $html;
+ return PMA\Template::get('printview/tables_structure')
+ ->render(array(
+ 'have_rel' => $have_rel,
+ 'tbl_is_view' => $tbl_is_view,
+ 'columns' => $columns,
+ 'analyzed_sql' => $analyzed_sql,
+ 'res_rel' => $res_rel,
+ 'db' => $db,
+ 'table' => $table,
+ 'cfgRelation' => $cfgRelation,
+ 'cfg' => $cfg,
+ 'showtable' => $showtable,
+ 'cell_align_left' => $cell_align_left
+ ));
}
/**
@@ -527,20 +261,13 @@ function PMA_getHtmlForTableStructure(
function PMA_getHtmlForTablesDetail(
$the_tables, $db, $cfg, $cfgRelation, $cell_align_left
) {
- $html = '';
$tables_cnt = count($the_tables);
$multi_tables = (count($the_tables) > 1);
$counter = 0;
+ $html = '';
+ $template = PMA\Template::get('printview/tables_detail');
foreach ($the_tables as $table) {
- if ($counter + 1 >= $tables_cnt) {
- $breakstyle = '';
- } else {
- $breakstyle = ' style="page-break-after: always;"';
- }
- $counter++;
- $html .= '' . "\n";
- $html .= '' . htmlspecialchars($table) . ' ' . "\n";
/**
* Gets table informations
@@ -574,29 +301,28 @@ function PMA_getHtmlForTablesDetail(
$res_rel = PMA_getForeigners($db, $table);
$have_rel = (bool) count($res_rel);
- /**
- * Displays the comments of the table if MySQL >= 3.23
- */
- if (!empty($show_comment)) {
- $html .= __('Table comments:') . ' '
- . htmlspecialchars($show_comment) . '' . "\n";
-
- foreach ($choices as $one_value => $one_label) {
- $html_output .= '' . "\n";
- }
- $html_output .= ' ' . "\n";
-
- return $html_output;
+ return PMA\Template::get('tbl_relation/dropdown_generate')->render(array(
+ 'dropdown_question' => $dropdown_question,
+ 'select_name' => $select_name,
+ 'choices' => $choices,
+ 'selected_value' => $selected_value
+ ));
}
/**
@@ -143,25 +137,12 @@ function PMA_getSQLToCreateForeignKey($table, $field, $foreignDb, $foreignTable,
function PMA_generateRelationalDropdown(
$name, $values = array(), $foreign = false, $title = ''
) {
- $html_output = '';
- $html_output .= '';
- }
-
- if (is_string($foreign) && ! $seen_key) {
- $html_output .= ' ' . htmlspecialchars($foreign) . ' ';
- }
- $html_output .= ' ';
- return $html_output;
+ return PMA\Template::get('tbl_relation/relational_dropdown')->render(array(
+ 'name' => $name,
+ 'title' => $title,
+ 'values' => $values,
+ 'foreign' => $foreign
+ ));
}
/**
@@ -181,80 +162,16 @@ function PMA_generateRelationalDropdown(
function PMA_getHtmlForCommonForm($db, $table, $columns, $cfgRelation,
$tbl_storage_engine, $existrel, $existrel_foreign, $options_array
) {
- $html_output = PMA_getHtmlForCommonFormHeader($db, $table);
-
- if ($cfgRelation['relwork']) {
- $html_output .= PMA_getHtmlForInternalRelationForm(
- $columns, $tbl_storage_engine, $existrel, $db
- );
- }
-
- if (PMA_Util::isForeignKeySupported($tbl_storage_engine)) {
- $html_output .= PMA_getHtmlForForeignKeyForm(
- $columns, $existrel_foreign,
- $db, $tbl_storage_engine, $options_array
- );
- } // end if (InnoDB)
-
- if ($cfgRelation['displaywork']) {
- $html_output .= PMA_getHtmlForDisplayFieldInfos(
- $db, $table,
- array_values($columns)
- );
- }
-
- $html_output .= PMA_getHtmlForCommonFormFooter();
-
- return $html_output;
-}
-
-/**
- * Function to get html for Internal relations form
- *
- * @param array $columns columns
- * @param string $tbl_storage_engine table storage engine
- * @param array $existrel db, table, column
- * @param string $db current database
- *
- * @return string
- */
-function PMA_getHtmlForInternalRelationForm($columns, $tbl_storage_engine,
- $existrel, $db
-) {
- $save_row = array_values($columns);
- $saved_row_cnt = count($save_row);
-
- $html_output = ''
- . '' . __('Internal relations') . ' '
- . '';
-
- $html_output .= '' . __('Column') . ' ';
-
- $html_output .= '' . __('Internal relation');
- if (PMA_Util::isForeignKeySupported($tbl_storage_engine)) {
- $html_output .= PMA_Util::showHint(
- __(
- 'An internal relation is not necessary when a corresponding'
- . ' FOREIGN KEY relation exists.'
- )
- );
- }
-
- $html_output .= ' ';
-
- $odd_row = true;
- for ($i = 0; $i < $saved_row_cnt; $i++) {
- $html_output .= PMA_getHtmlForInternalRelationRow(
- $save_row, $i, $odd_row,
- $existrel, $db
- );
- $odd_row = ! $odd_row;
- }
-
- $html_output .= '
';
- $html_output .= ' ';
-
- return $html_output;
+ return PMA\Template::get('tbl_relation/common_form')->render(array(
+ 'db' => $db,
+ 'table' => $table,
+ 'columns' => $columns,
+ 'cfgRelation' => $cfgRelation,
+ 'tbl_storage_engine' => $tbl_storage_engine,
+ 'existrel' => $existrel,
+ 'existrel_foreign' => $existrel_foreign,
+ 'options_array' => $options_array
+ ));
}
/**
@@ -277,15 +194,6 @@ function PMA_getHtmlForInternalRelationRow($save_row, $i, $odd_row,
$myfield_md5 = md5($myfield);
$myfield_html = htmlspecialchars($myfield);
- $html_output = ''
- . ''
- . '' . $myfield_html . ' '
- . ' ';
-
- $html_output .= '';
-
$foreign_table = false;
$foreign_column = false;
@@ -295,13 +203,6 @@ function PMA_getHtmlForInternalRelationRow($save_row, $i, $odd_row,
} else {
$foreign_db = $db;
}
- $html_output .= PMA_generateRelationalDropdown(
- 'destination_db[' . $myfield_md5 . ']',
- $GLOBALS['pma']->databases,
- $foreign_db,
- __('Database')
- );
- // end of database dropdown
// table dropdown
$tables = array();
@@ -318,13 +219,6 @@ function PMA_getHtmlForInternalRelationRow($save_row, $i, $odd_row,
$tables[] = $row[0];
}
}
- $html_output .= PMA_generateRelationalDropdown(
- 'destination_table[' . $myfield_md5 . ']',
- $tables,
- $foreign_table,
- __('Table')
- );
- // end of table dropdown
// column dropdown
$columns = array();
@@ -335,77 +229,17 @@ function PMA_getHtmlForInternalRelationRow($save_row, $i, $odd_row,
$table_obj = new PMA_Table($foreign_table, $foreign_db);
$columns = $table_obj->getUniqueColumns(false, false);
}
- $html_output .= PMA_generateRelationalDropdown(
- 'destination_column[' . $myfield_md5 . ']',
- $columns,
- $foreign_column,
- __('Column')
- );
- // end of column dropdown
- $html_output .= ' ';
- $html_output .= ' ';
-
- return $html_output;
-}
-
-/**
- * Function to get html for Foreign key form
- *
- * @param array $columns columns
- * @param array $existrel_foreign db, table, column
- * @param string $db current database
- * @param string $tbl_storage_engine table storage engine
- * @param array $options_array options array
- *
- * @return string
- */
-function PMA_getHtmlForForeignKeyForm($columns, $existrel_foreign, $db,
- $tbl_storage_engine, $options_array
-) {
- $html_output = ''
- . '' . __('Foreign key constraints') . ' '
- . '';
-
- $html_output .= '' . __('Actions') . ' ';
- $html_output .= '' . __('Constraint properties') . ' '
- . ''
- . __('Column')
- . PMA_Util::showHint(
- __(
- 'Only columns with index will be displayed. You can define an'
- . ' index below.'
- )
- )
- . ' ';
- $html_output .= '' . __('Foreign key constraint')
- . ' (' . $tbl_storage_engine . ')';
- $html_output .= ' '
- . ''
- . __('+ Add constraint')
- . ' ';
- $html_output .= '
'
- . ' ';
-
- return $html_output;
+ return PMA\Template::get('tbl_relation/internal_relational_row')->render(array(
+ 'myfield_md5' => $myfield_md5,
+ 'myfield_html' => $myfield_html,
+ 'odd_row' => $odd_row,
+ 'foreign_db' => $foreign_db,
+ 'foreign_table' => $foreign_table,
+ 'tables' => $tables,
+ 'foreign_column' => $foreign_column,
+ 'columns' => $columns
+ ));
}
/**
@@ -424,9 +258,8 @@ function PMA_getHtmlForForeignKeyForm($columns, $existrel_foreign, $db,
function PMA_getHtmlForForeignKeyRow($one_key, $odd_row, $columns, $i,
$options_array, $tbl_storage_engine, $db
) {
- $html_output = '';
- // Drop key anchor.
- $html_output .= '';
+ $js_msg = '';
+ $this_params = null;
if (isset($one_key['constraint'])) {
$drop_fk_query = 'ALTER TABLE ' . PMA_Util::backquote($GLOBALS['table'])
. ' DROP FOREIGN KEY '
@@ -444,51 +277,15 @@ function PMA_getHtmlForForeignKeyRow($one_key, $odd_row, $columns, $i,
. ' DROP FOREIGN KEY '
. $one_key['constraint'] . ';'
);
-
- $html_output .= ''
- . PMA_Util::getIcon('b_drop.png', __('Drop')) . ' ';
}
- $html_output .= ' ';
- $html_output .= '';
- $html_output .= '';
- $constraint_name = isset($one_key['constraint'])
- ? $one_key['constraint'] : '';
- $html_output .= ' ' . "\n";
- $html_output .= '';
- $html_output .= '';
// For ON DELETE and ON UPDATE, the default action
// is RESTRICT as per MySQL doc; however, a SHOW CREATE TABLE
// won't display the clause if it's set as RESTRICT.
$on_delete = isset($one_key['on_delete'])
? $one_key['on_delete'] : 'RESTRICT';
- $html_output .= PMA_generateDropdown(
- 'ON DELETE',
- 'on_delete[' . $i . ']',
- $options_array,
- $on_delete
- );
- $html_output .= ' ' . "\n";
-
- $html_output .= '' . "\n";
$on_update = isset($one_key['on_update'])
? $one_key['on_update'] : 'RESTRICT';
- $html_output .= PMA_generateDropdown(
- 'ON UPDATE',
- 'on_update[' . $i . ']',
- $options_array,
- $on_update
- );
- $html_output .= ' ';
- $html_output .= '
';
$column_array = array();
$column_array[''] = '';
@@ -498,52 +295,10 @@ function PMA_getHtmlForForeignKeyRow($one_key, $odd_row, $columns, $i,
}
}
- $html_output .= '' . "\n";
- $html_output .= ' ';
- $html_output .= '';
- if (isset($one_key['index_list'])) {
- foreach ($one_key['index_list'] as $key => $column) {
- $html_output .= '';
- $html_output .= PMA_generateDropdown(
- '',
- 'foreign_key_fields_name[' . $i . '][]',
- $column_array,
- $column
- );
- $html_output .= ' ';
- }
- } else {
- $html_output .= '';
- $html_output .= PMA_generateDropdown(
- '',
- 'foreign_key_fields_name[' . $i . '][]',
- $column_array,
- ''
- );
- $html_output .= ' ';
- }
-
- $html_output .= ''
- . __('+ Add column')
- . ' ';
- $html_output .= ' ';
- $html_output .= '';
$foreign_table = false;
-
// foreign database dropdown
$foreign_db = (isset($one_key['ref_db_name'])) ? $one_key['ref_db_name'] : $db;
- $html_output .= '';
- $html_output .= PMA_generateRelationalDropdown(
- 'destination_foreign_db[' . $i . ']',
- $GLOBALS['pma']->databases,
- $foreign_db,
- __('Database')
- );
- // end of foreign database dropdown
- $html_output .= ' ';
- $html_output .= '';
- // foreign table dropdown
+
$tables = array();
if ($foreign_db) {
$foreign_table = isset($one_key['ref_table_name'])
@@ -585,108 +340,21 @@ function PMA_getHtmlForForeignKeyRow($one_key, $odd_row, $columns, $i,
}
}
}
- $html_output .= '';
- $html_output .= PMA_generateRelationalDropdown(
- 'destination_foreign_table[' . $i . ']',
- $tables,
- $foreign_table,
- __('Table')
- );
- $html_output .= ' ';
- // end of foreign table dropdown
- $html_output .= ' ';
- $html_output .= '';
- // foreign column dropdown
- if ($foreign_db && $foreign_table) {
- foreach ($one_key['ref_index_list'] as $foreign_column) {
- $table_obj = new PMA_Table($foreign_table, $foreign_db);
- $columns = $table_obj->getUniqueColumns(false, false);
- $html_output .= '';
- $html_output .= PMA_generateRelationalDropdown(
- 'destination_foreign_column[' . $i . '][]',
- $columns,
- $foreign_column,
- __('Column')
- );
- $html_output .= ' ';
- }
- } else {
- $html_output .= '';
- $html_output .= PMA_generateRelationalDropdown(
- 'destination_foreign_column[' . $i . '][]',
- array(),
- '',
- __('Column')
- );
- $html_output .= ' ';
- }
- // end of foreign column dropdown
- $html_output .= ' ';
- $html_output .= ' ';
- return $html_output;
-}
-
-/**
- * Function to get html for the common form header
- *
- * @param string $db current database
- * @param string $table current table
- *
- * @return string
- */
-function PMA_getHtmlForCommonFormHeader($db, $table)
-{
- return '';
-}
-
-/**
- * Function to get html for display field infos
- *
- * @param string $db current database
- * @param string $table current table
- * @param array $save_row save row
- *
- * @return string
- */
-function PMA_getHtmlForDisplayFieldInfos($db, $table, $save_row)
-{
- $disp = PMA_getDisplayField($db, $table);
- $html_output = ''
- . '' . __('Choose column to display:') . ' '
- . ''
- . '--- ';
-
- foreach ($save_row as $row) {
- $html_output .= '' . "\n";
- } // end while
-
- $html_output .= ' '
- . ' ';
-
- return $html_output;
+ return PMA\Template::get('tbl_relation/foreign_key_row')->render(array(
+ 'odd_row' => $odd_row,
+ 'js_msg' => $js_msg,
+ 'one_key' => $one_key,
+ 'this_params' => $this_params,
+ 'on_delete' => $on_delete,
+ 'on_update' => $on_update,
+ 'column_array' => $column_array,
+ 'foreign_db' => $foreign_db,
+ 'foreign_table' => $foreign_table,
+ 'tables' => $tables,
+ 'i' => $i,
+ 'options_array' => $options_array
+ ));
}
/**
diff --git a/templates/columns_definitions/column_adjust_privileges.phtml b/templates/columns_definitions/column_adjust_privileges.phtml
new file mode 100644
index 0000000000..80e62efa05
--- /dev/null
+++ b/templates/columns_definitions/column_adjust_privileges.phtml
@@ -0,0 +1,6 @@
+
+
+
+ selected="selected"
+ >
+
+
+
+
\ No newline at end of file
diff --git a/templates/columns_definitions/column_auto_increment.phtml b/templates/columns_definitions/column_auto_increment.phtml
new file mode 100644
index 0000000000..f4d0b80aa2
--- /dev/null
+++ b/templates/columns_definitions/column_auto_increment.phtml
@@ -0,0 +1,8 @@
+
+ $value): ?>
+
+ selected="selected"
+ >
+
+
+
+
+
+ ---
+ "
+ >
+ PRIMARY
+
+ "
+ >
+ UNIQUE
+
+ "
+ >
+ INDEX
+
+
+ "
+ >
+ FULLTEXT
+
+
+
\ No newline at end of file
diff --git a/templates/columns_definitions/column_length.phtml b/templates/columns_definitions/column_length.phtml
new file mode 100644
index 0000000000..aa237293a1
--- /dev/null
+++ b/templates/columns_definitions/column_length.phtml
@@ -0,0 +1,11 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/templates/columns_definitions/column_null.phtml b/templates/columns_definitions/column_null.phtml
new file mode 100644
index 0000000000..5902f13ff0
--- /dev/null
+++ b/templates/columns_definitions/column_null.phtml
@@ -0,0 +1,8 @@
+>
+
+
\ No newline at end of file
diff --git a/templates/columns_definitions/mime_type.phtml b/templates/columns_definitions/mime_type.phtml
new file mode 100644
index 0000000000..211a3b3307
--- /dev/null
+++ b/templates/columns_definitions/mime_type.phtml
@@ -0,0 +1,17 @@
+
+
+
+
+
+ >
+
+
+
+
+
\ No newline at end of file
diff --git a/templates/columns_definitions/move_column.phtml b/templates/columns_definitions/move_column.phtml
new file mode 100644
index 0000000000..70d49d9291
--- /dev/null
+++ b/templates/columns_definitions/move_column.phtml
@@ -0,0 +1,15 @@
+
+
+ >
+
+
+
+ >
+ name))); ?>
+
+
+
\ No newline at end of file
diff --git a/templates/columns_definitions/table_fields_definitions.phtml b/templates/columns_definitions/table_fields_definitions.phtml
new file mode 100644
index 0000000000..067189c938
--- /dev/null
+++ b/templates/columns_definitions/table_fields_definitions.phtml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ title="">
+
+
+
+
+
\ No newline at end of file
diff --git a/templates/columns_definitions/transformation_option.phtml b/templates/columns_definitions/transformation_option.phtml
new file mode 100644
index 0000000000..f354dbf6f7
--- /dev/null
+++ b/templates/columns_definitions/transformation_option.phtml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
+
+
+
+
+
+ hasColumn($field_name)): ?>
+ ()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ' . $foreigner['foreign_field']
+ );
+ } ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/templates/printview/footer.phtml b/templates/printview/footer.phtml
new file mode 100644
index 0000000000..d70d8e6f3f
--- /dev/null
+++ b/templates/printview/footer.phtml
@@ -0,0 +1,2 @@
+
+
diff --git a/templates/printview/row_statistics.phtml b/templates/printview/row_statistics.phtml
new file mode 100644
index 0000000000..7eaa706c2e
--- /dev/null
+++ b/templates/printview/row_statistics.phtml
@@ -0,0 +1,92 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ ): ?>
+
+ ø
+
+
+
+
+ 0
+ && $mergetable == false
+ ): ?>
+
+ ø
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/templates/printview/space_usage.phtml b/templates/printview/space_usage.phtml
new file mode 100644
index 0000000000..72aba1f305
--- /dev/null
+++ b/templates/printview/space_usage.phtml
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/templates/printview/space_usage_and_row_statistics.phtml b/templates/printview/space_usage_and_row_statistics.phtml
new file mode 100644
index 0000000000..22483748fd
--- /dev/null
+++ b/templates/printview/space_usage_and_row_statistics.phtml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
diff --git a/templates/printview/tables_detail.phtml b/templates/printview/tables_detail.phtml
new file mode 100644
index 0000000000..521126595c
--- /dev/null
+++ b/templates/printview/tables_detail.phtml
@@ -0,0 +1,20 @@
+>
+
+
+
+
diff --git a/templates/printview/tables_structure.phtml b/templates/printview/tables_structure.phtml
new file mode 100644
index 0000000000..f286190952
--- /dev/null
+++ b/templates/printview/tables_structure.phtml
@@ -0,0 +1,33 @@
+
+
+
+ MIME
+
+
+
+
+
+
+
+isSystemSchema($db)): ?>
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/templates/table/column_comparison_operators.phtml b/templates/table/column_comparison_operators.phtml
new file mode 100644
index 0000000000..fceff0cd55
--- /dev/null
+++ b/templates/table/column_comparison_operators.phtml
@@ -0,0 +1,7 @@
+
+ getTypeOperatorsHtml(
+ preg_replace('@\(.*@s', '', $columnTypes[$column_index]),
+ $columnNullFlags[$column_index], $selected_operator
+ ); ?>
+
\ No newline at end of file
diff --git a/templates/table/fields_table.phtml b/templates/table/fields_table.phtml
new file mode 100644
index 0000000000..e9c8bbec84
--- /dev/null
+++ b/templates/table/fields_table.phtml
@@ -0,0 +1,24 @@
+>
+ render(array(
+ 'geomColumnFlag' => $geomColumnFlag
+ )); ?>
+
+
+ render(array(
+ 'self' => $self,
+ 'columnNames' => $columnNames
+ )); ?>
+
+ render(array(
+ 'self' => $self,
+ 'geomColumnFlag' => $geomColumnFlag,
+ 'columnNames' => $columnNames,
+ 'columnTypes' => $columnTypes,
+ 'columnCollations' => $columnCollations
+ )); ?>
+
+
+
diff --git a/templates/table/form_tag.phtml b/templates/table/form_tag.phtml
new file mode 100644
index 0000000000..aec6af50f2
--- /dev/null
+++ b/templates/table/form_tag.phtml
@@ -0,0 +1,22 @@
+
+
+
\ No newline at end of file
diff --git a/templates/table/table_header.phtml b/templates/table/table_header.phtml
new file mode 100644
index 0000000000..58cdf1775a
--- /dev/null
+++ b/templates/table/table_header.phtml
@@ -0,0 +1,12 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/templates/table/zoom_result_form.phtml b/templates/table/zoom_result_form.phtml
new file mode 100644
index 0000000000..0617334adf
--- /dev/null
+++ b/templates/table/zoom_result_form.phtml
@@ -0,0 +1,100 @@
+
\ No newline at end of file
diff --git a/templates/tbl_chart.phtml b/templates/tbl_chart.phtml
index 149a3a57af..c91429e27e 100644
--- a/templates/tbl_chart.phtml
+++ b/templates/tbl_chart.phtml
@@ -1,9 +1,4 @@
-
+