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(''); //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/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/libraries/controllers/TableIndexesController.class.php b/libraries/controllers/TableIndexesController.class.php index e494f299c9..524d55807d 100644 --- a/libraries/controllers/TableIndexesController.class.php +++ b/libraries/controllers/TableIndexesController.class.php @@ -116,7 +116,7 @@ class TableIndexesController extends TableController $this->response->getHeader()->getScripts()->addFile('indexes.js'); $this->response->addHTML( - Template::get('index_form')->render( + Template::get('table/index_form')->render( array( 'fields' => $fields, 'index' => $this->index, diff --git a/libraries/controllers/TableRelationController.class.php b/libraries/controllers/TableRelationController.class.php index 2cbefd67c4..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'], @@ -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/libraries/controllers/TableSearchController.class.php b/libraries/controllers/TableSearchController.class.php index 4a3fcb011a..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( @@ -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, @@ -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( @@ -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, @@ -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( @@ -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/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/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/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/libraries/navigation/NavigationHeader.class.php b/libraries/navigation/NavigationHeader.class.php index 6d6723d883..e707f53db0 100644 --- a/libraries/navigation/NavigationHeader.class.php +++ b/libraries/navigation/NavigationHeader.class.php @@ -78,7 +78,7 @@ class PMA_NavigationHeader { // display Logo, depending on $GLOBALS['cfg']['NavigationDisplayLogo'] if (!$GLOBALS['cfg']['NavigationDisplayLogo']) { - return Template::get('logo') + return Template::get('navigation/logo') ->render(array('displayLogo' => false)); } @@ -92,7 +92,7 @@ class PMA_NavigationHeader } if (!$GLOBALS['cfg']['NavigationLogoLink']) { - return Template::get('logo') + return Template::get('navigation/logo') ->render( array( 'displayLogo' => true, @@ -130,7 +130,7 @@ class PMA_NavigationHeader } } - return Template::get('logo') + return Template::get('navigation/logo') ->render( array( 'displayLogo' => true, 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 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 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/logo.phtml b/templates/navigation/logo.phtml similarity index 100% rename from templates/logo.phtml rename to templates/navigation/logo.phtml diff --git a/templates/secondary_tabs.phtml b/templates/secondary_tabs.phtml new file mode 100644 index 0000000000..166a1d9ce3 --- /dev/null +++ b/templates/secondary_tabs.phtml @@ -0,0 +1,6 @@ + +
diff --git a/templates/structure/secondary_tabs.phtml b/templates/structure/secondary_tabs.phtml deleted file mode 100644 index 9ace3a0eb9..0000000000 --- a/templates/structure/secondary_tabs.phtml +++ /dev/null @@ -1,19 +0,0 @@ - - - -
- 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 diff --git a/templates/index_form.phtml b/templates/table/index_form.phtml similarity index 100% rename from templates/index_form.phtml rename to templates/table/index_form.phtml 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( '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) { - 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 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(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_', diff --git a/templates/table/secondary_tabs.phtml b/templates/table/secondary_tabs.phtml index 166a1d9ce3..9ace3a0eb9 100644 --- a/templates/table/secondary_tabs.phtml +++ b/templates/table/secondary_tabs.phtml @@ -1,6 +1,19 @@ -
    - - - -
-
+ + +
    + 'b_props', + 'link' => 'tbl_structure.php', + 'text' => __('Table structure'), + 'id' => 'table_strucuture_id' + ), $url_params); ?> + 'b_relations', + 'link' => 'tbl_relation.php', + 'text' => __('Relation view'), + 'id' => 'table_relation_id' + ), $url_params); ?> +
