From e807787610c0662e044cf88bf302c4a94059b572 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Mon, 10 Aug 2015 10:39:14 +0530 Subject: [PATCH 01/11] Organize table search related templates Signed-off-by: Madhura Jayaratne --- .../controllers/TableSearchController.class.php | 14 +++++++------- .../{ => search}/column_comparison_operators.phtml | 0 templates/table/{ => search}/fields_table.phtml | 6 +++--- templates/table/{ => search}/form_tag.phtml | 0 templates/table/{ => search}/input_box.phtml | 0 templates/table/{ => search}/options.phtml | 0 templates/table/{ => search}/options_zoom.phtml | 0 templates/table/{ => search}/replace_preview.phtml | 0 templates/table/{ => search}/rows_normal.phtml | 0 templates/table/{ => search}/rows_zoom.phtml | 0 .../table/{ => search}/search_and_replace.phtml | 0 templates/table/{ => search}/selection_form.phtml | 12 ++++++------ templates/table/{ => search}/table_header.phtml | 0 .../table/{ => search}/zoom_result_form.phtml | 2 +- 14 files changed, 17 insertions(+), 17 deletions(-) rename templates/table/{ => search}/column_comparison_operators.phtml (100%) rename templates/table/{ => search}/fields_table.phtml (78%) rename templates/table/{ => search}/form_tag.phtml (100%) rename templates/table/{ => search}/input_box.phtml (100%) rename templates/table/{ => search}/options.phtml (100%) rename templates/table/{ => search}/options_zoom.phtml (100%) rename templates/table/{ => search}/replace_preview.phtml (100%) rename templates/table/{ => search}/rows_normal.phtml (100%) rename templates/table/{ => search}/rows_zoom.phtml (100%) rename templates/table/{ => search}/search_and_replace.phtml (100%) rename templates/table/{ => search}/selection_form.phtml (85%) rename templates/table/{ => search}/table_header.phtml (100%) rename templates/table/{ => search}/zoom_result_form.phtml (97%) diff --git a/libraries/controllers/TableSearchController.class.php b/libraries/controllers/TableSearchController.class.php index 4a3fcb011a..0ab959ddab 100644 --- a/libraries/controllers/TableSearchController.class.php +++ b/libraries/controllers/TableSearchController.class.php @@ -214,7 +214,7 @@ class TableSearchController extends TableController $err_url = $goto . '?' . PMA_URL_getCommon($params); // Displays the find and replace form $this->response->addHTML( - Template::get('table/selection_form') + Template::get('table/search/selection_form') ->render( array( 'searchType' => $this->_searchType, @@ -348,7 +348,7 @@ class TableSearchController extends TableController ) ); $this->response->addHTML( - Template::get('table/selection_form') + Template::get('table/search/selection_form') ->render( array( 'searchType' => $this->_searchType, @@ -440,7 +440,7 @@ class TableSearchController extends TableController ) ); $this->response->addHTML( - Template::get('table/zoom_result_form') + Template::get('table/search/zoom_result_form') ->render( array( '_db' => $this->db, @@ -590,7 +590,7 @@ class TableSearchController extends TableController ) ); $this->response->addHTML( - Template::get('table/selection_form') + Template::get('table/search/selection_form') ->render( array( 'searchType' => $this->_searchType, @@ -698,7 +698,7 @@ class TableSearchController extends TableController $result = $this->dbi->fetchResult($sql_query, 0); } - return Template::get('table/replace_preview')->render( + return Template::get('table/search/replace_preview')->render( array( 'db' => $this->db, 'table' => $this->table, @@ -920,7 +920,7 @@ class TableSearchController extends TableController $type = $this->_columnTypes[$column_index]; $collation = $this->_columnCollations[$column_index]; //Gets column's comparison operators depending on column type - $func = Template::get('table/column_comparison_operators')->render( + $func = Template::get('table/search/column_comparison_operators')->render( array( 'search_index' => $search_index, 'columnTypes' => $this->_columnTypes, @@ -933,7 +933,7 @@ class TableSearchController extends TableController $foreignData = PMA_getForeignData( $this->_foreigners, $this->_columnNames[$column_index], false, '', '' ); - $value = Template::get('table/input_box')->render( + $value = Template::get('table/search/input_box')->render( array( 'str' => '', 'column_type' => (string) $type, diff --git a/templates/table/column_comparison_operators.phtml b/templates/table/search/column_comparison_operators.phtml similarity index 100% rename from templates/table/column_comparison_operators.phtml rename to templates/table/search/column_comparison_operators.phtml diff --git a/templates/table/fields_table.phtml b/templates/table/search/fields_table.phtml similarity index 78% rename from templates/table/fields_table.phtml rename to templates/table/search/fields_table.phtml index e9c8bbec84..4d939419ca 100644 --- a/templates/table/fields_table.phtml +++ b/templates/table/search/fields_table.phtml @@ -1,17 +1,17 @@ > - render(array( 'geomColumnFlag' => $geomColumnFlag )); ?> - render(array( 'self' => $self, 'columnNames' => $columnNames )); ?> - render(array( 'self' => $self, 'geomColumnFlag' => $geomColumnFlag, diff --git a/templates/table/form_tag.phtml b/templates/table/search/form_tag.phtml similarity index 100% rename from templates/table/form_tag.phtml rename to templates/table/search/form_tag.phtml diff --git a/templates/table/input_box.phtml b/templates/table/search/input_box.phtml similarity index 100% rename from templates/table/input_box.phtml rename to templates/table/search/input_box.phtml diff --git a/templates/table/options.phtml b/templates/table/search/options.phtml similarity index 100% rename from templates/table/options.phtml rename to templates/table/search/options.phtml diff --git a/templates/table/options_zoom.phtml b/templates/table/search/options_zoom.phtml similarity index 100% rename from templates/table/options_zoom.phtml rename to templates/table/search/options_zoom.phtml diff --git a/templates/table/replace_preview.phtml b/templates/table/search/replace_preview.phtml similarity index 100% rename from templates/table/replace_preview.phtml rename to templates/table/search/replace_preview.phtml diff --git a/templates/table/rows_normal.phtml b/templates/table/search/rows_normal.phtml similarity index 100% rename from templates/table/rows_normal.phtml rename to templates/table/search/rows_normal.phtml diff --git a/templates/table/rows_zoom.phtml b/templates/table/search/rows_zoom.phtml similarity index 100% rename from templates/table/rows_zoom.phtml rename to templates/table/search/rows_zoom.phtml diff --git a/templates/table/search_and_replace.phtml b/templates/table/search/search_and_replace.phtml similarity index 100% rename from templates/table/search_and_replace.phtml rename to templates/table/search/search_and_replace.phtml diff --git a/templates/table/selection_form.phtml b/templates/table/search/selection_form.phtml similarity index 85% rename from templates/table/selection_form.phtml rename to templates/table/search/selection_form.phtml index 9fbd295e53..676d26ad44 100644 --- a/templates/table/selection_form.phtml +++ b/templates/table/search/selection_form.phtml @@ -1,4 +1,4 @@ -render(array( 'searchType' => $searchType, 'db' => $db, @@ -11,7 +11,7 @@ - render(array( 'self' => $self, 'searchType' => $searchType, @@ -20,7 +20,7 @@ 'columnTypes' => $columnTypes, 'columnCollations' => $columnCollations )); - echo PMA\Template::get('table/options_zoom') + echo PMA\Template::get('table/search/options_zoom') ->render(array( 'dataLabel' => $dataLabel, 'columnNames' => $columnNames @@ -33,7 +33,7 @@ - render(array( 'self' => $self, 'searchType' => $searchType, @@ -47,7 +47,7 @@ - render(array( 'columnNames' => $columnNames )); ?> @@ -58,7 +58,7 @@ - render(array( 'columnNames' => $columnNames, 'columnTypes' => $columnTypes diff --git a/templates/table/table_header.phtml b/templates/table/search/table_header.phtml similarity index 100% rename from templates/table/table_header.phtml rename to templates/table/search/table_header.phtml diff --git a/templates/table/zoom_result_form.phtml b/templates/table/search/zoom_result_form.phtml similarity index 97% rename from templates/table/zoom_result_form.phtml rename to templates/table/search/zoom_result_form.phtml index 0617334adf..f4ca07dd83 100644 --- a/templates/table/zoom_result_form.phtml +++ b/templates/table/search/zoom_result_form.phtml @@ -74,7 +74,7 @@ - render( + render( array( 'save_row' => $save_row, 'i' => $i, @@ -51,7 +51,7 @@ $one_key): ?> - render( + render( array( 'one_key' => $one_key, 'odd_row' => $odd_row, @@ -64,7 +64,7 @@ ); $odd_row = ! $odd_row;?> - render( + render( array( 'one_key' => array(), 'odd_row' => $odd_row, diff --git a/templates/tbl_relation/dropdown_generate.phtml b/templates/table/relation/dropdown_generate.phtml similarity index 100% rename from templates/tbl_relation/dropdown_generate.phtml rename to templates/table/relation/dropdown_generate.phtml diff --git a/templates/tbl_relation/foreign_key_row.phtml b/templates/table/relation/foreign_key_row.phtml similarity index 91% rename from templates/tbl_relation/foreign_key_row.phtml rename to templates/table/relation/foreign_key_row.phtml index c51bc48edf..bc464c0f20 100644 --- a/templates/tbl_relation/foreign_key_row.phtml +++ b/templates/table/relation/foreign_key_row.phtml @@ -104,7 +104,7 @@ if ($foreign_db) {
- render( + render( array( 'dropdown_question' => 'ON DELETE', 'select_name' => 'on_delete[' . $i . ']', @@ -114,7 +114,7 @@ if ($foreign_db) { ); ?> - render( + render( array( 'dropdown_question' => 'ON UPDATE', 'select_name' => 'on_update[' . $i . ']', @@ -129,7 +129,7 @@ if ($foreign_db) { $column): ?> - render( + render( array( 'dropdown_question' => '', 'select_name' => 'foreign_key_fields_name[' . $i . '][]', @@ -141,7 +141,7 @@ if ($foreign_db) { - render( + render( array( 'dropdown_question' => '', 'select_name' => 'foreign_key_fields_name[' . $i . '][]', @@ -159,7 +159,7 @@ if ($foreign_db) {
'; $tableHtml .= ''; $tableHtml .= ''; $tableHtml .= ''; $tableHtml .= '' . '' . '' . '' . '' . '' . '' . '' . ' - render($content_row); ?> diff --git a/templates/columns_definitions/transformation.phtml b/templates/table/columns_definitions/transformation.phtml similarity index 100% rename from templates/columns_definitions/transformation.phtml rename to templates/table/columns_definitions/transformation.phtml diff --git a/templates/columns_definitions/transformation_option.phtml b/templates/table/columns_definitions/transformation_option.phtml similarity index 100% rename from templates/columns_definitions/transformation_option.phtml rename to templates/table/columns_definitions/transformation_option.phtml diff --git a/test/libraries/PMA_tbl_columns_definition_form_test.php b/test/libraries/PMA_tbl_columns_definition_form_test.php index afd7db0502..873c82fa48 100644 --- a/test/libraries/PMA_tbl_columns_definition_form_test.php +++ b/test/libraries/PMA_tbl_columns_definition_form_test.php @@ -676,7 +676,7 @@ class PMA_TblColumnsDefinitionFormTest extends PHPUnit_Framework_TestCase { /** * @todo Find out a better method to test for HTML - * Template: columns_definitions/column_length + * Template: table/columns_definitions/column_length * * $this->assertContains( * ' Date: Mon, 10 Aug 2015 10:56:39 +0530 Subject: [PATCH 05/11] Move designer related templates into database folder Signed-off-by: Madhura Jayaratne --- libraries/db_designer.lib.php | 34 +++++++++---------- .../designer/aggregate_query_panel.phtml | 0 .../{ => database}/designer/canvas.phtml | 0 .../designer/database_tables.phtml | 0 .../designer/delete_relation_panel.phtml | 0 .../designer/edit_delete_pages.phtml | 0 .../designer/having_query_panel.phtml | 0 .../{ => database}/designer/js_fields.phtml | 0 .../designer/new_relation_panel.phtml | 0 .../designer/options_panel.phtml | 0 .../designer/page_save_as.phtml | 0 .../designer/page_selector.phtml | 0 .../designer/query_details.phtml | 0 .../designer/rename_to_panel.phtml | 0 .../designer/schema_export.phtml | 0 .../{ => database}/designer/side_menu.phtml | 0 .../{ => database}/designer/table_list.phtml | 0 .../designer/where_query_panel.phtml | 0 18 files changed, 17 insertions(+), 17 deletions(-) rename templates/{ => database}/designer/aggregate_query_panel.phtml (100%) rename templates/{ => database}/designer/canvas.phtml (100%) rename templates/{ => database}/designer/database_tables.phtml (100%) rename templates/{ => database}/designer/delete_relation_panel.phtml (100%) rename templates/{ => database}/designer/edit_delete_pages.phtml (100%) rename templates/{ => database}/designer/having_query_panel.phtml (100%) rename templates/{ => database}/designer/js_fields.phtml (100%) rename templates/{ => database}/designer/new_relation_panel.phtml (100%) rename templates/{ => database}/designer/options_panel.phtml (100%) rename templates/{ => database}/designer/page_save_as.phtml (100%) rename templates/{ => database}/designer/page_selector.phtml (100%) rename templates/{ => database}/designer/query_details.phtml (100%) rename templates/{ => database}/designer/rename_to_panel.phtml (100%) rename templates/{ => database}/designer/schema_export.phtml (100%) rename templates/{ => database}/designer/side_menu.phtml (100%) rename templates/{ => database}/designer/table_list.phtml (100%) rename templates/{ => database}/designer/where_query_panel.phtml (100%) diff --git a/libraries/db_designer.lib.php b/libraries/db_designer.lib.php index a8ed9a6875..bbd0657f5d 100644 --- a/libraries/db_designer.lib.php +++ b/libraries/db_designer.lib.php @@ -22,7 +22,7 @@ require_once 'libraries/Template.class.php'; */ function PMA_getHtmlForPageSelector($cfgRelation, $db) { - return PMA\Template::get('designer/page_selector') + return PMA\Template::get('database/designer/page_selector') ->render( array( 'db' => $db, @@ -41,7 +41,7 @@ function PMA_getHtmlForPageSelector($cfgRelation, $db) */ function PMA_getHtmlForEditOrDeletePages($db, $operation) { - return PMA\Template::get('designer/edit_delete_pages') + return PMA\Template::get('database/designer/edit_delete_pages') ->render( array( 'db' => $db, @@ -59,7 +59,7 @@ function PMA_getHtmlForEditOrDeletePages($db, $operation) */ function PMA_getHtmlForPageSaveAs($db) { - return PMA\Template::get('designer/page_save_as') + return PMA\Template::get('database/designer/page_save_as') ->render( array( 'db' => $db @@ -118,7 +118,7 @@ function PMA_getHtmlForSchemaExport($db, $page) )->getDisplay(); } - return PMA\Template::get('designer/schema_export') + return PMA\Template::get('database/designer/schema_export') ->render( array( 'db' => $db, @@ -141,7 +141,7 @@ function PMA_getHtmlForSchemaExport($db, $page) function PMA_getHtmlForJSFields( $script_tables, $script_contr, $script_display_field, $display_page ) { - return PMA\Template::get('designer/js_fields') + return PMA\Template::get('database/designer/js_fields') ->render( array( 'script_tables' => $script_tables, @@ -163,7 +163,7 @@ function PMA_getHtmlForJSFields( */ function PMA_getDesignerPageMenu($visualBuilder, $selected_page, $params_array) { - return PMA\Template::get('designer/side_menu') + return PMA\Template::get('database/designer/side_menu') ->render( array( 'visualBuilder' => $visualBuilder, @@ -267,7 +267,7 @@ function PMA_returnClassNamesFromMenuButtons() */ function PMA_getHTMLCanvas() { - return PMA\Template::get('designer/canvas')->render(); + return PMA\Template::get('database/designer/canvas')->render(); } /** @@ -280,7 +280,7 @@ function PMA_getHTMLCanvas() */ function PMA_getHTMLTableList($tab_pos, $display_page) { - return PMA\Template::get('designer/table_list') + return PMA\Template::get('database/designer/table_list') ->render( array( 'tab_pos' => $tab_pos, @@ -303,7 +303,7 @@ function PMA_getHTMLTableList($tab_pos, $display_page) function PMA_getDatabaseTables( $tab_pos, $display_page, $tab_column, $tables_all_keys, $tables_pk_or_unique_keys ) { - return PMA\Template::get('designer/database_tables') + return PMA\Template::get('database/designer/database_tables') ->render( array( 'tab_pos' => $tab_pos, @@ -322,7 +322,7 @@ function PMA_getDatabaseTables( */ function PMA_getNewRelationPanel() { - return PMA\Template::get('designer/new_relation_panel')->render(); + return PMA\Template::get('database/designer/new_relation_panel')->render(); } /** @@ -332,7 +332,7 @@ function PMA_getNewRelationPanel() */ function PMA_getDeleteRelationPanel() { - return PMA\Template::get('designer/delete_relation_panel')->render(); + return PMA\Template::get('database/designer/delete_relation_panel')->render(); } /** @@ -342,7 +342,7 @@ function PMA_getDeleteRelationPanel() */ function PMA_getOptionsPanel() { - return PMA\Template::get('designer/options_panel')->render(); + return PMA\Template::get('database/designer/options_panel')->render(); } /** @@ -352,7 +352,7 @@ function PMA_getOptionsPanel() */ function PMA_getRenameToPanel() { - return PMA\Template::get('designer/rename_to_panel')->render(); + return PMA\Template::get('database/designer/rename_to_panel')->render(); } /** @@ -362,7 +362,7 @@ function PMA_getRenameToPanel() */ function PMA_getHavingQueryPanel() { - return PMA\Template::get('designer/having_query_panel')->render(); + return PMA\Template::get('database/designer/having_query_panel')->render(); } /** @@ -372,7 +372,7 @@ function PMA_getHavingQueryPanel() */ function PMA_getAggregateQueryPanel() { - return PMA\Template::get('designer/aggregate_query_panel')->render(); + return PMA\Template::get('database/designer/aggregate_query_panel')->render(); } /** @@ -382,7 +382,7 @@ function PMA_getAggregateQueryPanel() */ function PMA_getWhereQueryPanel() { - return PMA\Template::get('designer/where_query_panel')->render(); + return PMA\Template::get('database/designer/where_query_panel')->render(); } /** @@ -392,5 +392,5 @@ function PMA_getWhereQueryPanel() */ function PMA_getQueryDetails() { - return PMA\Template::get('designer/query_details')->render(); + return PMA\Template::get('database/designer/query_details')->render(); } diff --git a/templates/designer/aggregate_query_panel.phtml b/templates/database/designer/aggregate_query_panel.phtml similarity index 100% rename from templates/designer/aggregate_query_panel.phtml rename to templates/database/designer/aggregate_query_panel.phtml diff --git a/templates/designer/canvas.phtml b/templates/database/designer/canvas.phtml similarity index 100% rename from templates/designer/canvas.phtml rename to templates/database/designer/canvas.phtml diff --git a/templates/designer/database_tables.phtml b/templates/database/designer/database_tables.phtml similarity index 100% rename from templates/designer/database_tables.phtml rename to templates/database/designer/database_tables.phtml diff --git a/templates/designer/delete_relation_panel.phtml b/templates/database/designer/delete_relation_panel.phtml similarity index 100% rename from templates/designer/delete_relation_panel.phtml rename to templates/database/designer/delete_relation_panel.phtml diff --git a/templates/designer/edit_delete_pages.phtml b/templates/database/designer/edit_delete_pages.phtml similarity index 100% rename from templates/designer/edit_delete_pages.phtml rename to templates/database/designer/edit_delete_pages.phtml diff --git a/templates/designer/having_query_panel.phtml b/templates/database/designer/having_query_panel.phtml similarity index 100% rename from templates/designer/having_query_panel.phtml rename to templates/database/designer/having_query_panel.phtml diff --git a/templates/designer/js_fields.phtml b/templates/database/designer/js_fields.phtml similarity index 100% rename from templates/designer/js_fields.phtml rename to templates/database/designer/js_fields.phtml diff --git a/templates/designer/new_relation_panel.phtml b/templates/database/designer/new_relation_panel.phtml similarity index 100% rename from templates/designer/new_relation_panel.phtml rename to templates/database/designer/new_relation_panel.phtml diff --git a/templates/designer/options_panel.phtml b/templates/database/designer/options_panel.phtml similarity index 100% rename from templates/designer/options_panel.phtml rename to templates/database/designer/options_panel.phtml diff --git a/templates/designer/page_save_as.phtml b/templates/database/designer/page_save_as.phtml similarity index 100% rename from templates/designer/page_save_as.phtml rename to templates/database/designer/page_save_as.phtml diff --git a/templates/designer/page_selector.phtml b/templates/database/designer/page_selector.phtml similarity index 100% rename from templates/designer/page_selector.phtml rename to templates/database/designer/page_selector.phtml diff --git a/templates/designer/query_details.phtml b/templates/database/designer/query_details.phtml similarity index 100% rename from templates/designer/query_details.phtml rename to templates/database/designer/query_details.phtml diff --git a/templates/designer/rename_to_panel.phtml b/templates/database/designer/rename_to_panel.phtml similarity index 100% rename from templates/designer/rename_to_panel.phtml rename to templates/database/designer/rename_to_panel.phtml diff --git a/templates/designer/schema_export.phtml b/templates/database/designer/schema_export.phtml similarity index 100% rename from templates/designer/schema_export.phtml rename to templates/database/designer/schema_export.phtml diff --git a/templates/designer/side_menu.phtml b/templates/database/designer/side_menu.phtml similarity index 100% rename from templates/designer/side_menu.phtml rename to templates/database/designer/side_menu.phtml diff --git a/templates/designer/table_list.phtml b/templates/database/designer/table_list.phtml similarity index 100% rename from templates/designer/table_list.phtml rename to templates/database/designer/table_list.phtml diff --git a/templates/designer/where_query_panel.phtml b/templates/database/designer/where_query_panel.phtml similarity index 100% rename from templates/designer/where_query_panel.phtml rename to templates/database/designer/where_query_panel.phtml From 97083bfd67e305e82f3de65ccde8f459bdcb7ae1 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Mon, 10 Aug 2015 11:01:53 +0530 Subject: [PATCH 06/11] Secondary tabs is generic enough to be moved out of table related template folder Signed-off-by: Madhura Jayaratne --- libraries/controllers/TableSearchController.class.php | 6 +++--- templates/{table => }/secondary_tabs.phtml | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename templates/{table => }/secondary_tabs.phtml (100%) diff --git a/libraries/controllers/TableSearchController.class.php b/libraries/controllers/TableSearchController.class.php index 0ab959ddab..8d58837dcb 100644 --- a/libraries/controllers/TableSearchController.class.php +++ b/libraries/controllers/TableSearchController.class.php @@ -187,7 +187,7 @@ class TableSearchController extends TableController // Show secondary level of tabs $this->response->addHTML( - Template::get('table/secondary_tabs') + Template::get('secondary_tabs') ->render( array( 'url_params' => array( @@ -336,7 +336,7 @@ class TableSearchController extends TableController // Displays the zoom search form $this->response->addHTML( - Template::get('table/secondary_tabs') + Template::get('secondary_tabs') ->render( array( 'url_params' => array( @@ -578,7 +578,7 @@ class TableSearchController extends TableController ); // Displays the table search form $this->response->addHTML( - Template::get('table/secondary_tabs') + Template::get('secondary_tabs') ->render( array( 'url_params' => array( diff --git a/templates/table/secondary_tabs.phtml b/templates/secondary_tabs.phtml similarity index 100% rename from templates/table/secondary_tabs.phtml rename to templates/secondary_tabs.phtml From 4ab54810842eea891733912917cdb8a829b5a5c8 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Mon, 10 Aug 2015 11:02:31 +0530 Subject: [PATCH 07/11] create_table.phtml is more suited with database related templates Signed-off-by: Madhura Jayaratne --- libraries/display_create_table.lib.php | 2 +- templates/{table => database}/create_table.phtml | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename templates/{table => database}/create_table.phtml (100%) diff --git a/libraries/display_create_table.lib.php b/libraries/display_create_table.lib.php index 8b622d1e6b..7087794d42 100644 --- a/libraries/display_create_table.lib.php +++ b/libraries/display_create_table.lib.php @@ -43,7 +43,7 @@ require_once 'libraries/Template.class.php'; */ function PMA_getHtmlForCreateTable($db) { - return PMA\Template::get('table/create_table')->render( + return PMA\Template::get('database/create_table')->render( array('db' => $db) ); } diff --git a/templates/table/create_table.phtml b/templates/database/create_table.phtml similarity index 100% rename from templates/table/create_table.phtml rename to templates/database/create_table.phtml From 5cf4f990ff305c96d6c41655eeaf58df3050043d Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Mon, 10 Aug 2015 11:07:16 +0530 Subject: [PATCH 08/11] Revert "Move column definitions related templates inside table folder" Column definitions are used in central column and normalization as well This reverts commit 5ca01bfffc516e19c73c24c5f269b249c6ea15bc. Signed-off-by: Madhura Jayaratne --- libraries/central_columns.lib.php | 42 +++++++++---------- libraries/normalization.lib.php | 2 +- libraries/tbl_columns_definition_form.inc.php | 2 +- .../column_adjust_privileges.phtml | 0 .../column_attribute.phtml | 0 .../column_attributes.phtml | 34 +++++++-------- .../column_auto_increment.phtml | 0 .../columns_definitions/column_comment.phtml | 0 .../columns_definitions/column_default.phtml | 0 .../column_definitions_form.phtml | 2 +- .../columns_definitions/column_extra.phtml | 0 .../columns_definitions/column_indexes.phtml | 0 .../columns_definitions/column_length.phtml | 0 .../columns_definitions/column_name.phtml | 0 .../columns_definitions/column_null.phtml | 0 .../columns_definitions/column_type.phtml | 0 .../column_virtuality.phtml | 0 .../columns_definitions/mime_type.phtml | 0 .../columns_definitions/move_column.phtml | 0 .../table_fields_definitions.phtml | 2 +- .../columns_definitions/transformation.phtml | 0 .../transformation_option.phtml | 0 .../PMA_tbl_columns_definition_form_test.php | 2 +- 23 files changed, 43 insertions(+), 43 deletions(-) rename templates/{table => }/columns_definitions/column_adjust_privileges.phtml (100%) rename templates/{table => }/columns_definitions/column_attribute.phtml (100%) rename templates/{table => }/columns_definitions/column_attributes.phtml (84%) rename templates/{table => }/columns_definitions/column_auto_increment.phtml (100%) rename templates/{table => }/columns_definitions/column_comment.phtml (100%) rename templates/{table => }/columns_definitions/column_default.phtml (100%) rename templates/{table => }/columns_definitions/column_definitions_form.phtml (99%) rename templates/{table => }/columns_definitions/column_extra.phtml (100%) rename templates/{table => }/columns_definitions/column_indexes.phtml (100%) rename templates/{table => }/columns_definitions/column_length.phtml (100%) rename templates/{table => }/columns_definitions/column_name.phtml (100%) rename templates/{table => }/columns_definitions/column_null.phtml (100%) rename templates/{table => }/columns_definitions/column_type.phtml (100%) rename templates/{table => }/columns_definitions/column_virtuality.phtml (100%) rename templates/{table => }/columns_definitions/mime_type.phtml (100%) rename templates/{table => }/columns_definitions/move_column.phtml (100%) rename templates/{table => }/columns_definitions/table_fields_definitions.phtml (98%) rename templates/{table => }/columns_definitions/transformation.phtml (100%) rename templates/{table => }/columns_definitions/transformation_option.phtml (100%) diff --git a/libraries/central_columns.lib.php b/libraries/central_columns.lib.php index bb08d3e098..ca4f842894 100644 --- a/libraries/central_columns.lib.php +++ b/libraries/central_columns.lib.php @@ -862,7 +862,7 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $odd_row, $row_num, $db) . '' . htmlspecialchars($row['col_name']) . '' . '' - . PMA\Template::get('table/columns_definitions/column_name') + . PMA\Template::get('columns_definitions/column_name') ->render( array( 'columnNumber' => $row_num, @@ -880,7 +880,7 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $odd_row, $row_num, $db) $tableHtml .= ''; $tableHtml .= ''; $tableHtml .= ''; $tableHtml .= ''; $tableHtml .= '' . '' . '' . '' . '' . '' . '' . '' . ' - render($content_row); ?> diff --git a/templates/table/columns_definitions/transformation.phtml b/templates/columns_definitions/transformation.phtml similarity index 100% rename from templates/table/columns_definitions/transformation.phtml rename to templates/columns_definitions/transformation.phtml diff --git a/templates/table/columns_definitions/transformation_option.phtml b/templates/columns_definitions/transformation_option.phtml similarity index 100% rename from templates/table/columns_definitions/transformation_option.phtml rename to templates/columns_definitions/transformation_option.phtml diff --git a/test/libraries/PMA_tbl_columns_definition_form_test.php b/test/libraries/PMA_tbl_columns_definition_form_test.php index 873c82fa48..afd7db0502 100644 --- a/test/libraries/PMA_tbl_columns_definition_form_test.php +++ b/test/libraries/PMA_tbl_columns_definition_form_test.php @@ -676,7 +676,7 @@ class PMA_TblColumnsDefinitionFormTest extends PHPUnit_Framework_TestCase { /** * @todo Find out a better method to test for HTML - * Template: table/columns_definitions/column_length + * Template: columns_definitions/column_length * * $this->assertContains( * ' Date: Mon, 10 Aug 2015 12:00:58 +0530 Subject: [PATCH 09/11] Split structure related templates to database and table Signed-off-by: Madhura Jayaratne --- .../controllers/StructureController.class.php | 30 +++++++++---------- .../TableRelationController.class.php | 2 +- libraries/mult_submits.inc.php | 2 +- .../structure/body_for_table_summary.phtml | 0 .../structure/browse_table.phtml | 0 .../structure/browse_table_label.phtml | 0 .../structure/check_all_tables.phtml | 0 .../structure/empty_table.phtml | 0 .../structure/favorite_anchor.phtml | 0 .../print_view_data_dictionary_link.phtml | 0 .../structure/search_table.phtml | 0 .../structure/show_create.phtml | 4 +-- .../structure/show_create_row.phtml | 0 .../structure/sortable_header.phtml | 0 .../structure/structure_table_row.phtml | 2 +- .../structure/table_header.phtml | 20 ++++++------- .../structure/tracking_icon.phtml | 0 .../{structure => table}/secondary_tabs.phtml | 0 .../action_row_in_structure_table.phtml | 0 .../actions_in_table_structure.phtml | 8 ++--- .../{ => table}/structure/add_column.phtml | 0 .../structure/check_all_table_column.phtml | 0 .../structure/display_structure.phtml | 14 ++++----- .../structure/display_table_stats.phtml | 2 +- .../structure/move_columns_dialog.phtml | 0 .../structure/optional_action_links.phtml | 0 .../structure/row_stats_table.phtml | 0 .../structure/table_structure_header.phtml | 0 .../structure/table_structure_row.phtml | 0 29 files changed, 42 insertions(+), 42 deletions(-) rename templates/{ => database}/structure/body_for_table_summary.phtml (100%) rename templates/{ => database}/structure/browse_table.phtml (100%) rename templates/{ => database}/structure/browse_table_label.phtml (100%) rename templates/{ => database}/structure/check_all_tables.phtml (100%) rename templates/{ => database}/structure/empty_table.phtml (100%) rename templates/{ => database}/structure/favorite_anchor.phtml (100%) rename templates/{ => database}/structure/print_view_data_dictionary_link.phtml (100%) rename templates/{ => database}/structure/search_table.phtml (100%) rename templates/{ => database}/structure/show_create.phtml (84%) rename templates/{ => database}/structure/show_create_row.phtml (100%) rename templates/{ => database}/structure/sortable_header.phtml (100%) rename templates/{ => database}/structure/structure_table_row.phtml (98%) rename templates/{ => database}/structure/table_header.phtml (83%) rename templates/{ => database}/structure/tracking_icon.phtml (100%) rename templates/{structure => table}/secondary_tabs.phtml (100%) rename templates/{ => table}/structure/action_row_in_structure_table.phtml (100%) rename templates/{ => table}/structure/actions_in_table_structure.phtml (94%) rename templates/{ => table}/structure/add_column.phtml (100%) rename templates/{ => table}/structure/check_all_table_column.phtml (100%) rename templates/{ => table}/structure/display_structure.phtml (91%) rename templates/{ => table}/structure/display_table_stats.phtml (97%) rename templates/{ => table}/structure/move_columns_dialog.phtml (100%) rename templates/{ => table}/structure/optional_action_links.phtml (100%) rename templates/{ => table}/structure/row_stats_table.phtml (100%) rename templates/{ => table}/structure/table_structure_header.phtml (100%) rename templates/{ => table}/structure/table_structure_row.phtml (100%) diff --git a/libraries/controllers/StructureController.class.php b/libraries/controllers/StructureController.class.php index 11216d1b48..a76a574485 100644 --- a/libraries/controllers/StructureController.class.php +++ b/libraries/controllers/StructureController.class.php @@ -266,7 +266,7 @@ class StructureController extends Controller // table form $this->response->addHTML( - Template::get('structure/table_header') + Template::get('database/structure/table_header') ->render( array( 'db' => $this->_db, @@ -418,7 +418,7 @@ class StructureController extends Controller */ $may_have_rows = $current_table['TABLE_ROWS'] > 0 || $table_is_view; - $browse_table = Template::get('structure/browse_table') + $browse_table = Template::get('database/structure/browse_table') ->render( array( 'tbl_url_query' => $tbl_url_query, @@ -427,7 +427,7 @@ class StructureController extends Controller ) ); - $search_table = Template::get('structure/search_table') + $search_table = Template::get('database/structure/search_table') ->render( array( 'tbl_url_query' => $tbl_url_query, @@ -436,7 +436,7 @@ class StructureController extends Controller ) ); - $browse_table_label = Template::get('structure/browse_table_label') + $browse_table_label = Template::get('database/structure/browse_table_label') ->render( array( 'tbl_url_query' => $tbl_url_query, @@ -451,7 +451,7 @@ class StructureController extends Controller if (!$this->_db_is_system_schema) { $empty_table = ' '; if (!$table_is_view) { - $empty_table = Template::get('structure/empty_table') + $empty_table = Template::get('database/structure/empty_table') ->render( array( 'tbl_url_query' => $tbl_url_query, @@ -500,7 +500,7 @@ class StructureController extends Controller $GLOBALS["db"], $truename ) > 0 ) { - $tracking_icon = Template::get('structure/tracking_icon') + $tracking_icon = Template::get('database/structure/tracking_icon') ->render( array( 'url_query' => $this->_url_query, @@ -523,7 +523,7 @@ class StructureController extends Controller ); $this->response->addHTML( - Template::get('structure/table_header')->render( + Template::get('database/structure/table_header')->render( array( 'db_is_system_schema' => false, 'replication' => $GLOBALS['replication_info']['slave']['status'] @@ -637,7 +637,7 @@ class StructureController extends Controller } $this->response->addHTML( - Template::get('structure/structure_table_row') + Template::get('database/structure/structure_table_row') ->render( array( 'db' => $this->_db, @@ -686,7 +686,7 @@ class StructureController extends Controller // Show Summary $this->response->addHTML(''); $this->response->addHTML( - Template::get('structure/body_for_table_summary')->render( + Template::get('database/structure/body_for_table_summary')->render( array( 'num_tables' => $this->_num_tables, 'server_slave_status' => $GLOBALS['replication_info']['slave']['status'], @@ -706,7 +706,7 @@ class StructureController extends Controller $this->response->addHTML('
render(array( + echo PMA\Template::get('table/search/input_box')->render(array( 'str' => '', 'column_type' => $_columnTypes[$column_index], 'column_id' => ($_columnTypes[$column_index]) ? 'edit_fieldID_' : 'fieldID_', From d14906239434652152a374510bc9e410f1f03e7f Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Mon, 10 Aug 2015 10:44:03 +0530 Subject: [PATCH 02/11] Organize templates related to table relations view Signed-off-by: Madhura Jayaratne --- .../TableRelationController.class.php | 2 +- .../relation}/common_form.phtml | 6 +++--- .../relation}/dropdown_generate.phtml | 0 .../relation}/foreign_key_row.phtml | 16 ++++++++-------- .../relation}/internal_relational_row.phtml | 6 +++--- .../relation}/relational_dropdown.phtml | 0 6 files changed, 15 insertions(+), 15 deletions(-) rename templates/{tbl_relation => table/relation}/common_form.phtml (94%) rename templates/{tbl_relation => table/relation}/dropdown_generate.phtml (100%) rename templates/{tbl_relation => table/relation}/foreign_key_row.phtml (91%) rename templates/{tbl_relation => table/relation}/internal_relational_row.phtml (89%) rename templates/{tbl_relation => table/relation}/relational_dropdown.phtml (100%) diff --git a/libraries/controllers/TableRelationController.class.php b/libraries/controllers/TableRelationController.class.php index 2cbefd67c4..78bd907f2f 100644 --- a/libraries/controllers/TableRelationController.class.php +++ b/libraries/controllers/TableRelationController.class.php @@ -180,7 +180,7 @@ class TableRelationController extends TableController // common form $this->response->addHTML( - Template::get('tbl_relation/common_form')->render( + Template::get('table/relation/common_form')->render( array( 'db' => $this->db, 'table' => $this->table, diff --git a/templates/tbl_relation/common_form.phtml b/templates/table/relation/common_form.phtml similarity index 94% rename from templates/tbl_relation/common_form.phtml rename to templates/table/relation/common_form.phtml index da767babe0..1a061b0251 100644 --- a/templates/tbl_relation/common_form.phtml +++ b/templates/table/relation/common_form.phtml @@ -17,7 +17,7 @@
- render( + render( array( 'name' => 'destination_foreign_db[' . $i . ']', 'title' => __('Database'), @@ -170,7 +170,7 @@ if ($foreign_db) { - render( + render( array( 'name' => 'destination_foreign_table[' . $i . ']', 'title' => __('Table'), @@ -188,7 +188,7 @@ if ($foreign_db) { $columns = $table_obj->getUniqueColumns(false, false); ?> - render( + render( array( 'name' => 'destination_foreign_column[' . $i . '][]', 'title' => __('Column'), @@ -200,7 +200,7 @@ if ($foreign_db) { - render( + render( array( 'name' => 'destination_foreign_column[' . $i . '][]', 'title' => __('Column'), diff --git a/templates/tbl_relation/internal_relational_row.phtml b/templates/table/relation/internal_relational_row.phtml similarity index 89% rename from templates/tbl_relation/internal_relational_row.phtml rename to templates/table/relation/internal_relational_row.phtml index 5954d759e2..f947723dbd 100644 --- a/templates/tbl_relation/internal_relational_row.phtml +++ b/templates/table/relation/internal_relational_row.phtml @@ -49,7 +49,7 @@ if ($foreign_db && $foreign_table) { - render( + render( array( 'name' => 'destination_db[' . $myfield_md5 . ']', 'title' => __('Database'), @@ -57,7 +57,7 @@ if ($foreign_db && $foreign_table) { 'foreign' => $foreign_db ) ); ?> - render( + render( array( 'name' => 'destination_table[' . $myfield_md5 . ']', 'title' => __('Table'), @@ -65,7 +65,7 @@ if ($foreign_db && $foreign_table) { 'foreign' => $foreign_table ) ); ?> - render( + render( array( 'name' => 'destination_column[' . $myfield_md5 . ']', 'title' => __('Column'), diff --git a/templates/tbl_relation/relational_dropdown.phtml b/templates/table/relation/relational_dropdown.phtml similarity index 100% rename from templates/tbl_relation/relational_dropdown.phtml rename to templates/table/relation/relational_dropdown.phtml From 62280cbca1ff04cdfe45fcb2f5c7fffe6555f387 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Mon, 10 Aug 2015 10:48:54 +0530 Subject: [PATCH 03/11] Organize chart and gis visualization related templates Signed-off-by: Madhura Jayaratne --- libraries/controllers/TableChartController.class.php | 2 +- libraries/controllers/TableGisVisualizationController.class.php | 2 +- templates/{ => table/chart}/tbl_chart.phtml | 0 templates/{ => table}/gis_visualization/gis_visualization.phtml | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename templates/{ => table/chart}/tbl_chart.phtml (100%) rename templates/{ => table}/gis_visualization/gis_visualization.phtml (100%) diff --git a/libraries/controllers/TableChartController.class.php b/libraries/controllers/TableChartController.class.php index 7f4b990eb3..92dc43c3da 100644 --- a/libraries/controllers/TableChartController.class.php +++ b/libraries/controllers/TableChartController.class.php @@ -166,7 +166,7 @@ class TableChartController extends TableController * Displays the page */ $this->response->addHTML( - Template::get('tbl_chart')->render( + Template::get('table/chart/tbl_chart')->render( array( 'url_query' => $this->url_query, 'url_params' => $url_params, diff --git a/libraries/controllers/TableGisVisualizationController.class.php b/libraries/controllers/TableGisVisualizationController.class.php index f899f84df7..c80ad05a0a 100644 --- a/libraries/controllers/TableGisVisualizationController.class.php +++ b/libraries/controllers/TableGisVisualizationController.class.php @@ -190,7 +190,7 @@ class TableGisVisualizationController extends TableController . '&saveToFile=true'; $svgSupport = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER <= 8) ? false : true; - $html = Template::get('gis_visualization/gis_visualization')->render( + $html = Template::get('table/gis_visualization/gis_visualization')->render( array( 'url_params' => $this->url_params, 'downloadUrl' => $downloadUrl, diff --git a/templates/tbl_chart.phtml b/templates/table/chart/tbl_chart.phtml similarity index 100% rename from templates/tbl_chart.phtml rename to templates/table/chart/tbl_chart.phtml diff --git a/templates/gis_visualization/gis_visualization.phtml b/templates/table/gis_visualization/gis_visualization.phtml similarity index 100% rename from templates/gis_visualization/gis_visualization.phtml rename to templates/table/gis_visualization/gis_visualization.phtml From 5ca01bfffc516e19c73c24c5f269b249c6ea15bc Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Mon, 10 Aug 2015 10:53:24 +0530 Subject: [PATCH 04/11] Move column definitions related templates inside table folder Signed-off-by: Madhura Jayaratne --- libraries/central_columns.lib.php | 42 +++++++++---------- libraries/normalization.lib.php | 2 +- libraries/tbl_columns_definition_form.inc.php | 2 +- .../column_adjust_privileges.phtml | 0 .../column_attribute.phtml | 0 .../column_attributes.phtml | 34 +++++++-------- .../column_auto_increment.phtml | 0 .../columns_definitions/column_comment.phtml | 0 .../columns_definitions/column_default.phtml | 0 .../column_definitions_form.phtml | 2 +- .../columns_definitions/column_extra.phtml | 0 .../columns_definitions/column_indexes.phtml | 0 .../columns_definitions/column_length.phtml | 0 .../columns_definitions/column_name.phtml | 0 .../columns_definitions/column_null.phtml | 0 .../columns_definitions/column_type.phtml | 0 .../column_virtuality.phtml | 0 .../columns_definitions/mime_type.phtml | 0 .../columns_definitions/move_column.phtml | 0 .../table_fields_definitions.phtml | 2 +- .../columns_definitions/transformation.phtml | 0 .../transformation_option.phtml | 0 .../PMA_tbl_columns_definition_form_test.php | 2 +- 23 files changed, 43 insertions(+), 43 deletions(-) rename templates/{ => table}/columns_definitions/column_adjust_privileges.phtml (100%) rename templates/{ => table}/columns_definitions/column_attribute.phtml (100%) rename templates/{ => table}/columns_definitions/column_attributes.phtml (84%) rename templates/{ => table}/columns_definitions/column_auto_increment.phtml (100%) rename templates/{ => table}/columns_definitions/column_comment.phtml (100%) rename templates/{ => table}/columns_definitions/column_default.phtml (100%) rename templates/{ => table}/columns_definitions/column_definitions_form.phtml (99%) rename templates/{ => table}/columns_definitions/column_extra.phtml (100%) rename templates/{ => table}/columns_definitions/column_indexes.phtml (100%) rename templates/{ => table}/columns_definitions/column_length.phtml (100%) rename templates/{ => table}/columns_definitions/column_name.phtml (100%) rename templates/{ => table}/columns_definitions/column_null.phtml (100%) rename templates/{ => table}/columns_definitions/column_type.phtml (100%) rename templates/{ => table}/columns_definitions/column_virtuality.phtml (100%) rename templates/{ => table}/columns_definitions/mime_type.phtml (100%) rename templates/{ => table}/columns_definitions/move_column.phtml (100%) rename templates/{ => table}/columns_definitions/table_fields_definitions.phtml (98%) rename templates/{ => table}/columns_definitions/transformation.phtml (100%) rename templates/{ => table}/columns_definitions/transformation_option.phtml (100%) diff --git a/libraries/central_columns.lib.php b/libraries/central_columns.lib.php index ca4f842894..bb08d3e098 100644 --- a/libraries/central_columns.lib.php +++ b/libraries/central_columns.lib.php @@ -862,7 +862,7 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $odd_row, $row_num, $db) . '' . htmlspecialchars($row['col_name']) . '' . '' - . PMA\Template::get('columns_definitions/column_name') + . PMA\Template::get('table/columns_definitions/column_name') ->render( array( 'columnNumber' => $row_num, @@ -880,7 +880,7 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $odd_row, $row_num, $db) $tableHtml .= '' . htmlspecialchars($row['col_type']) . '' - . PMA\Template::get('columns_definitions/column_type') + . PMA\Template::get('table/columns_definitions/column_type') ->render( array( 'columnNumber' => $row_num, @@ -895,7 +895,7 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $odd_row, $row_num, $db) '' . '' . ($row['col_length']?htmlspecialchars($row['col_length']):"") . '' - . PMA\Template::get('columns_definitions/column_length')->render( + . PMA\Template::get('table/columns_definitions/column_length')->render( array( 'columnNumber' => $row_num, 'ci' => 2, @@ -923,7 +923,7 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $odd_row, $row_num, $db) '' . (isset($row['col_default']) ? htmlspecialchars($row['col_default']) : 'None') . '' - . PMA\Template::get('columns_definitions/column_default') + . PMA\Template::get('table/columns_definitions/column_default') ->render( array( 'columnNumber' => $row_num, @@ -949,7 +949,7 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $odd_row, $row_num, $db) ($row['col_attribute'] ? htmlspecialchars($row['col_attribute']) : "" ) . '' - . PMA\Template::get('columns_definitions/column_attribute') + . PMA\Template::get('table/columns_definitions/column_attribute') ->render( array( 'columnNumber' => $row_num, @@ -965,7 +965,7 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $odd_row, $row_num, $db) '' . '' . ($row['col_isNull'] ? __('Yes') : __('No')) . '' - . PMA\Template::get('columns_definitions/column_null') + . PMA\Template::get('table/columns_definitions/column_null') ->render( array( 'columnNumber' => $row_num, @@ -981,7 +981,7 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $odd_row, $row_num, $db) $tableHtml .= '' . htmlspecialchars($row['col_extra']) . '' - . PMA\Template::get('columns_definitions/column_extra')->render( + . PMA\Template::get('table/columns_definitions/column_extra')->render( array( 'columnNumber' => $row_num, 'ci' => 7, @@ -1012,7 +1012,7 @@ function PMA_getHTMLforCentralColumnsEditTableRow($row, $odd_row, $row_num) . '' . '' - . PMA\Template::get('columns_definitions/column_name') + . PMA\Template::get('table/columns_definitions/column_name') ->render( array( 'columnNumber' => $row_num, @@ -1029,7 +1029,7 @@ function PMA_getHTMLforCentralColumnsEditTableRow($row, $odd_row, $row_num) . '' - . PMA\Template::get('columns_definitions/column_type') + . PMA\Template::get('table/columns_definitions/column_type') ->render( array( 'columnNumber' => $row_num, @@ -1042,7 +1042,7 @@ function PMA_getHTMLforCentralColumnsEditTableRow($row, $odd_row, $row_num) . '' - . PMA\Template::get('columns_definitions/column_length')->render( + . PMA\Template::get('table/columns_definitions/column_length')->render( array( 'columnNumber' => $row_num, 'ci' => 2, @@ -1067,7 +1067,7 @@ function PMA_getHTMLforCentralColumnsEditTableRow($row, $odd_row, $row_num) } $tableHtml .= '' - . PMA\Template::get('columns_definitions/column_default') + . PMA\Template::get('table/columns_definitions/column_default') ->render( array( 'columnNumber' => $row_num, @@ -1087,7 +1087,7 @@ function PMA_getHTMLforCentralColumnsEditTableRow($row, $odd_row, $row_num) . '' - . PMA\Template::get('columns_definitions/column_attribute') + . PMA\Template::get('table/columns_definitions/column_attribute') ->render( array( 'columnNumber' => $row_num, @@ -1103,7 +1103,7 @@ function PMA_getHTMLforCentralColumnsEditTableRow($row, $odd_row, $row_num) . '' - . PMA\Template::get('columns_definitions/column_null') + . PMA\Template::get('table/columns_definitions/column_null') ->render( array( 'columnNumber' => $row_num, @@ -1118,7 +1118,7 @@ function PMA_getHTMLforCentralColumnsEditTableRow($row, $odd_row, $row_num) $tableHtml .= '' - . PMA\Template::get('columns_definitions/column_extra')->render( + . PMA\Template::get('table/columns_definitions/column_extra')->render( array( 'columnNumber' => $row_num, 'ci' => 7, @@ -1270,7 +1270,7 @@ function PMA_getHTMLforAddNewColumn($db) $addNewColumn .= '
' - . PMA\Template::get('columns_definitions/column_name') + . PMA\Template::get('table/columns_definitions/column_name') ->render( array( 'columnNumber' => 0, @@ -1284,7 +1284,7 @@ function PMA_getHTMLforAddNewColumn($db) ) . '' - . PMA\Template::get('columns_definitions/column_type') + . PMA\Template::get('table/columns_definitions/column_type') ->render( array( 'columnNumber' => 0, @@ -1296,7 +1296,7 @@ function PMA_getHTMLforAddNewColumn($db) ) . '' - . PMA\Template::get('columns_definitions/column_length')->render( + . PMA\Template::get('table/columns_definitions/column_length')->render( array( 'columnNumber' => 0, 'ci' => 2, @@ -1307,7 +1307,7 @@ function PMA_getHTMLforAddNewColumn($db) ) . '' - . PMA\Template::get('columns_definitions/column_default') + . PMA\Template::get('table/columns_definitions/column_default') ->render( array( 'columnNumber' => 0, @@ -1325,7 +1325,7 @@ function PMA_getHTMLforAddNewColumn($db) ) . '' - . PMA\Template::get('columns_definitions/column_attribute') + . PMA\Template::get('table/columns_definitions/column_attribute') ->render( array( 'columnNumber' => 0, @@ -1338,7 +1338,7 @@ function PMA_getHTMLforAddNewColumn($db) ) . '' - . PMA\Template::get('columns_definitions/column_null') + . PMA\Template::get('table/columns_definitions/column_null') ->render( array( 'columnNumber' => 0, @@ -1349,7 +1349,7 @@ function PMA_getHTMLforAddNewColumn($db) ) . '' - . PMA\Template::get('columns_definitions/column_extra')->render( + . PMA\Template::get('table/columns_definitions/column_extra')->render( array( 'columnNumber' => 0, 'ci' => 7, diff --git a/libraries/normalization.lib.php b/libraries/normalization.lib.php index a07d928305..d1386abecc 100644 --- a/libraries/normalization.lib.php +++ b/libraries/normalization.lib.php @@ -105,7 +105,7 @@ function PMA_getHtmlForCreateNewColumn( ); } - return PMA\Template::get('columns_definitions/table_fields_definitions') + return PMA\Template::get('table/columns_definitions/table_fields_definitions') ->render( array( 'is_backup' => true, diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php index 4435999c68..291d08db3a 100644 --- a/libraries/tbl_columns_definition_form.inc.php +++ b/libraries/tbl_columns_definition_form.inc.php @@ -401,7 +401,7 @@ for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) { ); } // end for -$html = PMA\Template::get('columns_definitions/column_definitions_form')->render( +$html = PMA\Template::get('table/columns_definitions/column_definitions_form')->render( array( 'is_backup' => $is_backup, 'fields_meta' => isset($fields_meta) ? $fields_meta : null, diff --git a/templates/columns_definitions/column_adjust_privileges.phtml b/templates/table/columns_definitions/column_adjust_privileges.phtml similarity index 100% rename from templates/columns_definitions/column_adjust_privileges.phtml rename to templates/table/columns_definitions/column_adjust_privileges.phtml diff --git a/templates/columns_definitions/column_attribute.phtml b/templates/table/columns_definitions/column_attribute.phtml similarity index 100% rename from templates/columns_definitions/column_attribute.phtml rename to templates/table/columns_definitions/column_attribute.phtml diff --git a/templates/columns_definitions/column_attributes.phtml b/templates/table/columns_definitions/column_attributes.phtml similarity index 84% rename from templates/columns_definitions/column_attributes.phtml rename to templates/table/columns_definitions/column_attributes.phtml index 9fbc4ab5f7..57039910fb 100644 --- a/templates/columns_definitions/column_attributes.phtml +++ b/templates/table/columns_definitions/column_attributes.phtml @@ -9,7 +9,7 @@ $ci_offset = -1; - render(array( 'columnNumber' => $columnNumber, 'ci' => $ci++, @@ -20,7 +20,7 @@ $ci_offset = -1; - render(array( 'columnNumber' => $columnNumber, 'ci' => $ci++, @@ -31,7 +31,7 @@ $ci_offset = -1; - render(array( 'columnNumber' => $columnNumber, 'ci' => $ci++, @@ -42,7 +42,7 @@ $ci_offset = -1; - render(array( 'columnNumber' => $columnNumber, 'ci' => $ci++, @@ -64,7 +64,7 @@ $ci_offset = -1; - render(array( 'columnNumber' => $columnNumber, 'ci' => $ci++, @@ -76,7 +76,7 @@ $ci_offset = -1; - render(array( 'columnNumber' => $columnNumber, 'ci' => $ci++, @@ -89,7 +89,7 @@ $ci_offset = -1; - render(array( 'columnNumber' => $columnNumber, 'ci' => $ci++, @@ -101,7 +101,7 @@ $ci_offset = -1; - render(array( 'columnNumber' => $columnNumber, 'ci' => $ci++, @@ -112,7 +112,7 @@ $ci_offset = -1; - render(array( 'columnNumber' => $columnNumber, 'ci' => $ci++, @@ -122,7 +122,7 @@ $ci_offset = -1; - render(array( 'columnNumber' => $columnNumber, 'ci' => $ci++, @@ -134,7 +134,7 @@ $ci_offset = -1; - render(array( 'columnNumber' => $columnNumber, 'ci' => $ci++, @@ -154,7 +154,7 @@ $ci_offset = -1; } ?> - render(array( 'columnNumber' => $columnNumber, 'ci' => $ci++, @@ -169,7 +169,7 @@ $ci_offset = -1; - render(array( 'columnNumber' => $columnNumber, 'ci' => $ci++, @@ -181,7 +181,7 @@ $ci_offset = -1; - render(array( 'columnNumber' => $columnNumber, 'ci' => $ci++, @@ -194,7 +194,7 @@ $ci_offset = -1; - render(array( 'columnNumber' => $columnNumber, 'ci' => $ci++, @@ -206,7 +206,7 @@ $ci_offset = -1; - render(array( 'columnNumber' => $columnNumber, 'ci' => $ci++, @@ -219,7 +219,7 @@ $ci_offset = -1; - render(array( 'columnNumber' => $columnNumber, 'ci' => $ci++, diff --git a/templates/columns_definitions/column_auto_increment.phtml b/templates/table/columns_definitions/column_auto_increment.phtml similarity index 100% rename from templates/columns_definitions/column_auto_increment.phtml rename to templates/table/columns_definitions/column_auto_increment.phtml diff --git a/templates/columns_definitions/column_comment.phtml b/templates/table/columns_definitions/column_comment.phtml similarity index 100% rename from templates/columns_definitions/column_comment.phtml rename to templates/table/columns_definitions/column_comment.phtml diff --git a/templates/columns_definitions/column_default.phtml b/templates/table/columns_definitions/column_default.phtml similarity index 100% rename from templates/columns_definitions/column_default.phtml rename to templates/table/columns_definitions/column_default.phtml diff --git a/templates/columns_definitions/column_definitions_form.phtml b/templates/table/columns_definitions/column_definitions_form.phtml similarity index 99% rename from templates/columns_definitions/column_definitions_form.phtml rename to templates/table/columns_definitions/column_definitions_form.phtml index 5d0fea7ba9..f48718de48 100644 --- a/templates/columns_definitions/column_definitions_form.phtml +++ b/templates/table/columns_definitions/column_definitions_form.phtml @@ -64,7 +64,7 @@ render(array( 'is_backup' => $is_backup, 'fields_meta' => $fields_meta, diff --git a/templates/columns_definitions/column_extra.phtml b/templates/table/columns_definitions/column_extra.phtml similarity index 100% rename from templates/columns_definitions/column_extra.phtml rename to templates/table/columns_definitions/column_extra.phtml diff --git a/templates/columns_definitions/column_indexes.phtml b/templates/table/columns_definitions/column_indexes.phtml similarity index 100% rename from templates/columns_definitions/column_indexes.phtml rename to templates/table/columns_definitions/column_indexes.phtml diff --git a/templates/columns_definitions/column_length.phtml b/templates/table/columns_definitions/column_length.phtml similarity index 100% rename from templates/columns_definitions/column_length.phtml rename to templates/table/columns_definitions/column_length.phtml diff --git a/templates/columns_definitions/column_name.phtml b/templates/table/columns_definitions/column_name.phtml similarity index 100% rename from templates/columns_definitions/column_name.phtml rename to templates/table/columns_definitions/column_name.phtml diff --git a/templates/columns_definitions/column_null.phtml b/templates/table/columns_definitions/column_null.phtml similarity index 100% rename from templates/columns_definitions/column_null.phtml rename to templates/table/columns_definitions/column_null.phtml diff --git a/templates/columns_definitions/column_type.phtml b/templates/table/columns_definitions/column_type.phtml similarity index 100% rename from templates/columns_definitions/column_type.phtml rename to templates/table/columns_definitions/column_type.phtml diff --git a/templates/columns_definitions/column_virtuality.phtml b/templates/table/columns_definitions/column_virtuality.phtml similarity index 100% rename from templates/columns_definitions/column_virtuality.phtml rename to templates/table/columns_definitions/column_virtuality.phtml diff --git a/templates/columns_definitions/mime_type.phtml b/templates/table/columns_definitions/mime_type.phtml similarity index 100% rename from templates/columns_definitions/mime_type.phtml rename to templates/table/columns_definitions/mime_type.phtml diff --git a/templates/columns_definitions/move_column.phtml b/templates/table/columns_definitions/move_column.phtml similarity index 100% rename from templates/columns_definitions/move_column.phtml rename to templates/table/columns_definitions/move_column.phtml diff --git a/templates/columns_definitions/table_fields_definitions.phtml b/templates/table/columns_definitions/table_fields_definitions.phtml similarity index 98% rename from templates/columns_definitions/table_fields_definitions.phtml rename to templates/table/columns_definitions/table_fields_definitions.phtml index 037232a62c..71682b701f 100644 --- a/templates/columns_definitions/table_fields_definitions.phtml +++ b/templates/table/columns_definitions/table_fields_definitions.phtml @@ -125,7 +125,7 @@
' . htmlspecialchars($row['col_type']) . '' - . PMA\Template::get('table/columns_definitions/column_type') + . PMA\Template::get('columns_definitions/column_type') ->render( array( 'columnNumber' => $row_num, @@ -895,7 +895,7 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $odd_row, $row_num, $db) '' . '' . ($row['col_length']?htmlspecialchars($row['col_length']):"") . '' - . PMA\Template::get('table/columns_definitions/column_length')->render( + . PMA\Template::get('columns_definitions/column_length')->render( array( 'columnNumber' => $row_num, 'ci' => 2, @@ -923,7 +923,7 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $odd_row, $row_num, $db) '' . (isset($row['col_default']) ? htmlspecialchars($row['col_default']) : 'None') . '' - . PMA\Template::get('table/columns_definitions/column_default') + . PMA\Template::get('columns_definitions/column_default') ->render( array( 'columnNumber' => $row_num, @@ -949,7 +949,7 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $odd_row, $row_num, $db) ($row['col_attribute'] ? htmlspecialchars($row['col_attribute']) : "" ) . '' - . PMA\Template::get('table/columns_definitions/column_attribute') + . PMA\Template::get('columns_definitions/column_attribute') ->render( array( 'columnNumber' => $row_num, @@ -965,7 +965,7 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $odd_row, $row_num, $db) '' . '' . ($row['col_isNull'] ? __('Yes') : __('No')) . '' - . PMA\Template::get('table/columns_definitions/column_null') + . PMA\Template::get('columns_definitions/column_null') ->render( array( 'columnNumber' => $row_num, @@ -981,7 +981,7 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $odd_row, $row_num, $db) $tableHtml .= '' . htmlspecialchars($row['col_extra']) . '' - . PMA\Template::get('table/columns_definitions/column_extra')->render( + . PMA\Template::get('columns_definitions/column_extra')->render( array( 'columnNumber' => $row_num, 'ci' => 7, @@ -1012,7 +1012,7 @@ function PMA_getHTMLforCentralColumnsEditTableRow($row, $odd_row, $row_num) . '' . '' - . PMA\Template::get('table/columns_definitions/column_name') + . PMA\Template::get('columns_definitions/column_name') ->render( array( 'columnNumber' => $row_num, @@ -1029,7 +1029,7 @@ function PMA_getHTMLforCentralColumnsEditTableRow($row, $odd_row, $row_num) . '' - . PMA\Template::get('table/columns_definitions/column_type') + . PMA\Template::get('columns_definitions/column_type') ->render( array( 'columnNumber' => $row_num, @@ -1042,7 +1042,7 @@ function PMA_getHTMLforCentralColumnsEditTableRow($row, $odd_row, $row_num) . '' - . PMA\Template::get('table/columns_definitions/column_length')->render( + . PMA\Template::get('columns_definitions/column_length')->render( array( 'columnNumber' => $row_num, 'ci' => 2, @@ -1067,7 +1067,7 @@ function PMA_getHTMLforCentralColumnsEditTableRow($row, $odd_row, $row_num) } $tableHtml .= '' - . PMA\Template::get('table/columns_definitions/column_default') + . PMA\Template::get('columns_definitions/column_default') ->render( array( 'columnNumber' => $row_num, @@ -1087,7 +1087,7 @@ function PMA_getHTMLforCentralColumnsEditTableRow($row, $odd_row, $row_num) . '' - . PMA\Template::get('table/columns_definitions/column_attribute') + . PMA\Template::get('columns_definitions/column_attribute') ->render( array( 'columnNumber' => $row_num, @@ -1103,7 +1103,7 @@ function PMA_getHTMLforCentralColumnsEditTableRow($row, $odd_row, $row_num) . '' - . PMA\Template::get('table/columns_definitions/column_null') + . PMA\Template::get('columns_definitions/column_null') ->render( array( 'columnNumber' => $row_num, @@ -1118,7 +1118,7 @@ function PMA_getHTMLforCentralColumnsEditTableRow($row, $odd_row, $row_num) $tableHtml .= '' - . PMA\Template::get('table/columns_definitions/column_extra')->render( + . PMA\Template::get('columns_definitions/column_extra')->render( array( 'columnNumber' => $row_num, 'ci' => 7, @@ -1270,7 +1270,7 @@ function PMA_getHTMLforAddNewColumn($db) $addNewColumn .= '
' - . PMA\Template::get('table/columns_definitions/column_name') + . PMA\Template::get('columns_definitions/column_name') ->render( array( 'columnNumber' => 0, @@ -1284,7 +1284,7 @@ function PMA_getHTMLforAddNewColumn($db) ) . '' - . PMA\Template::get('table/columns_definitions/column_type') + . PMA\Template::get('columns_definitions/column_type') ->render( array( 'columnNumber' => 0, @@ -1296,7 +1296,7 @@ function PMA_getHTMLforAddNewColumn($db) ) . '' - . PMA\Template::get('table/columns_definitions/column_length')->render( + . PMA\Template::get('columns_definitions/column_length')->render( array( 'columnNumber' => 0, 'ci' => 2, @@ -1307,7 +1307,7 @@ function PMA_getHTMLforAddNewColumn($db) ) . '' - . PMA\Template::get('table/columns_definitions/column_default') + . PMA\Template::get('columns_definitions/column_default') ->render( array( 'columnNumber' => 0, @@ -1325,7 +1325,7 @@ function PMA_getHTMLforAddNewColumn($db) ) . '' - . PMA\Template::get('table/columns_definitions/column_attribute') + . PMA\Template::get('columns_definitions/column_attribute') ->render( array( 'columnNumber' => 0, @@ -1338,7 +1338,7 @@ function PMA_getHTMLforAddNewColumn($db) ) . '' - . PMA\Template::get('table/columns_definitions/column_null') + . PMA\Template::get('columns_definitions/column_null') ->render( array( 'columnNumber' => 0, @@ -1349,7 +1349,7 @@ function PMA_getHTMLforAddNewColumn($db) ) . '' - . PMA\Template::get('table/columns_definitions/column_extra')->render( + . PMA\Template::get('columns_definitions/column_extra')->render( array( 'columnNumber' => 0, 'ci' => 7, diff --git a/libraries/normalization.lib.php b/libraries/normalization.lib.php index d1386abecc..a07d928305 100644 --- a/libraries/normalization.lib.php +++ b/libraries/normalization.lib.php @@ -105,7 +105,7 @@ function PMA_getHtmlForCreateNewColumn( ); } - return PMA\Template::get('table/columns_definitions/table_fields_definitions') + return PMA\Template::get('columns_definitions/table_fields_definitions') ->render( array( 'is_backup' => true, diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php index 291d08db3a..4435999c68 100644 --- a/libraries/tbl_columns_definition_form.inc.php +++ b/libraries/tbl_columns_definition_form.inc.php @@ -401,7 +401,7 @@ for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) { ); } // end for -$html = PMA\Template::get('table/columns_definitions/column_definitions_form')->render( +$html = PMA\Template::get('columns_definitions/column_definitions_form')->render( array( 'is_backup' => $is_backup, 'fields_meta' => isset($fields_meta) ? $fields_meta : null, diff --git a/templates/table/columns_definitions/column_adjust_privileges.phtml b/templates/columns_definitions/column_adjust_privileges.phtml similarity index 100% rename from templates/table/columns_definitions/column_adjust_privileges.phtml rename to templates/columns_definitions/column_adjust_privileges.phtml diff --git a/templates/table/columns_definitions/column_attribute.phtml b/templates/columns_definitions/column_attribute.phtml similarity index 100% rename from templates/table/columns_definitions/column_attribute.phtml rename to templates/columns_definitions/column_attribute.phtml diff --git a/templates/table/columns_definitions/column_attributes.phtml b/templates/columns_definitions/column_attributes.phtml similarity index 84% rename from templates/table/columns_definitions/column_attributes.phtml rename to templates/columns_definitions/column_attributes.phtml index 57039910fb..9fbc4ab5f7 100644 --- a/templates/table/columns_definitions/column_attributes.phtml +++ b/templates/columns_definitions/column_attributes.phtml @@ -9,7 +9,7 @@ $ci_offset = -1; - render(array( 'columnNumber' => $columnNumber, 'ci' => $ci++, @@ -20,7 +20,7 @@ $ci_offset = -1; - render(array( 'columnNumber' => $columnNumber, 'ci' => $ci++, @@ -31,7 +31,7 @@ $ci_offset = -1; - render(array( 'columnNumber' => $columnNumber, 'ci' => $ci++, @@ -42,7 +42,7 @@ $ci_offset = -1; - render(array( 'columnNumber' => $columnNumber, 'ci' => $ci++, @@ -64,7 +64,7 @@ $ci_offset = -1; - render(array( 'columnNumber' => $columnNumber, 'ci' => $ci++, @@ -76,7 +76,7 @@ $ci_offset = -1; - render(array( 'columnNumber' => $columnNumber, 'ci' => $ci++, @@ -89,7 +89,7 @@ $ci_offset = -1; - render(array( 'columnNumber' => $columnNumber, 'ci' => $ci++, @@ -101,7 +101,7 @@ $ci_offset = -1; - render(array( 'columnNumber' => $columnNumber, 'ci' => $ci++, @@ -112,7 +112,7 @@ $ci_offset = -1; - render(array( 'columnNumber' => $columnNumber, 'ci' => $ci++, @@ -122,7 +122,7 @@ $ci_offset = -1; - render(array( 'columnNumber' => $columnNumber, 'ci' => $ci++, @@ -134,7 +134,7 @@ $ci_offset = -1; - render(array( 'columnNumber' => $columnNumber, 'ci' => $ci++, @@ -154,7 +154,7 @@ $ci_offset = -1; } ?> - render(array( 'columnNumber' => $columnNumber, 'ci' => $ci++, @@ -169,7 +169,7 @@ $ci_offset = -1; - render(array( 'columnNumber' => $columnNumber, 'ci' => $ci++, @@ -181,7 +181,7 @@ $ci_offset = -1; - render(array( 'columnNumber' => $columnNumber, 'ci' => $ci++, @@ -194,7 +194,7 @@ $ci_offset = -1; - render(array( 'columnNumber' => $columnNumber, 'ci' => $ci++, @@ -206,7 +206,7 @@ $ci_offset = -1; - render(array( 'columnNumber' => $columnNumber, 'ci' => $ci++, @@ -219,7 +219,7 @@ $ci_offset = -1; - render(array( 'columnNumber' => $columnNumber, 'ci' => $ci++, diff --git a/templates/table/columns_definitions/column_auto_increment.phtml b/templates/columns_definitions/column_auto_increment.phtml similarity index 100% rename from templates/table/columns_definitions/column_auto_increment.phtml rename to templates/columns_definitions/column_auto_increment.phtml diff --git a/templates/table/columns_definitions/column_comment.phtml b/templates/columns_definitions/column_comment.phtml similarity index 100% rename from templates/table/columns_definitions/column_comment.phtml rename to templates/columns_definitions/column_comment.phtml diff --git a/templates/table/columns_definitions/column_default.phtml b/templates/columns_definitions/column_default.phtml similarity index 100% rename from templates/table/columns_definitions/column_default.phtml rename to templates/columns_definitions/column_default.phtml diff --git a/templates/table/columns_definitions/column_definitions_form.phtml b/templates/columns_definitions/column_definitions_form.phtml similarity index 99% rename from templates/table/columns_definitions/column_definitions_form.phtml rename to templates/columns_definitions/column_definitions_form.phtml index f48718de48..5d0fea7ba9 100644 --- a/templates/table/columns_definitions/column_definitions_form.phtml +++ b/templates/columns_definitions/column_definitions_form.phtml @@ -64,7 +64,7 @@ render(array( 'is_backup' => $is_backup, 'fields_meta' => $fields_meta, diff --git a/templates/table/columns_definitions/column_extra.phtml b/templates/columns_definitions/column_extra.phtml similarity index 100% rename from templates/table/columns_definitions/column_extra.phtml rename to templates/columns_definitions/column_extra.phtml diff --git a/templates/table/columns_definitions/column_indexes.phtml b/templates/columns_definitions/column_indexes.phtml similarity index 100% rename from templates/table/columns_definitions/column_indexes.phtml rename to templates/columns_definitions/column_indexes.phtml diff --git a/templates/table/columns_definitions/column_length.phtml b/templates/columns_definitions/column_length.phtml similarity index 100% rename from templates/table/columns_definitions/column_length.phtml rename to templates/columns_definitions/column_length.phtml diff --git a/templates/table/columns_definitions/column_name.phtml b/templates/columns_definitions/column_name.phtml similarity index 100% rename from templates/table/columns_definitions/column_name.phtml rename to templates/columns_definitions/column_name.phtml diff --git a/templates/table/columns_definitions/column_null.phtml b/templates/columns_definitions/column_null.phtml similarity index 100% rename from templates/table/columns_definitions/column_null.phtml rename to templates/columns_definitions/column_null.phtml diff --git a/templates/table/columns_definitions/column_type.phtml b/templates/columns_definitions/column_type.phtml similarity index 100% rename from templates/table/columns_definitions/column_type.phtml rename to templates/columns_definitions/column_type.phtml diff --git a/templates/table/columns_definitions/column_virtuality.phtml b/templates/columns_definitions/column_virtuality.phtml similarity index 100% rename from templates/table/columns_definitions/column_virtuality.phtml rename to templates/columns_definitions/column_virtuality.phtml diff --git a/templates/table/columns_definitions/mime_type.phtml b/templates/columns_definitions/mime_type.phtml similarity index 100% rename from templates/table/columns_definitions/mime_type.phtml rename to templates/columns_definitions/mime_type.phtml diff --git a/templates/table/columns_definitions/move_column.phtml b/templates/columns_definitions/move_column.phtml similarity index 100% rename from templates/table/columns_definitions/move_column.phtml rename to templates/columns_definitions/move_column.phtml diff --git a/templates/table/columns_definitions/table_fields_definitions.phtml b/templates/columns_definitions/table_fields_definitions.phtml similarity index 98% rename from templates/table/columns_definitions/table_fields_definitions.phtml rename to templates/columns_definitions/table_fields_definitions.phtml index 71682b701f..037232a62c 100644 --- a/templates/table/columns_definitions/table_fields_definitions.phtml +++ b/templates/columns_definitions/table_fields_definitions.phtml @@ -125,7 +125,7 @@
'); //check all $this->response->addHTML( - Template::get('structure/check_all_tables')->render( + Template::get('database/structure/check_all_tables')->render( array( 'pmaThemeImage' => $GLOBALS['pmaThemeImage'], 'text_dir' => $GLOBALS['text_dir'], @@ -735,7 +735,7 @@ class StructureController extends Controller /* DATABASE WORK */ /* Printable view of a table */ $this->response->addHTML( - Template::get('structure/print_view_data_dictionary_link')->render( + Template::get('database/structure/print_view_data_dictionary_link')->render( array('url_query' => $this->_url_query) ) ); @@ -879,7 +879,7 @@ class StructureController extends Controller // display secondary level tabs if necessary $engine = $this->_table_obj->sGetStatusInfo('ENGINE'); $this->response->addHTML( - Template::get('structure/secondary_tabs')->render( + Template::get('table/secondary_tabs')->render( array( 'url_params' => array( 'db' => $this->_db, @@ -1057,7 +1057,7 @@ class StructureController extends Controller 'user' => $user, 'favorite_tables' => json_encode($favorite_tables), 'list' => $fav_instance->getHtmlList(), - 'anchor' => Template::get('structure/favorite_anchor') + 'anchor' => Template::get('database/structure/favorite_anchor') ->render( array( 'db' => $this->_db, @@ -2046,7 +2046,7 @@ class StructureController extends Controller } // END - Calc Table Space - return Template::get('structure/display_structure')->render( + return Template::get('table/structure/display_structure')->render( array( 'HideStructureActions' => $HideStructureActions, 'db' => $this->_db, @@ -2145,7 +2145,7 @@ class StructureController extends Controller $avg_size = $avg_unit = ''; } - return Template::get('structure/display_table_stats')->render( + return Template::get('table/structure/display_table_stats')->render( array( 'showtable' => $showtable, 'table_info_num_rows' => $table_info_num_rows, diff --git a/libraries/controllers/TableRelationController.class.php b/libraries/controllers/TableRelationController.class.php index 78bd907f2f..acead5c621 100644 --- a/libraries/controllers/TableRelationController.class.php +++ b/libraries/controllers/TableRelationController.class.php @@ -158,7 +158,7 @@ class TableRelationController extends TableController // display secondary level tabs if necessary $engine = $this->dbi->getTable($this->db, $this->table)->sGetStatusInfo('ENGINE'); $this->response->addHTML( - Template::get('structure/secondary_tabs')->render( + Template::get('table/secondary_tabs')->render( array( 'url_params' => array( 'db' => $GLOBALS['db'], diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index 92769ab57d..2ac2e469cf 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -87,7 +87,7 @@ if (! empty($submit_mult) exit; break; case 'show_create': - $show_create = PMA\Template::get('structure/show_create')->render( + $show_create = PMA\Template::get('database/structure/show_create')->render( array( 'db' => $GLOBALS['db'], 'db_objects' => $selected diff --git a/templates/structure/body_for_table_summary.phtml b/templates/database/structure/body_for_table_summary.phtml similarity index 100% rename from templates/structure/body_for_table_summary.phtml rename to templates/database/structure/body_for_table_summary.phtml diff --git a/templates/structure/browse_table.phtml b/templates/database/structure/browse_table.phtml similarity index 100% rename from templates/structure/browse_table.phtml rename to templates/database/structure/browse_table.phtml diff --git a/templates/structure/browse_table_label.phtml b/templates/database/structure/browse_table_label.phtml similarity index 100% rename from templates/structure/browse_table_label.phtml rename to templates/database/structure/browse_table_label.phtml diff --git a/templates/structure/check_all_tables.phtml b/templates/database/structure/check_all_tables.phtml similarity index 100% rename from templates/structure/check_all_tables.phtml rename to templates/database/structure/check_all_tables.phtml diff --git a/templates/structure/empty_table.phtml b/templates/database/structure/empty_table.phtml similarity index 100% rename from templates/structure/empty_table.phtml rename to templates/database/structure/empty_table.phtml diff --git a/templates/structure/favorite_anchor.phtml b/templates/database/structure/favorite_anchor.phtml similarity index 100% rename from templates/structure/favorite_anchor.phtml rename to templates/database/structure/favorite_anchor.phtml diff --git a/templates/structure/print_view_data_dictionary_link.phtml b/templates/database/structure/print_view_data_dictionary_link.phtml similarity index 100% rename from templates/structure/print_view_data_dictionary_link.phtml rename to templates/database/structure/print_view_data_dictionary_link.phtml diff --git a/templates/structure/search_table.phtml b/templates/database/structure/search_table.phtml similarity index 100% rename from templates/structure/search_table.phtml rename to templates/database/structure/search_table.phtml diff --git a/templates/structure/show_create.phtml b/templates/database/structure/show_create.phtml similarity index 84% rename from templates/structure/show_create.phtml rename to templates/database/structure/show_create.phtml index 7e2e666b24..7b36d13ca4 100644 --- a/templates/structure/show_create.phtml +++ b/templates/database/structure/show_create.phtml @@ -13,7 +13,7 @@ ?> render( + echo PMA\Template::get('database/structure/show_create_row')->render( array( 'title' => __('Tables'), 'raw_title' => 'Table', @@ -25,7 +25,7 @@ render( + echo PMA\Template::get('database/structure/show_create_row')->render( array( 'title' => __('Views'), 'raw_title' => 'View', diff --git a/templates/structure/show_create_row.phtml b/templates/database/structure/show_create_row.phtml similarity index 100% rename from templates/structure/show_create_row.phtml rename to templates/database/structure/show_create_row.phtml diff --git a/templates/structure/sortable_header.phtml b/templates/database/structure/sortable_header.phtml similarity index 100% rename from templates/structure/sortable_header.phtml rename to templates/database/structure/sortable_header.phtml diff --git a/templates/structure/structure_table_row.phtml b/templates/database/structure/structure_table_row.phtml similarity index 98% rename from templates/structure/structure_table_row.phtml rename to templates/database/structure/structure_table_row.phtml index 2f1a552e35..69670b9b0d 100644 --- a/templates/structure/structure_table_row.phtml +++ b/templates/database/structure/structure_table_row.phtml @@ -22,7 +22,7 @@ ?> 0): ?> - render( + render( array( 'db' => $db, 'current_table' => $current_table, diff --git a/templates/structure/table_header.phtml b/templates/database/structure/table_header.phtml similarity index 83% rename from templates/structure/table_header.phtml rename to templates/database/structure/table_header.phtml index 76301ab61d..22a90ba61d 100644 --- a/templates/structure/table_header.phtml +++ b/templates/database/structure/table_header.phtml @@ -16,7 +16,7 @@ if ($GLOBALS['cfg']['NumFavoriteTables'] > 0) { - render( + render( array( 'title' => __('Table'), 'sort' => 'table', @@ -31,7 +31,7 @@ if ($GLOBALS['cfg']['NumFavoriteTables'] > 0) { - render( + render( array( 'title' => __('Rows'), 'sort' => 'records', @@ -43,14 +43,14 @@ if ($GLOBALS['cfg']['NumFavoriteTables'] > 0) { . ' count. See [doc@faq3-11]FAQ 3.11[/doc].'))); ?> 1)): ?> - render( + render( array( 'title' => __('Type'), 'sort' => 'type', 'initial_sort_order' => 'ASC' ) ); $cnt++; ?> - render( + render( array( 'title' => __('Collation'), 'sort' => 'collation', @@ -61,7 +61,7 @@ if ($GLOBALS['cfg']['NumFavoriteTables'] > 0) { - render( + render( array( 'title' => __('Size'), 'sort' => 'size', @@ -69,7 +69,7 @@ if ($GLOBALS['cfg']['NumFavoriteTables'] > 0) { ) ); $cnt++; ?> - render( + render( array( 'title' => __('Overhead'), 'sort' => 'overhead', @@ -79,7 +79,7 @@ if ($GLOBALS['cfg']['NumFavoriteTables'] > 0) { - render( + render( array( 'title' => __('Comment'), 'sort' => 'comment', @@ -90,7 +90,7 @@ if ($GLOBALS['cfg']['NumFavoriteTables'] > 0) { - render( + render( array( 'title' => __('Creation'), 'sort' => 'creation', @@ -101,7 +101,7 @@ if ($GLOBALS['cfg']['NumFavoriteTables'] > 0) { - render( + render( array( 'title' => __('Last update'), 'sort' => 'last_update', @@ -112,7 +112,7 @@ if ($GLOBALS['cfg']['NumFavoriteTables'] > 0) { - render( + render( array( 'title' => __('Last check'), 'sort' => 'last_check', diff --git a/templates/structure/tracking_icon.phtml b/templates/database/structure/tracking_icon.phtml similarity index 100% rename from templates/structure/tracking_icon.phtml rename to templates/database/structure/tracking_icon.phtml diff --git a/templates/structure/secondary_tabs.phtml b/templates/table/secondary_tabs.phtml similarity index 100% rename from templates/structure/secondary_tabs.phtml rename to templates/table/secondary_tabs.phtml diff --git a/templates/structure/action_row_in_structure_table.phtml b/templates/table/structure/action_row_in_structure_table.phtml similarity index 100% rename from templates/structure/action_row_in_structure_table.phtml rename to templates/table/structure/action_row_in_structure_table.phtml diff --git a/templates/structure/actions_in_table_structure.phtml b/templates/table/structure/actions_in_table_structure.phtml similarity index 94% rename from templates/structure/actions_in_table_structure.phtml rename to templates/table/structure/actions_in_table_structure.phtml index 478ba0bdc9..dcc9e0c23a 100644 --- a/templates/structure/actions_in_table_structure.phtml +++ b/templates/table/structure/actions_in_table_structure.phtml @@ -1,7 +1,7 @@