Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: e807787610c0662e044cf88bf302c4a94059b572 https://github.com/phpmyadmin/phpmyadmin/commit/e807787610c0662e044cf88bf302... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-08-10 (Mon, 10 Aug 2015)
Changed paths: M libraries/controllers/TableSearchController.class.php R templates/table/column_comparison_operators.phtml R templates/table/fields_table.phtml R templates/table/form_tag.phtml R templates/table/input_box.phtml R templates/table/options.phtml R templates/table/options_zoom.phtml R templates/table/replace_preview.phtml R templates/table/rows_normal.phtml R templates/table/rows_zoom.phtml A templates/table/search/column_comparison_operators.phtml A templates/table/search/fields_table.phtml A templates/table/search/form_tag.phtml A templates/table/search/input_box.phtml A templates/table/search/options.phtml A templates/table/search/options_zoom.phtml A templates/table/search/replace_preview.phtml A templates/table/search/rows_normal.phtml A templates/table/search/rows_zoom.phtml A templates/table/search/search_and_replace.phtml A templates/table/search/selection_form.phtml A templates/table/search/table_header.phtml A templates/table/search/zoom_result_form.phtml R templates/table/search_and_replace.phtml R templates/table/selection_form.phtml R templates/table/table_header.phtml R templates/table/zoom_result_form.phtml
Log Message: ----------- Organize table search related templates
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: d14906239434652152a374510bc9e410f1f03e7f https://github.com/phpmyadmin/phpmyadmin/commit/d14906239434652152a374510bc9... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-08-10 (Mon, 10 Aug 2015)
Changed paths: M libraries/controllers/TableRelationController.class.php A templates/table/relation/common_form.phtml A templates/table/relation/dropdown_generate.phtml A templates/table/relation/foreign_key_row.phtml A templates/table/relation/internal_relational_row.phtml A templates/table/relation/relational_dropdown.phtml R templates/tbl_relation/common_form.phtml R templates/tbl_relation/dropdown_generate.phtml R templates/tbl_relation/foreign_key_row.phtml R templates/tbl_relation/internal_relational_row.phtml R templates/tbl_relation/relational_dropdown.phtml
Log Message: ----------- Organize templates related to table relations view
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 62280cbca1ff04cdfe45fcb2f5c7fffe6555f387 https://github.com/phpmyadmin/phpmyadmin/commit/62280cbca1ff04cdfe45fcb2f5c7... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-08-10 (Mon, 10 Aug 2015)
Changed paths: M libraries/controllers/TableChartController.class.php M libraries/controllers/TableGisVisualizationController.class.php R templates/gis_visualization/gis_visualization.phtml A templates/table/chart/tbl_chart.phtml A templates/table/gis_visualization/gis_visualization.phtml R templates/tbl_chart.phtml
Log Message: ----------- Organize chart and gis visualization related templates
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 5ca01bfffc516e19c73c24c5f269b249c6ea15bc https://github.com/phpmyadmin/phpmyadmin/commit/5ca01bfffc516e19c73c24c5f269... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-08-10 (Mon, 10 Aug 2015)
Changed paths: M libraries/central_columns.lib.php M libraries/normalization.lib.php M libraries/tbl_columns_definition_form.inc.php R templates/columns_definitions/column_adjust_privileges.phtml R templates/columns_definitions/column_attribute.phtml R templates/columns_definitions/column_attributes.phtml R templates/columns_definitions/column_auto_increment.phtml R templates/columns_definitions/column_comment.phtml R templates/columns_definitions/column_default.phtml R templates/columns_definitions/column_definitions_form.phtml R templates/columns_definitions/column_extra.phtml R templates/columns_definitions/column_indexes.phtml R templates/columns_definitions/column_length.phtml R templates/columns_definitions/column_name.phtml R templates/columns_definitions/column_null.phtml R templates/columns_definitions/column_type.phtml R templates/columns_definitions/column_virtuality.phtml R templates/columns_definitions/mime_type.phtml R templates/columns_definitions/move_column.phtml R templates/columns_definitions/table_fields_definitions.phtml R templates/columns_definitions/transformation.phtml R templates/columns_definitions/transformation_option.phtml A templates/table/columns_definitions/column_adjust_privileges.phtml A templates/table/columns_definitions/column_attribute.phtml A templates/table/columns_definitions/column_attributes.phtml A templates/table/columns_definitions/column_auto_increment.phtml A templates/table/columns_definitions/column_comment.phtml A templates/table/columns_definitions/column_default.phtml A templates/table/columns_definitions/column_definitions_form.phtml A templates/table/columns_definitions/column_extra.phtml A templates/table/columns_definitions/column_indexes.phtml A templates/table/columns_definitions/column_length.phtml A templates/table/columns_definitions/column_name.phtml A templates/table/columns_definitions/column_null.phtml A templates/table/columns_definitions/column_type.phtml A templates/table/columns_definitions/column_virtuality.phtml A templates/table/columns_definitions/mime_type.phtml A templates/table/columns_definitions/move_column.phtml A templates/table/columns_definitions/table_fields_definitions.phtml A templates/table/columns_definitions/transformation.phtml A templates/table/columns_definitions/transformation_option.phtml M test/libraries/PMA_tbl_columns_definition_form_test.php
Log Message: ----------- Move column definitions related templates inside table folder
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 1391c3a09757e8cb9714d4373c571c0629219459 https://github.com/phpmyadmin/phpmyadmin/commit/1391c3a09757e8cb9714d4373c57... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-08-10 (Mon, 10 Aug 2015)
Changed paths: M libraries/db_designer.lib.php A templates/database/designer/aggregate_query_panel.phtml A templates/database/designer/canvas.phtml A templates/database/designer/database_tables.phtml A templates/database/designer/delete_relation_panel.phtml A templates/database/designer/edit_delete_pages.phtml A templates/database/designer/having_query_panel.phtml A templates/database/designer/js_fields.phtml A templates/database/designer/new_relation_panel.phtml A templates/database/designer/options_panel.phtml A templates/database/designer/page_save_as.phtml A templates/database/designer/page_selector.phtml A templates/database/designer/query_details.phtml A templates/database/designer/rename_to_panel.phtml A templates/database/designer/schema_export.phtml A templates/database/designer/side_menu.phtml A templates/database/designer/table_list.phtml A templates/database/designer/where_query_panel.phtml R templates/designer/aggregate_query_panel.phtml R templates/designer/canvas.phtml R templates/designer/database_tables.phtml R templates/designer/delete_relation_panel.phtml R templates/designer/edit_delete_pages.phtml R templates/designer/having_query_panel.phtml R templates/designer/js_fields.phtml R templates/designer/new_relation_panel.phtml R templates/designer/options_panel.phtml R templates/designer/page_save_as.phtml R templates/designer/page_selector.phtml R templates/designer/query_details.phtml R templates/designer/rename_to_panel.phtml R templates/designer/schema_export.phtml R templates/designer/side_menu.phtml R templates/designer/table_list.phtml R templates/designer/where_query_panel.phtml
Log Message: ----------- Move designer related templates into database folder
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 97083bfd67e305e82f3de65ccde8f459bdcb7ae1 https://github.com/phpmyadmin/phpmyadmin/commit/97083bfd67e305e82f3de65ccde8... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-08-10 (Mon, 10 Aug 2015)
Changed paths: M libraries/controllers/TableSearchController.class.php A templates/secondary_tabs.phtml R templates/table/secondary_tabs.phtml
Log Message: ----------- Secondary tabs is generic enough to be moved out of table related template folder
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 4ab54810842eea891733912917cdb8a829b5a5c8 https://github.com/phpmyadmin/phpmyadmin/commit/4ab54810842eea891733912917cd... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-08-10 (Mon, 10 Aug 2015)
Changed paths: M libraries/display_create_table.lib.php A templates/database/create_table.phtml R templates/table/create_table.phtml
Log Message: ----------- create_table.phtml is more suited with database related templates
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 5cf4f990ff305c96d6c41655eeaf58df3050043d https://github.com/phpmyadmin/phpmyadmin/commit/5cf4f990ff305c96d6c41655eeaf... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-08-10 (Mon, 10 Aug 2015)
Changed paths: M libraries/central_columns.lib.php M libraries/normalization.lib.php M libraries/tbl_columns_definition_form.inc.php A templates/columns_definitions/column_adjust_privileges.phtml A templates/columns_definitions/column_attribute.phtml A templates/columns_definitions/column_attributes.phtml A templates/columns_definitions/column_auto_increment.phtml A templates/columns_definitions/column_comment.phtml A templates/columns_definitions/column_default.phtml A templates/columns_definitions/column_definitions_form.phtml A templates/columns_definitions/column_extra.phtml A templates/columns_definitions/column_indexes.phtml A templates/columns_definitions/column_length.phtml A templates/columns_definitions/column_name.phtml A templates/columns_definitions/column_null.phtml A templates/columns_definitions/column_type.phtml A templates/columns_definitions/column_virtuality.phtml A templates/columns_definitions/mime_type.phtml A templates/columns_definitions/move_column.phtml A templates/columns_definitions/table_fields_definitions.phtml A templates/columns_definitions/transformation.phtml A templates/columns_definitions/transformation_option.phtml R templates/table/columns_definitions/column_adjust_privileges.phtml R templates/table/columns_definitions/column_attribute.phtml R templates/table/columns_definitions/column_attributes.phtml R templates/table/columns_definitions/column_auto_increment.phtml R templates/table/columns_definitions/column_comment.phtml R templates/table/columns_definitions/column_default.phtml R templates/table/columns_definitions/column_definitions_form.phtml R templates/table/columns_definitions/column_extra.phtml R templates/table/columns_definitions/column_indexes.phtml R templates/table/columns_definitions/column_length.phtml R templates/table/columns_definitions/column_name.phtml R templates/table/columns_definitions/column_null.phtml R templates/table/columns_definitions/column_type.phtml R templates/table/columns_definitions/column_virtuality.phtml R templates/table/columns_definitions/mime_type.phtml R templates/table/columns_definitions/move_column.phtml R templates/table/columns_definitions/table_fields_definitions.phtml R templates/table/columns_definitions/transformation.phtml R templates/table/columns_definitions/transformation_option.phtml M test/libraries/PMA_tbl_columns_definition_form_test.php
Log Message: ----------- 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 madhura.cj@gmail.com
Commit: 8e3a747bd732f83c3bb685927c5df591f55f0754 https://github.com/phpmyadmin/phpmyadmin/commit/8e3a747bd732f83c3bb685927c5d... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-08-10 (Mon, 10 Aug 2015)
Changed paths: M libraries/controllers/StructureController.class.php M libraries/controllers/TableRelationController.class.php M libraries/mult_submits.inc.php A templates/database/structure/body_for_table_summary.phtml A templates/database/structure/browse_table.phtml A templates/database/structure/browse_table_label.phtml A templates/database/structure/check_all_tables.phtml A templates/database/structure/empty_table.phtml A templates/database/structure/favorite_anchor.phtml A templates/database/structure/print_view_data_dictionary_link.phtml A templates/database/structure/search_table.phtml A templates/database/structure/show_create.phtml A templates/database/structure/show_create_row.phtml A templates/database/structure/sortable_header.phtml A templates/database/structure/structure_table_row.phtml A templates/database/structure/table_header.phtml A templates/database/structure/tracking_icon.phtml R templates/structure/action_row_in_structure_table.phtml R templates/structure/actions_in_table_structure.phtml R templates/structure/add_column.phtml R templates/structure/body_for_table_summary.phtml R templates/structure/browse_table.phtml R templates/structure/browse_table_label.phtml R templates/structure/check_all_table_column.phtml R templates/structure/check_all_tables.phtml R templates/structure/display_structure.phtml R templates/structure/display_table_stats.phtml R templates/structure/empty_table.phtml R templates/structure/favorite_anchor.phtml R templates/structure/move_columns_dialog.phtml R templates/structure/optional_action_links.phtml R templates/structure/print_view_data_dictionary_link.phtml R templates/structure/row_stats_table.phtml R templates/structure/search_table.phtml R templates/structure/secondary_tabs.phtml R templates/structure/show_create.phtml R templates/structure/show_create_row.phtml R templates/structure/sortable_header.phtml R templates/structure/structure_table_row.phtml R templates/structure/table_header.phtml R templates/structure/table_structure_header.phtml R templates/structure/table_structure_row.phtml R templates/structure/tracking_icon.phtml A templates/table/secondary_tabs.phtml A templates/table/structure/action_row_in_structure_table.phtml A templates/table/structure/actions_in_table_structure.phtml A templates/table/structure/add_column.phtml A templates/table/structure/check_all_table_column.phtml A templates/table/structure/display_structure.phtml A templates/table/structure/display_table_stats.phtml A templates/table/structure/move_columns_dialog.phtml A templates/table/structure/optional_action_links.phtml A templates/table/structure/row_stats_table.phtml A templates/table/structure/table_structure_header.phtml A templates/table/structure/table_structure_row.phtml
Log Message: ----------- Split structure related templates to database and table
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: b78dba8d3978508652cfb8c7d2e19b70e6a70233 https://github.com/phpmyadmin/phpmyadmin/commit/b78dba8d3978508652cfb8c7d2e1... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-08-10 (Mon, 10 Aug 2015)
Changed paths: M libraries/controllers/TableIndexesController.class.php R templates/index_form.phtml A templates/table/index_form.phtml
Log Message: ----------- Group index template with templates related to table level operations
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 8854ce7f29fa209adfa155a6161c4967999b7873 https://github.com/phpmyadmin/phpmyadmin/commit/8854ce7f29fa209adfa155a6161c... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-08-10 (Mon, 10 Aug 2015)
Changed paths: M libraries/navigation/NavigationHeader.class.php R templates/logo.phtml A templates/navigation/logo.phtml
Log Message: ----------- Move logo template to navigation folder
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 2109cd3c358b3c88b46c40ba269134d8bd3540cd https://github.com/phpmyadmin/phpmyadmin/commit/2109cd3c358b3c88b46c40ba2691... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-08-10 (Mon, 10 Aug 2015)
Changed paths: M libraries/controllers/StructureController.class.php M libraries/controllers/TableChartController.class.php M libraries/controllers/TableGisVisualizationController.class.php M libraries/controllers/TableIndexesController.class.php M libraries/controllers/TableRelationController.class.php M libraries/controllers/TableSearchController.class.php M libraries/db_designer.lib.php M libraries/display_create_table.lib.php M libraries/mult_submits.inc.php M libraries/navigation/NavigationHeader.class.php A templates/database/create_table.phtml A templates/database/designer/aggregate_query_panel.phtml A templates/database/designer/canvas.phtml A templates/database/designer/database_tables.phtml A templates/database/designer/delete_relation_panel.phtml A templates/database/designer/edit_delete_pages.phtml A templates/database/designer/having_query_panel.phtml A templates/database/designer/js_fields.phtml A templates/database/designer/new_relation_panel.phtml A templates/database/designer/options_panel.phtml A templates/database/designer/page_save_as.phtml A templates/database/designer/page_selector.phtml A templates/database/designer/query_details.phtml A templates/database/designer/rename_to_panel.phtml A templates/database/designer/schema_export.phtml A templates/database/designer/side_menu.phtml A templates/database/designer/table_list.phtml A templates/database/designer/where_query_panel.phtml A templates/database/structure/body_for_table_summary.phtml A templates/database/structure/browse_table.phtml A templates/database/structure/browse_table_label.phtml A templates/database/structure/check_all_tables.phtml A templates/database/structure/empty_table.phtml A templates/database/structure/favorite_anchor.phtml A templates/database/structure/print_view_data_dictionary_link.phtml A templates/database/structure/search_table.phtml A templates/database/structure/show_create.phtml A templates/database/structure/show_create_row.phtml A templates/database/structure/sortable_header.phtml A templates/database/structure/structure_table_row.phtml A templates/database/structure/table_header.phtml A templates/database/structure/tracking_icon.phtml R templates/designer/aggregate_query_panel.phtml R templates/designer/canvas.phtml R templates/designer/database_tables.phtml R templates/designer/delete_relation_panel.phtml R templates/designer/edit_delete_pages.phtml R templates/designer/having_query_panel.phtml R templates/designer/js_fields.phtml R templates/designer/new_relation_panel.phtml R templates/designer/options_panel.phtml R templates/designer/page_save_as.phtml R templates/designer/page_selector.phtml R templates/designer/query_details.phtml R templates/designer/rename_to_panel.phtml R templates/designer/schema_export.phtml R templates/designer/side_menu.phtml R templates/designer/table_list.phtml R templates/designer/where_query_panel.phtml R templates/gis_visualization/gis_visualization.phtml R templates/index_form.phtml R templates/logo.phtml A templates/navigation/logo.phtml A templates/secondary_tabs.phtml R templates/structure/action_row_in_structure_table.phtml R templates/structure/actions_in_table_structure.phtml R templates/structure/add_column.phtml R templates/structure/body_for_table_summary.phtml R templates/structure/browse_table.phtml R templates/structure/browse_table_label.phtml R templates/structure/check_all_table_column.phtml R templates/structure/check_all_tables.phtml R templates/structure/display_structure.phtml R templates/structure/display_table_stats.phtml R templates/structure/empty_table.phtml R templates/structure/favorite_anchor.phtml R templates/structure/move_columns_dialog.phtml R templates/structure/optional_action_links.phtml R templates/structure/print_view_data_dictionary_link.phtml R templates/structure/row_stats_table.phtml R templates/structure/search_table.phtml R templates/structure/secondary_tabs.phtml R templates/structure/show_create.phtml R templates/structure/show_create_row.phtml R templates/structure/sortable_header.phtml R templates/structure/structure_table_row.phtml R templates/structure/table_header.phtml R templates/structure/table_structure_header.phtml R templates/structure/table_structure_row.phtml R templates/structure/tracking_icon.phtml A templates/table/chart/tbl_chart.phtml R templates/table/column_comparison_operators.phtml R templates/table/create_table.phtml R templates/table/fields_table.phtml R templates/table/form_tag.phtml A templates/table/gis_visualization/gis_visualization.phtml A templates/table/index_form.phtml R templates/table/input_box.phtml R templates/table/options.phtml R templates/table/options_zoom.phtml A templates/table/relation/common_form.phtml A templates/table/relation/dropdown_generate.phtml A templates/table/relation/foreign_key_row.phtml A templates/table/relation/internal_relational_row.phtml A templates/table/relation/relational_dropdown.phtml R templates/table/replace_preview.phtml R templates/table/rows_normal.phtml R templates/table/rows_zoom.phtml A templates/table/search/column_comparison_operators.phtml A templates/table/search/fields_table.phtml A templates/table/search/form_tag.phtml A templates/table/search/input_box.phtml A templates/table/search/options.phtml A templates/table/search/options_zoom.phtml A templates/table/search/replace_preview.phtml A templates/table/search/rows_normal.phtml A templates/table/search/rows_zoom.phtml A templates/table/search/search_and_replace.phtml A templates/table/search/selection_form.phtml A templates/table/search/table_header.phtml A templates/table/search/zoom_result_form.phtml R templates/table/search_and_replace.phtml M templates/table/secondary_tabs.phtml R templates/table/selection_form.phtml A templates/table/structure/action_row_in_structure_table.phtml A templates/table/structure/actions_in_table_structure.phtml A templates/table/structure/add_column.phtml A templates/table/structure/check_all_table_column.phtml A templates/table/structure/display_structure.phtml A templates/table/structure/display_table_stats.phtml A templates/table/structure/move_columns_dialog.phtml A templates/table/structure/optional_action_links.phtml A templates/table/structure/row_stats_table.phtml A templates/table/structure/table_structure_header.phtml A templates/table/structure/table_structure_row.phtml R templates/table/table_header.phtml R templates/table/zoom_result_form.phtml R templates/tbl_chart.phtml R templates/tbl_relation/common_form.phtml R templates/tbl_relation/dropdown_generate.phtml R templates/tbl_relation/foreign_key_row.phtml R templates/tbl_relation/internal_relational_row.phtml R templates/tbl_relation/relational_dropdown.phtml
Log Message: ----------- Merge pull request #11378 from madhuracj/templates
Organize templates into a meaningful structure
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/625f4e4f9fcc...2109cd3c358b
-
Madhura Jayaratne