+
+ 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 @@
    render( + echo PMA\Template::get('table/structure/action_row_in_structure_table')->render( array( 'type' => $type, 'tbl_storage_engine' => $tbl_storage_engine, @@ -21,7 +21,7 @@ ?> render( + echo PMA\Template::get('table/structure/action_row_in_structure_table')->render( array( 'type' => $type, 'tbl_storage_engine' => $tbl_storage_engine, @@ -41,7 +41,7 @@ ?> render( + echo PMA\Template::get('table/structure/action_row_in_structure_table')->render( array( 'type' => $type, 'tbl_storage_engine' => $tbl_storage_engine, @@ -66,7 +66,7 @@ 'geometry', 'point', 'linestring', 'polygon', 'multipoint', 'multilinestring', 'multipolygon', 'geomtrycollection' ); - echo PMA\Template::get('structure/action_row_in_structure_table')->render( + echo PMA\Template::get('table/structure/action_row_in_structure_table')->render( array( 'type' => $type, 'tbl_storage_engine' => $tbl_storage_engine, diff --git a/templates/structure/add_column.phtml b/templates/table/structure/add_column.phtml similarity index 100% rename from templates/structure/add_column.phtml rename to templates/table/structure/add_column.phtml diff --git a/templates/structure/check_all_table_column.phtml b/templates/table/structure/check_all_table_column.phtml similarity index 100% rename from templates/structure/check_all_table_column.phtml rename to templates/table/structure/check_all_table_column.phtml diff --git a/templates/structure/display_structure.phtml b/templates/table/structure/display_structure.phtml similarity index 91% rename from templates/structure/display_structure.phtml rename to templates/table/structure/display_structure.phtml index 983b6ae267..0d9f17d61b 100644 --- a/templates/structure/display_structure.phtml +++ b/templates/table/structure/display_structure.phtml @@ -11,7 +11,7 @@ - render( + render( array( 'db_is_system_schema' => $db_is_system_schema, 'tbl_is_view' => $tbl_is_view @@ -82,7 +82,7 @@ ?> - render( + render( array( 'row' => $row, 'rownum' => $rownum, @@ -100,7 +100,7 @@ ) ); ?> - render( + render( array( 'extracted_columnspec' => $extracted_columnspec, 'type' => (!empty($extracted_columnspec['print_type'])) ? $extracted_columnspec['print_type'] : ' ', @@ -120,7 +120,7 @@
    - render( + render( array( 'pmaThemeImage' => $GLOBALS['pmaThemeImage'], 'text_dir' => $GLOBALS['text_dir'], @@ -131,7 +131,7 @@ ); ?>
    -render(); ?> +render(); ?>
    - render( + render( array('columns_list' => $columns_list) ); ?> diff --git a/templates/structure/display_table_stats.phtml b/templates/table/structure/display_table_stats.phtml similarity index 97% rename from templates/structure/display_table_stats.phtml rename to templates/table/structure/display_table_stats.phtml index 3a7c76e09d..281827a961 100644 --- a/templates/structure/display_table_stats.phtml +++ b/templates/table/structure/display_table_stats.phtml @@ -62,7 +62,7 @@
render( + echo PMA\Template::get('table/structure/row_stats_table')->render( array( 'showtable' => $showtable, 'tbl_collation' => $tbl_collation, diff --git a/templates/structure/move_columns_dialog.phtml b/templates/table/structure/move_columns_dialog.phtml similarity index 100% rename from templates/structure/move_columns_dialog.phtml rename to templates/table/structure/move_columns_dialog.phtml diff --git a/templates/structure/optional_action_links.phtml b/templates/table/structure/optional_action_links.phtml similarity index 100% rename from templates/structure/optional_action_links.phtml rename to templates/table/structure/optional_action_links.phtml diff --git a/templates/structure/row_stats_table.phtml b/templates/table/structure/row_stats_table.phtml similarity index 100% rename from templates/structure/row_stats_table.phtml rename to templates/table/structure/row_stats_table.phtml diff --git a/templates/structure/table_structure_header.phtml b/templates/table/structure/table_structure_header.phtml similarity index 100% rename from templates/structure/table_structure_header.phtml rename to templates/table/structure/table_structure_header.phtml diff --git a/templates/structure/table_structure_row.phtml b/templates/table/structure/table_structure_row.phtml similarity index 100% rename from templates/structure/table_structure_row.phtml rename to templates/table/structure/table_structure_row.phtml