Revert "Move column definitions related templates inside table folder…

…" Column definitions are used in central column and normalization as well

This reverts commit 5ca01bf.

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>

libraries/central_columns.lib.php

@@ -862,7 +862,7 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $odd_row, $row_num, $db)
         . '<span>' . htmlspecialchars($row['col_name']) . '</span>'
         . '<input name="orig_col_name" type="hidden" '
         . 'value="' . htmlspecialchars($row['col_name']) . '">'
-        . PMA\Template::get('table/columns_definitions/column_name')
+        . PMA\Template::get('columns_definitions/column_name')
             ->render(
                 array(
                 'columnNumber' => $row_num,
@@ -880,7 +880,7 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $odd_row, $row_num, $db)
     $tableHtml .=
         '<td name = "col_type" class="nowrap"><span>'
         . htmlspecialchars($row['col_type']) . '</span>'
-        . PMA\Template::get('table/columns_definitions/column_type')
+        . PMA\Template::get('columns_definitions/column_type')
             ->render(
                 array(
                 'columnNumber' => $row_num,
@@ -895,7 +895,7 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $odd_row, $row_num, $db)
         '<td class="nowrap" name="col_length">'
         . '<span>' . ($row['col_length']?htmlspecialchars($row['col_length']):"")
         . '</span>'
-        . PMA\Template::get('table/columns_definitions/column_length')->render(
+        . PMA\Template::get('columns_definitions/column_length')->render(
             array(
                 'columnNumber' => $row_num,
                 'ci' => 2,
@@ -923,7 +923,7 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $odd_row, $row_num, $db)
         '<td class="nowrap" name="col_default"><span>' . (isset($row['col_default'])
             ? htmlspecialchars($row['col_default']) : 'None')
         . '</span>'
-        . PMA\Template::get('table/columns_definitions/column_default')
+        . PMA\Template::get('columns_definitions/column_default')
             ->render(
                 array(
                 'columnNumber' => $row_num,
@@ -949,7 +949,7 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $odd_row, $row_num, $db)
         ($row['col_attribute']
             ? htmlspecialchars($row['col_attribute']) : "" )
         . '</span>'
-        . PMA\Template::get('table/columns_definitions/column_attribute')
+        . PMA\Template::get('columns_definitions/column_attribute')
             ->render(
                 array(
                 'columnNumber' => $row_num,
@@ -965,7 +965,7 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $odd_row, $row_num, $db)
         '<td class="nowrap" name="col_isNull">'
         . '<span>' . ($row['col_isNull'] ? __('Yes') : __('No'))
         . '</span>'
-        . PMA\Template::get('table/columns_definitions/column_null')
+        . PMA\Template::get('columns_definitions/column_null')
             ->render(
                 array(
                 'columnNumber' => $row_num,
@@ -981,7 +981,7 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $odd_row, $row_num, $db)
     $tableHtml .=
         '<td class="nowrap" name="col_extra"><span>'
         . htmlspecialchars($row['col_extra']) . '</span>'
-        . PMA\Template::get('table/columns_definitions/column_extra')->render(
+        . PMA\Template::get('columns_definitions/column_extra')->render(
             array(
                 'columnNumber' => $row_num,
                 'ci' => 7,
@@ -1012,7 +1012,7 @@ function PMA_getHTMLforCentralColumnsEditTableRow($row, $odd_row, $row_num)
         . '<input name="orig_col_name[' . $row_num . ']" type="hidden" '
         . 'value="' . htmlspecialchars($row['col_name']) . '">'
         . '<td name="col_name" class="nowrap">'
-        . PMA\Template::get('table/columns_definitions/column_name')
+        . PMA\Template::get('columns_definitions/column_name')
             ->render(
                 array(
                 'columnNumber' => $row_num,
@@ -1029,7 +1029,7 @@ function PMA_getHTMLforCentralColumnsEditTableRow($row, $odd_row, $row_num)
         . '</td>';
     $tableHtml .=
         '<td name = "col_type" class="nowrap">'
-        . PMA\Template::get('table/columns_definitions/column_type')
+        . PMA\Template::get('columns_definitions/column_type')
             ->render(
                 array(
                 'columnNumber' => $row_num,
@@ -1042,7 +1042,7 @@ function PMA_getHTMLforCentralColumnsEditTableRow($row, $odd_row, $row_num)
         . '</td>';
     $tableHtml .=
         '<td class="nowrap" name="col_length">'
-        . PMA\Template::get('table/columns_definitions/column_length')->render(
+        . PMA\Template::get('columns_definitions/column_length')->render(
             array(
                 'columnNumber' => $row_num,
                 'ci' => 2,
@@ -1067,7 +1067,7 @@ function PMA_getHTMLforCentralColumnsEditTableRow($row, $odd_row, $row_num)
     }
     $tableHtml .=
         '<td class="nowrap" name="col_default">'
-        . PMA\Template::get('table/columns_definitions/column_default')
+        . PMA\Template::get('columns_definitions/column_default')
             ->render(
                 array(
                 'columnNumber' => $row_num,
@@ -1087,7 +1087,7 @@ function PMA_getHTMLforCentralColumnsEditTableRow($row, $odd_row, $row_num)
         . '</td>';
     $tableHtml .=
         '<td class="nowrap" name="col_attribute">'
-        . PMA\Template::get('table/columns_definitions/column_attribute')
+        . PMA\Template::get('columns_definitions/column_attribute')
             ->render(
                 array(
                 'columnNumber' => $row_num,
@@ -1103,7 +1103,7 @@ function PMA_getHTMLforCentralColumnsEditTableRow($row, $odd_row, $row_num)
         . '</td>';
     $tableHtml .=
         '<td class="nowrap" name="col_isNull">'
-        . PMA\Template::get('table/columns_definitions/column_null')
+        . PMA\Template::get('columns_definitions/column_null')
             ->render(
                 array(
                 'columnNumber' => $row_num,
@@ -1118,7 +1118,7 @@ function PMA_getHTMLforCentralColumnsEditTableRow($row, $odd_row, $row_num)
 
     $tableHtml .=
         '<td class="nowrap" name="col_extra">'
-        . PMA\Template::get('table/columns_definitions/column_extra')->render(
+        . PMA\Template::get('columns_definitions/column_extra')->render(
             array(
                 'columnNumber' => $row_num,
                 'ci' => 7,
@@ -1270,7 +1270,7 @@ function PMA_getHTMLforAddNewColumn($db)
     $addNewColumn .= '<tr>'
         . '<td></td>'
         . '<td name="col_name" class="nowrap">'
-        . PMA\Template::get('table/columns_definitions/column_name')
+        . PMA\Template::get('columns_definitions/column_name')
             ->render(
                 array(
                 'columnNumber' => 0,
@@ -1284,7 +1284,7 @@ function PMA_getHTMLforAddNewColumn($db)
             )
         . '</td>'
         . '<td name = "col_type" class="nowrap">'
-        . PMA\Template::get('table/columns_definitions/column_type')
+        . PMA\Template::get('columns_definitions/column_type')
             ->render(
                 array(
                 'columnNumber' => 0,
@@ -1296,7 +1296,7 @@ function PMA_getHTMLforAddNewColumn($db)
             )
         . '</td>'
         . '<td class="nowrap" name="col_length">'
-        . PMA\Template::get('table/columns_definitions/column_length')->render(
+        . PMA\Template::get('columns_definitions/column_length')->render(
             array(
                 'columnNumber' => 0,
                 'ci' => 2,
@@ -1307,7 +1307,7 @@ function PMA_getHTMLforAddNewColumn($db)
         )
         . '</td>'
         . '<td class="nowrap" name="col_default">'
-        . PMA\Template::get('table/columns_definitions/column_default')
+        . PMA\Template::get('columns_definitions/column_default')
             ->render(
                 array(
                 'columnNumber' => 0,
@@ -1325,7 +1325,7 @@ function PMA_getHTMLforAddNewColumn($db)
         )
         . '</td>'
         . '<td class="nowrap" name="col_attribute">'
-        . PMA\Template::get('table/columns_definitions/column_attribute')
+        . PMA\Template::get('columns_definitions/column_attribute')
             ->render(
                 array(
                 'columnNumber' => 0,
@@ -1338,7 +1338,7 @@ function PMA_getHTMLforAddNewColumn($db)
             )
         . '</td>'
         . '<td class="nowrap" name="col_isNull">'
-        . PMA\Template::get('table/columns_definitions/column_null')
+        . PMA\Template::get('columns_definitions/column_null')
             ->render(
                 array(
                 'columnNumber' => 0,
@@ -1349,7 +1349,7 @@ function PMA_getHTMLforAddNewColumn($db)
             )
         . '</td>'
         . '<td class="nowrap" name="col_extra">'
-        . PMA\Template::get('table/columns_definitions/column_extra')->render(
+        . PMA\Template::get('columns_definitions/column_extra')->render(
             array(
                 'columnNumber' => 0,
                 'ci' => 7,

libraries/normalization.lib.php

@@ -105,7 +105,7 @@ function PMA_getHtmlForCreateNewColumn(
         );
     }
 
-    return PMA\Template::get('table/columns_definitions/table_fields_definitions')
+    return PMA\Template::get('columns_definitions/table_fields_definitions')
         ->render(
             array(
             'is_backup' => true,

libraries/tbl_columns_definition_form.inc.php

@@ -401,7 +401,7 @@
     );
 } // end for
 
-$html = PMA\Template::get('table/columns_definitions/column_definitions_form')->render(
+$html = PMA\Template::get('columns_definitions/column_definitions_form')->render(
     array(
         'is_backup' => $is_backup,
         'fields_meta' => isset($fields_meta) ? $fields_meta : null,

templates/table/columns_definitions/column_attributes.phtml → templates/columns_definitions/column_attributes.phtml

@@ -9,7 +9,7 @@ $ci_offset = -1;
 
 <td class="center">
     <!-- column name -->
-    <?php echo PMA\Template::get('table/columns_definitions/column_name')
+    <?php echo PMA\Template::get('columns_definitions/column_name')
         ->render(array(
             'columnNumber' => $columnNumber,
             'ci' => $ci++,
@@ -20,7 +20,7 @@ $ci_offset = -1;
 </td>
 <td class="center">
     <!-- column type -->
-    <?php echo PMA\Template::get('table/columns_definitions/column_type')
+    <?php echo PMA\Template::get('columns_definitions/column_type')
         ->render(array(
             'columnNumber' => $columnNumber,
             'ci' => $ci++,
@@ -31,7 +31,7 @@ $ci_offset = -1;
 </td>
 <td class="center">
     <!-- column length -->
-    <?php echo PMA\Template::get('table/columns_definitions/column_length')
+    <?php echo PMA\Template::get('columns_definitions/column_length')
         ->render(array(
             'columnNumber' => $columnNumber,
             'ci' => $ci++,
@@ -42,7 +42,7 @@ $ci_offset = -1;
 </td>
 <td class="center">
     <!-- column default -->
-    <?php echo PMA\Template::get('table/columns_definitions/column_default')
+    <?php echo PMA\Template::get('columns_definitions/column_default')
         ->render(array(
             'columnNumber' => $columnNumber,
             'ci' => $ci++,
@@ -64,7 +64,7 @@ $ci_offset = -1;
 </td>
 <td class="center">
     <!-- column attribute -->
-    <?php echo PMA\Template::get('table/columns_definitions/column_attribute')
+    <?php echo PMA\Template::get('columns_definitions/column_attribute')
         ->render(array(
             'columnNumber' => $columnNumber,
             'ci' => $ci++,
@@ -76,7 +76,7 @@ $ci_offset = -1;
 </td>
 <td class="center">
     <!-- column NULL -->
-    <?php echo PMA\Template::get('table/columns_definitions/column_null')
+    <?php echo PMA\Template::get('columns_definitions/column_null')
         ->render(array(
             'columnNumber' => $columnNumber,
             'ci' => $ci++,
@@ -89,7 +89,7 @@ $ci_offset = -1;
     <td class="center">
         <?php $privs_available = isset($GLOBALS['col_priv']) && $GLOBALS['col_priv']
             && isset($GLOBALS['flush_priv']) && $GLOBALS['flush_priv']; ?>
-        <?php echo PMA\Template::get('table/columns_definitions/column_adjust_privileges')
+        <?php echo PMA\Template::get('columns_definitions/column_adjust_privileges')
             ->render(array(
                 'columnNumber' => $columnNumber,
                 'ci' => $ci++,
@@ -101,7 +101,7 @@ $ci_offset = -1;
 <?php if (!$is_backup): ?>
     <!-- column indexes, See my other comment about  this 'if'. -->
     <td class="center">
-        <?php echo PMA\Template::get('table/columns_definitions/column_indexes')
+        <?php echo PMA\Template::get('columns_definitions/column_indexes')
             ->render(array(
                 'columnNumber' => $columnNumber,
                 'ci' => $ci++,
@@ -112,7 +112,7 @@ $ci_offset = -1;
 <?php endif; ?>
 <td class="center">
     <!-- column auto_increment -->
-    <?php echo PMA\Template::get('table/columns_definitions/column_auto_increment')
+    <?php echo PMA\Template::get('columns_definitions/column_auto_increment')
         ->render(array(
             'columnNumber' => $columnNumber,
             'ci' => $ci++,
@@ -122,7 +122,7 @@ $ci_offset = -1;
 </td>
 <td class="center">
     <!-- column comments -->
-    <?php echo PMA\Template::get('table/columns_definitions/column_comment')
+    <?php echo PMA\Template::get('columns_definitions/column_comment')
         ->render(array(
             'columnNumber' => $columnNumber,
             'ci' => $ci++,
@@ -134,7 +134,7 @@ $ci_offset = -1;
  <!-- column virtuality -->
 <?php if (PMA_Util::isVirtualColumnsSupported()): ?>
     <td class="center">
-        <?php echo PMA\Template::get('table/columns_definitions/column_virtuality')
+        <?php echo PMA\Template::get('columns_definitions/column_virtuality')
             ->render(array(
                 'columnNumber' => $columnNumber,
                 'ci' => $ci++,
@@ -154,7 +154,7 @@ $ci_offset = -1;
     } ?>
 
     <td class="center">
-        <?php echo PMA\Template::get('table/columns_definitions/move_column')
+        <?php echo PMA\Template::get('columns_definitions/move_column')
             ->render(array(
                 'columnNumber' => $columnNumber,
                 'ci' => $ci++,
@@ -169,7 +169,7 @@ $ci_offset = -1;
 <?php if ($cfgRelation['mimework'] && $GLOBALS['cfg']['BrowseMIME'] && $cfgRelation['commwork']): ?>
     <td class="center">
         <!-- Column Mime-type -->
-        <?php echo PMA\Template::get('table/columns_definitions/mime_type')
+        <?php echo PMA\Template::get('columns_definitions/mime_type')
             ->render(array(
                 'columnNumber' => $columnNumber,
                 'ci' => $ci++,
@@ -181,7 +181,7 @@ $ci_offset = -1;
     </td>
     <td class="center">
         <!-- Column Browser transformation -->
-        <?php echo PMA\Template::get('table/columns_definitions/transformation')
+        <?php echo PMA\Template::get('columns_definitions/transformation')
             ->render(array(
                 'columnNumber' => $columnNumber,
                 'ci' => $ci++,
@@ -194,7 +194,7 @@ $ci_offset = -1;
     </td>
     <td class="center">
         <!-- column Transformation options -->
-        <?php echo PMA\Template::get('table/columns_definitions/transformation_option')
+        <?php echo PMA\Template::get('columns_definitions/transformation_option')
             ->render(array(
                 'columnNumber' => $columnNumber,
                 'ci' => $ci++,
@@ -206,7 +206,7 @@ $ci_offset = -1;
     </td>
     <td class="center">
         <!-- Column Input transformation -->
-        <?php echo PMA\Template::get('table/columns_definitions/transformation')
+        <?php echo PMA\Template::get('columns_definitions/transformation')
             ->render(array(
                 'columnNumber' => $columnNumber,
                 'ci' => $ci++,
@@ -219,7 +219,7 @@ $ci_offset = -1;
     </td>
     <td class="center">
         <!-- column Input transformation options -->
-        <?php echo PMA\Template::get('table/columns_definitions/transformation_option')
+        <?php echo PMA\Template::get('columns_definitions/transformation_option')
             ->render(array(
                 'columnNumber' => $columnNumber,
                 'ci' => $ci++,

templates/table/columns_definitions/column_definitions_form.phtml → templates/columns_definitions/column_definitions_form.phtml

@@ -64,7 +64,7 @@
     <?php endif; ?>
     <?php if (is_array($content_cells)): ?>
         <?php echo PMA\Template::get(
-            'table/columns_definitions/table_fields_definitions'
+            'columns_definitions/table_fields_definitions'
         )->render(array(
             'is_backup' => $is_backup,
             'fields_meta' => $fields_meta,

templates/table/columns_definitions/table_fields_definitions.phtml → templates/columns_definitions/table_fields_definitions.phtml

@@ -125,7 +125,7 @@
     <?php foreach($content_cells as $content_row): ?>
         <tr class="<?php echo ($odd_row ? 'odd' : 'even'); ?>">
             <?php $odd_row = !$odd_row; ?>
-            <?php echo PMA\Template::get('table/columns_definitions/column_attributes')
+            <?php echo PMA\Template::get('columns_definitions/column_attributes')
                 ->render($content_row); ?>
         </tr>
     <?php endforeach; ?>

test/libraries/PMA_tbl_columns_definition_form_test.php

@@ -676,7 +676,7 @@ public function testGetHtmlForColumnLength()
     {
         /**
          * @todo Find out a better method to test for HTML
-         * Template: table/columns_definitions/column_length
+         * Template: columns_definitions/column_length
          *
          * $this->assertContains(
          *     '<input id="field_2_2" type="text" name="field_length[2]" size="10" '