Merge pull request #11378 from madhuracj/templates

Organize templates into a meaningful structure

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('</tbody>');
             $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('</table>');
             //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,

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,

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,

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,

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,

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,

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();
 }

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)
     );
 }

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

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,

templates/database/structure/show_create.phtml

@@ -13,7 +13,7 @@
     ?>
     <?php if (! empty($tables)): ?>
         <?php
-            echo PMA\Template::get('structure/show_create_row')->render(
+            echo PMA\Template::get('database/structure/show_create_row')->render(
               array(
                   'title' => __('Tables'),
                   'raw_title' => 'Table',
@@ -25,7 +25,7 @@
 
     <?php if (! empty($views)): ?>
         <?php
-        echo PMA\Template::get('structure/show_create_row')->render(
+        echo PMA\Template::get('database/structure/show_create_row')->render(
             array(
                 'title' => __('Views'),
                 'raw_title' => 'View',

templates/database/structure/structure_table_row.phtml

@@ -22,7 +22,7 @@
     ?>
     <?php if ($GLOBALS['cfg']['NumFavoriteTables'] > 0): ?>
         <td class="center print_ignore">
-            <?php echo PMA\Template::get('structure/favorite_anchor')->render(
+            <?php echo PMA\Template::get('database/structure/favorite_anchor')->render(
                 array(
                     'db' => $db,
                     'current_table' => $current_table,

templates/database/structure/table_header.phtml

@@ -16,7 +16,7 @@ if ($GLOBALS['cfg']['NumFavoriteTables'] > 0) {
     <thead>
         <tr>
             <th class="print_ignore"></th>
-            <th><?php echo PMA\Template::get('structure/sortable_header')->render(
+            <th><?php echo PMA\Template::get('database/structure/sortable_header')->render(
                    array(
                        'title' => __('Table'),
                        'sort' => 'table',
@@ -31,7 +31,7 @@ if ($GLOBALS['cfg']['NumFavoriteTables'] > 0) {
             </th>
             <!-- larger values are more interesting so default sort order is DESC-->
             <th>
-                <?php echo PMA\Template::get('structure/sortable_header')->render(
+                <?php echo PMA\Template::get('database/structure/sortable_header')->render(
                     array(
                         'title' => __('Rows'),
                         'sort' => 'records',
@@ -43,14 +43,14 @@ if ($GLOBALS['cfg']['NumFavoriteTables'] > 0) {
                         . ' count. See [doc@faq3-11]FAQ 3.11[/doc].'))); ?>
             </th>
             <?php if (!($GLOBALS['cfg']['PropertiesNumColumns'] > 1)): ?>
-                <th><?php echo PMA\Template::get('structure/sortable_header')->render(
+                <th><?php echo PMA\Template::get('database/structure/sortable_header')->render(
                         array(
                             'title' => __('Type'),
                             'sort' => 'type',
                             'initial_sort_order' => 'ASC'
                         )
                     ); $cnt++; ?></th>
-                <th><?php echo PMA\Template::get('structure/sortable_header')->render(
+                <th><?php echo PMA\Template::get('database/structure/sortable_header')->render(
                         array(
                             'title' => __('Collation'),
                             'sort' => 'collation',
@@ -61,7 +61,7 @@ if ($GLOBALS['cfg']['NumFavoriteTables'] > 0) {
 
             <?php if ($GLOBALS['is_show_stats']): ?>
                 <!-- larger values are more interesting so default sort order is DESC -->
-                <th><?php echo PMA\Template::get('structure/sortable_header')->render(
+                <th><?php echo PMA\Template::get('database/structure/sortable_header')->render(
                         array(
                             'title' => __('Size'),
                             'sort' => 'size',
@@ -69,7 +69,7 @@ if ($GLOBALS['cfg']['NumFavoriteTables'] > 0) {
                         )
                     ); $cnt++; ?></th>
                 <!-- larger values are more interesting so default sort order is DESC -->
-                <th><?php echo PMA\Template::get('structure/sortable_header')->render(
+                <th><?php echo PMA\Template::get('database/structure/sortable_header')->render(
                         array(
                             'title' => __('Overhead'),
                             'sort' => 'overhead',
@@ -79,7 +79,7 @@ if ($GLOBALS['cfg']['NumFavoriteTables'] > 0) {
             <?php endif; ?>
 
             <?php if ($GLOBALS['cfg']['ShowDbStructureComment']): ?>
-                <th><?php echo PMA\Template::get('structure/sortable_header')->render(
+                <th><?php echo PMA\Template::get('database/structure/sortable_header')->render(
                         array(
                             'title' => __('Comment'),
                             'sort' => 'comment',
@@ -90,7 +90,7 @@ if ($GLOBALS['cfg']['NumFavoriteTables'] > 0) {
 
             <?php if ($GLOBALS['cfg']['ShowDbStructureCreation']): ?>
                 <!-- newer values are more interesting so default sort order is DESC -->
-                <th><?php echo PMA\Template::get('structure/sortable_header')->render(
+                <th><?php echo PMA\Template::get('database/structure/sortable_header')->render(
                         array(
                             'title' => __('Creation'),
                             'sort' => 'creation',
@@ -101,7 +101,7 @@ if ($GLOBALS['cfg']['NumFavoriteTables'] > 0) {
 
             <?php if ($GLOBALS['cfg']['ShowDbStructureLastUpdate']): ?>
                 <!-- newer values are more interesting so default sort order is DESC -->
-                <th><?php echo PMA\Template::get('structure/sortable_header')->render(
+                <th><?php echo PMA\Template::get('database/structure/sortable_header')->render(
                         array(
                             'title' => __('Last update'),
                             'sort' => 'last_update',
@@ -112,7 +112,7 @@ if ($GLOBALS['cfg']['NumFavoriteTables'] > 0) {
 
             <?php if ($GLOBALS['cfg']['ShowDbStructureLastCheck']): ?>
                 <!-- newer values are more interesting so default sort order is DESC -->
-                <th><?php echo PMA\Template::get('structure/sortable_header')->render(
+                <th><?php echo PMA\Template::get('database/structure/sortable_header')->render(
                         array(
                             'title' => __('Last check'),
                             'sort' => 'last_check',

templates/secondary_tabs.phtml

@@ -0,0 +1,6 @@
+<ul id="topmenu2">
+    <?php foreach ($sub_tabs as $tab): ?>
+        <?php echo PMA_Util::getHtmlTab($tab, $url_params); ?>
+    <?php endforeach; ?>
+</ul>
+<div class="clearfloat"></div>

templates/structure/secondary_tabs.phtml

@@ -1,19 +0,0 @@
-<?php $cfgRelation = PMA_getRelationsParam(); ?>
-<?php if ($cfgRelation['relwork'] ||
-    PMA_Util::isForeignKeySupported($engine)): ?>
-    <ul id="topmenu2">
-        <?php echo PMA_Util::getHtmlTab(array(
-            'icon' => 'b_props',
-            'link' => 'tbl_structure.php',
-            'text' => __('Table structure'),
-            'id' => 'table_strucuture_id'
-        ), $url_params); ?>
-        <?php echo PMA_Util::getHtmlTab(array(
-            'icon' => 'b_relations',
-            'link' => 'tbl_relation.php',
-            'text' => __('Relation view'),
-            'id' => 'table_relation_id'
-        ), $url_params); ?>
-    </ul>
-    <div class="clearfloat"></div>
-<?php endif; ?>

templates/table/relation/common_form.phtml

@@ -17,7 +17,7 @@
                     </th>
                     <?php $odd_row = true; ?>
                     <?php for ($i = 0; $i < $saved_row_cnt; $i++): ?>
-                        <?php echo PMA\Template::get('tbl_relation/internal_relational_row')->render(
+                        <?php echo PMA\Template::get('table/relation/internal_relational_row')->render(
                             array(
                                 'save_row' => $save_row,
                                 'i' => $i,
@@ -51,7 +51,7 @@
                 </tr>
                 <?php $odd_row = true; $i = 0; ?>
                 <?php foreach ($existrel_foreign as $key => $one_key): ?>
-                    <?php echo PMA\Template::get('tbl_relation/foreign_key_row')->render(
+                    <?php echo PMA\Template::get('table/relation/foreign_key_row')->render(
                         array(
                             'one_key' => $one_key,
                             'odd_row' => $odd_row,
@@ -64,7 +64,7 @@
                     );
                     $odd_row = ! $odd_row;?>
                 <?php endforeach; ?>
-                <?php echo PMA\Template::get('tbl_relation/foreign_key_row')->render(
+                <?php echo PMA\Template::get('table/relation/foreign_key_row')->render(
                     array(
                         'one_key' => array(),
                         'odd_row' => $odd_row,

templates/table/relation/foreign_key_row.phtml

@@ -104,7 +104,7 @@ if ($foreign_db) {
         </span>
         <div class="floatleft">
             <span class="formelement">
-                <?php echo PMA\Template::get('tbl_relation/dropdown_generate')->render(
+                <?php echo PMA\Template::get('table/relation/dropdown_generate')->render(
                     array(
                         'dropdown_question' => 'ON DELETE',
                         'select_name' => 'on_delete[' . $i . ']',
@@ -114,7 +114,7 @@ if ($foreign_db) {
                 ); ?>
             </span>
             <span class="formelement">
-                <?php echo PMA\Template::get('tbl_relation/dropdown_generate')->render(
+                <?php echo PMA\Template::get('table/relation/dropdown_generate')->render(
                     array(
                         'dropdown_question' => 'ON UPDATE',
                         'select_name' => 'on_update[' . $i . ']',
@@ -129,7 +129,7 @@ if ($foreign_db) {
         <?php if (isset($one_key['index_list'])): ?>
             <?php foreach ($one_key['index_list'] as $key => $column): ?>
                 <span class="formelement clearfloat">
-                    <?php echo PMA\Template::get('tbl_relation/dropdown_generate')->render(
+                    <?php echo PMA\Template::get('table/relation/dropdown_generate')->render(
                         array(
                             'dropdown_question' => '',
                             'select_name' => 'foreign_key_fields_name[' . $i . '][]',
@@ -141,7 +141,7 @@ if ($foreign_db) {
             <?php endforeach; ?>
         <?php else: ?>
             <span class="formelement clearfloat">
-                <?php echo PMA\Template::get('tbl_relation/dropdown_generate')->render(
+                <?php echo PMA\Template::get('table/relation/dropdown_generate')->render(
                     array(
                         'dropdown_question' => '',
                         'select_name' => 'foreign_key_fields_name[' . $i . '][]',
@@ -159,7 +159,7 @@ if ($foreign_db) {
     </td>
     <td>
         <span class="formelement clearfloat">
-            <?php echo PMA\Template::get('tbl_relation/relational_dropdown')->render(
+            <?php echo PMA\Template::get('table/relation/relational_dropdown')->render(
                 array(
                     'name' => 'destination_foreign_db[' . $i . ']',
                     'title' => __('Database'),
@@ -170,7 +170,7 @@ if ($foreign_db) {
     </td>
     <td>
         <span class="formelement clearfloat">
-            <?php echo PMA\Template::get('tbl_relation/relational_dropdown')->render(
+            <?php echo PMA\Template::get('table/relation/relational_dropdown')->render(
                 array(
                     'name' => 'destination_foreign_table[' . $i . ']',
                     'title' => __('Table'),
@@ -188,7 +188,7 @@ if ($foreign_db) {
                 $columns = $table_obj->getUniqueColumns(false, false);
                 ?>
                 <span class="formelement clearfloat">
-                    <?php echo PMA\Template::get('tbl_relation/relational_dropdown')->render(
+                    <?php echo PMA\Template::get('table/relation/relational_dropdown')->render(
                         array(
                             'name' => 'destination_foreign_column[' . $i . '][]',
                             'title' => __('Column'),
@@ -200,7 +200,7 @@ if ($foreign_db) {
             <?php endforeach; ?>
         <?php else: ?>
             <span class="formelement clearfloat">
-                <?php echo PMA\Template::get('tbl_relation/relational_dropdown')->render(
+                <?php echo PMA\Template::get('table/relation/relational_dropdown')->render(
                     array(
                         'name' => 'destination_foreign_column[' . $i . '][]',
                         'title' => __('Column'),

templates/table/relation/internal_relational_row.phtml

@@ -49,7 +49,7 @@ if ($foreign_db && $foreign_table) {
     </td>
 
     <td>
-        <?php echo PMA\Template::get('tbl_relation/relational_dropdown')->render(
+        <?php echo PMA\Template::get('table/relation/relational_dropdown')->render(
             array(
                 'name' => 'destination_db[' . $myfield_md5 . ']',
                 'title' => __('Database'),
@@ -57,7 +57,7 @@ if ($foreign_db && $foreign_table) {
                 'foreign' => $foreign_db
             )
         ); ?>
-        <?php echo PMA\Template::get('tbl_relation/relational_dropdown')->render(
+        <?php echo PMA\Template::get('table/relation/relational_dropdown')->render(
             array(
                 'name' => 'destination_table[' . $myfield_md5 . ']',
                 'title' => __('Table'),
@@ -65,7 +65,7 @@ if ($foreign_db && $foreign_table) {
                 'foreign' => $foreign_table
             )
         ); ?>
-        <?php echo PMA\Template::get('tbl_relation/relational_dropdown')->render(
+        <?php echo PMA\Template::get('table/relation/relational_dropdown')->render(
             array(
                 'name' => 'destination_column[' . $myfield_md5 . ']',
                 'title' => __('Column'),

templates/table/search/fields_table.phtml

@@ -1,17 +1,17 @@
 <table class="data" <?php if ($searchType == 'zoom') echo 'id="tableFieldsId"'; ?>>
-    <?php echo PMA\Template::get('table/table_header')
+    <?php echo PMA\Template::get('table/search/table_header')
         ->render(array(
             'geomColumnFlag' => $geomColumnFlag
         )); ?>
     <tbody>
     <?php if ($searchType == 'zoom'): ?>
-        <?php echo PMA\Template::get('table/rows_zoom')
+        <?php echo PMA\Template::get('table/search/rows_zoom')
             ->render(array(
                 'self' => $self,
                 'columnNames' => $columnNames
             )); ?>
     <?php else: ?>
-        <?php echo PMA\Template::get('table/rows_normal')
+        <?php echo PMA\Template::get('table/search/rows_normal')
             ->render(array(
                 'self' => $self,
                 'geomColumnFlag' => $geomColumnFlag,

templates/table/search/selection_form.phtml

@@ -1,4 +1,4 @@
-<?php echo PMA\Template::get('table/form_tag')
+<?php echo PMA\Template::get('table/search/form_tag')
     ->render(array(
         'searchType' => $searchType,
         'db' => $db,
@@ -11,7 +11,7 @@
             <legend>
                 <?php echo __('Do a "query by example" (wildcard: "%") for two different columns'); ?>
             </legend>
-            <?php echo PMA\Template::get('table/fields_table')
+            <?php echo PMA\Template::get('table/search/fields_table')
                 ->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 @@
             <legend>
                 <?php echo __('Do a "query by example" (wildcard: "%")'); ?>
             </legend>
-            <?php echo PMA\Template::get('table/fields_table')
+            <?php echo PMA\Template::get('table/search/fields_table')
                 ->render(array(
                     'self' => $self,
                     'searchType' => $searchType,
@@ -47,7 +47,7 @@
             <div id="popup_background">
             </div>
         </fieldset>
-        <?php echo PMA\Template::get('table/options')
+        <?php echo PMA\Template::get('table/search/options')
             ->render(array(
                 'columnNames' => $columnNames
             )); ?>
@@ -58,7 +58,7 @@
             <legend>
                 <?php echo __('Find and replace'); ?>
             </legend>
-            <?php echo PMA\Template::get('table/search_and_replace')
+            <?php echo PMA\Template::get('table/search/search_and_replace')
                 ->render(array(
                     'columnNames' => $columnNames,
                     'columnTypes' => $columnTypes

templates/table/search/zoom_result_form.phtml

@@ -74,7 +74,7 @@
 <!-- Column's Input box-->
                         <th>
                             <?php
-                            echo PMA\Template::get('table/input_box')->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_',

templates/table/secondary_tabs.phtml

@@ -1,6 +1,19 @@
-<ul id="topmenu2">
-    <?php foreach ($sub_tabs as $tab): ?>
-        <?php echo PMA_Util::getHtmlTab($tab, $url_params); ?>
-    <?php endforeach; ?>
-</ul>
-<div class="clearfloat"></div>
+<?php $cfgRelation = PMA_getRelationsParam(); ?>
+<?php if ($cfgRelation['relwork'] ||
+    PMA_Util::isForeignKeySupported($engine)): ?>
+    <ul id="topmenu2">
+        <?php echo PMA_Util::getHtmlTab(array(
+            'icon' => 'b_props',
+            'link' => 'tbl_structure.php',
+            'text' => __('Table structure'),
+            'id' => 'table_strucuture_id'
+        ), $url_params); ?>
+        <?php echo PMA_Util::getHtmlTab(array(
+            'icon' => 'b_relations',
+            'link' => 'tbl_relation.php',
+            'text' => __('Relation view'),
+            'id' => 'table_relation_id'
+        ), $url_params); ?>
+    </ul>
+    <div class="clearfloat"></div>
+<?php endif; ?>

templates/table/structure/actions_in_table_structure.phtml

@@ -1,7 +1,7 @@
 <td class="print_ignore"><ul class="table-structure-actions resizable-menu">
     <!-- Add primary -->
     <?php
-        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,
@@ -21,7 +21,7 @@
     ?>
     <!-- Add unique -->
     <?php
-        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,
@@ -41,7 +41,7 @@
     ?>
     <!-- Add index -->
     <?php
-        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,
@@ -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,

templates/table/structure/display_structure.phtml

@@ -11,7 +11,7 @@
     <?php endif; ?>
     <table id="tablestructure" class="data topmargin">
         <!-- table header -->
-        <?php echo PMA\Template::get('structure/table_structure_header')->render(
+        <?php echo PMA\Template::get('table/structure/table_structure_header')->render(
             array(
                 'db_is_system_schema' => $db_is_system_schema,
                 'tbl_is_view' => $tbl_is_view
@@ -82,7 +82,7 @@
             ?>
         <tr class="<?php echo ($odd_row ? 'odd': 'even'); ?>">
             <?php $odd_row = !$odd_row; ?>
-            <?php echo PMA\Template::get('structure/table_structure_row')->render(
+            <?php echo PMA\Template::get('table/structure/table_structure_row')->render(
                 array(
                     'row' => $row,
                     'rownum' => $rownum,
@@ -100,7 +100,7 @@
                 )
             ); ?>
             <?php if (! $tbl_is_view && ! $db_is_system_schema): ?>
-                <?php echo PMA\Template::get('structure/actions_in_table_structure')->render(
+                <?php echo PMA\Template::get('table/structure/actions_in_table_structure')->render(
                     array(
                         'extracted_columnspec' => $extracted_columnspec,
                         'type' => (!empty($extracted_columnspec['print_type'])) ? $extracted_columnspec['print_type'] : ' ',
@@ -120,7 +120,7 @@
         <?php endforeach; ?>
         </tbody>
     </table>
-    <?php echo PMA\Template::get('structure/check_all_table_column')->render(
+    <?php echo PMA\Template::get('table/structure/check_all_table_column')->render(
         array(
             'pmaThemeImage' => $GLOBALS['pmaThemeImage'],
             'text_dir' => $GLOBALS['text_dir'],
@@ -131,7 +131,7 @@
     ); ?>
 </form>
 <hr class="print_ignore"/>
-<?php echo PMA\Template::get('structure/move_columns_dialog')->render(); ?>
+<?php echo PMA\Template::get('table/structure/move_columns_dialog')->render(); ?>
 <!--Work on the table-->
 <div id="structure-action-links">
     <?php if ($tbl_is_view): ?>
@@ -140,7 +140,7 @@
             PMA_Util::getIcon('b_edit.png', __('Edit view'), true)
         ); ?>
     <?php endif; ?>
-    <?php echo PMA\Template::get('structure/optional_action_links')->render(
+    <?php echo PMA\Template::get('table/structure/optional_action_links')->render(
         array(
             'url_query' => $url_query,
             'tbl_is_view' => $tbl_is_view,
@@ -150,7 +150,7 @@
 </div>
 <?php if (! $tbl_is_view && ! $db_is_system_schema): ?>
     <br />
-    <?php echo PMA\Template::get('structure/add_column')->render(
+    <?php echo PMA\Template::get('table/structure/add_column')->render(
         array('columns_list' => $columns_list)
     ); ?>
 <?php endif; ?>

templates/table/structure/display_table_stats.phtml

@@ -62,7 +62,7 @@
             </table>
         <?php endif; ?>
         <?php
-            echo PMA\Template::get('structure/row_stats_table')->render(
+            echo PMA\Template::get('table/structure/row_stats_table')->render(
               array(
                   'showtable' => $showtable,
                   'tbl_collation' => $tbl_collation,