From 0a80a0ce571e5145128c666a7c60abf46bf4872b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Tue, 9 May 2017 23:39:41 -0300 Subject: [PATCH 1/4] Refactor variable names in Twig templates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- libraries/Util.php | 24 +++++----- libraries/central_columns.lib.php | 48 +++++++++---------- .../database/DatabaseStructureController.php | 2 +- .../server/ServerDatabasesController.php | 8 ++-- .../server/ServerVariablesController.php | 2 +- libraries/rte/rte_list.lib.php | 7 ++- libraries/server_privileges.lib.php | 18 +++---- libraries/tracking.lib.php | 18 +++---- libraries/user_preferences.lib.php | 2 +- .../column_adjust_privileges.twig | 8 ++-- .../column_attributes.phtml | 28 +++++------ .../column_auto_increment.twig | 4 +- .../columns_definitions/column_extra.twig | 6 +-- .../columns_definitions/column_indexes.twig | 26 +++++----- .../columns_definitions/column_length.twig | 6 +-- .../columns_definitions/column_null.twig | 6 +-- .../columns_definitions/column_type.twig | 6 +-- .../transformation_option.twig | 8 ++-- templates/console/bookmark_content.phtml | 4 +- templates/console/display.phtml | 32 ++++++------- templates/console/query_action.twig | 4 +- templates/console/toolbar.twig | 4 +- templates/database/designer/canvas.twig | 2 +- templates/div_for_slider_effect.twig | 4 +- templates/dropdown.twig | 5 +- templates/filter.twig | 2 +- templates/prefs_autoload.twig | 2 +- templates/select_all.twig | 6 +-- .../structure/check_all_table_column.phtml | 6 +-- templates/toggle_button.twig | 6 +-- 30 files changed, 152 insertions(+), 152 deletions(-) diff --git a/libraries/Util.php b/libraries/Util.php index 41fcb36abb..bf9e036d6b 100644 --- a/libraries/Util.php +++ b/libraries/Util.php @@ -2671,7 +2671,7 @@ class Util 'class' => $class, 'placeholder' => $placeholder, 'selected' => $selected, - 'resultOptions' => $resultOptions, + 'result_options' => $resultOptions, ]); } @@ -2690,9 +2690,9 @@ class Util public static function getDivForSliderEffect($id = '', $message = '') { return Template::get('div_for_slider_effect')->render([ - 'id' => $id, - 'InitialSlidersState' => $GLOBALS['cfg']['InitialSlidersState'], - 'message' => $message, + 'id' => $id, + 'initial_sliders_state' => $GLOBALS['cfg']['InitialSlidersState'], + 'message' => $message, ]); } @@ -2725,16 +2725,16 @@ class Util return Template::get('toggle_button')->render( [ - 'pmaThemeImage' => $GLOBALS['pmaThemeImage'], - 'text_dir' => $GLOBALS['text_dir'], - 'link_on' => $link_on, - 'toggleOn' => str_replace(' ', ' ', htmlspecialchars( + 'pma_theme_image' => $GLOBALS['pmaThemeImage'], + 'text_dir' => $GLOBALS['text_dir'], + 'link_on' => $link_on, + 'toggle_on' => str_replace(' ', ' ', htmlspecialchars( $options[1]['label'])), - 'toggleOff' => str_replace(' ', ' ', htmlspecialchars( + 'toggle_off' => str_replace(' ', ' ', htmlspecialchars( $options[0]['label'])), - 'link_off' => $link_off, - 'callback' => $callback, - 'state' => $state + 'link_off' => $link_off, + 'callback' => $callback, + 'state' => $state ]); } // end toggleButton() diff --git a/libraries/central_columns.lib.php b/libraries/central_columns.lib.php index 07e9a8fe57..30205fbc95 100644 --- a/libraries/central_columns.lib.php +++ b/libraries/central_columns.lib.php @@ -879,11 +879,11 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $row_num, $db) . PMA\libraries\Template::get('columns_definitions/column_type') ->render( array( - 'columnNumber' => $row_num, + 'column_number' => $row_num, 'ci' => 1, 'ci_offset' => 0, 'type_upper' => mb_strtoupper($row['col_type']), - 'columnMeta' => array() + 'column_meta' => array() ) ) . ''; @@ -893,7 +893,7 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $row_num, $db) . '' . PMA\libraries\Template::get('columns_definitions/column_length')->render( array( - 'columnNumber' => $row_num, + 'column_number' => $row_num, 'ci' => 2, 'ci_offset' => 0, 'length_values_input_size' => 8, @@ -964,10 +964,10 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $row_num, $db) . PMA\libraries\Template::get('columns_definitions/column_null') ->render( array( - 'columnNumber' => $row_num, + 'column_number' => $row_num, 'ci' => 6, 'ci_offset' => 0, - 'columnMeta' => array( + 'column_meta' => array( 'Null' => $row['col_isNull'] ) ) @@ -979,10 +979,10 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $row_num, $db) . htmlspecialchars($row['col_extra']) . '' . PMA\libraries\Template::get('columns_definitions/column_extra')->render( array( - 'columnNumber' => $row_num, + 'column_number' => $row_num, 'ci' => 7, 'ci_offset' => 0, - 'columnMeta' => array('Extra'=>$row['col_extra']) + 'column_meta' => array('Extra'=>$row['col_extra']) ) ) . ''; @@ -1026,11 +1026,11 @@ function PMA_getHTMLforCentralColumnsEditTableRow($row, $row_num) . PMA\libraries\Template::get('columns_definitions/column_type') ->render( array( - 'columnNumber' => $row_num, + 'column_number' => $row_num, 'ci' => 1, 'ci_offset' => 0, 'type_upper' => mb_strtoupper($row['col_type']), - 'columnMeta' => array() + 'column_meta' => array() ) ) . ''; @@ -1038,7 +1038,7 @@ function PMA_getHTMLforCentralColumnsEditTableRow($row, $row_num) '' . PMA\libraries\Template::get('columns_definitions/column_length')->render( array( - 'columnNumber' => $row_num, + 'column_number' => $row_num, 'ci' => 2, 'ci_offset' => 0, 'length_values_input_size' => 8, @@ -1100,10 +1100,10 @@ function PMA_getHTMLforCentralColumnsEditTableRow($row, $row_num) . PMA\libraries\Template::get('columns_definitions/column_null') ->render( array( - 'columnNumber' => $row_num, + 'column_number' => $row_num, 'ci' => 6, 'ci_offset' => 0, - 'columnMeta' => array( + 'column_meta' => array( 'Null' => $row['col_isNull'] ) ) @@ -1114,10 +1114,10 @@ function PMA_getHTMLforCentralColumnsEditTableRow($row, $row_num) '' . PMA\libraries\Template::get('columns_definitions/column_extra')->render( array( - 'columnNumber' => $row_num, + 'column_number' => $row_num, 'ci' => 7, 'ci_offset' => 0, - 'columnMeta' => array('Extra' => $row['col_extra']) + 'column_meta' => array('Extra' => $row['col_extra']) ) ) . ''; @@ -1183,9 +1183,9 @@ function PMA_getCentralColumnsTableFooter($pmaThemeImage, $text_dir) $html_output = PMA\libraries\Template::get('select_all') ->render( array( - 'pmaThemeImage' => $pmaThemeImage, - 'text_dir' => $text_dir, - 'formName' => 'tableslistcontainer', + 'pma_theme_image' => $pmaThemeImage, + 'text_dir' => $text_dir, + 'form_name' => 'tableslistcontainer', ) ); $html_output .= Util::getButtonOrImage( @@ -1289,18 +1289,18 @@ function PMA_getHTMLforAddNewColumn($db, $total_rows) . PMA\libraries\Template::get('columns_definitions/column_type') ->render( array( - 'columnNumber' => 0, + 'column_number' => 0, 'ci' => 1, 'ci_offset' => 0, 'type_upper' => '', - 'columnMeta' => array() + 'column_meta' => array() ) ) . '' . '' . PMA\libraries\Template::get('columns_definitions/column_length')->render( array( - 'columnNumber' => 0, + 'column_number' => 0, 'ci' => 2, 'ci_offset' => 0, 'length_values_input_size' => 8, @@ -1343,20 +1343,20 @@ function PMA_getHTMLforAddNewColumn($db, $total_rows) . PMA\libraries\Template::get('columns_definitions/column_null') ->render( array( - 'columnNumber' => 0, + 'column_number' => 0, 'ci' => 6, 'ci_offset' => 0, - 'columnMeta' => array() + 'column_meta' => array() ) ) . '' . '' . PMA\libraries\Template::get('columns_definitions/column_extra')->render( array( - 'columnNumber' => 0, + 'column_number' => 0, 'ci' => 7, 'ci_offset' => 0, - 'columnMeta' => array() + 'column_meta' => array() ) ) . '' diff --git a/libraries/controllers/database/DatabaseStructureController.php b/libraries/controllers/database/DatabaseStructureController.php index 7184742412..0e8ad1ec14 100644 --- a/libraries/controllers/database/DatabaseStructureController.php +++ b/libraries/controllers/database/DatabaseStructureController.php @@ -369,7 +369,7 @@ class DatabaseStructureController extends DatabaseController { // filtering $this->response->addHTML( - Template::get('filter')->render(array('filterValue'=>'')) + Template::get('filter')->render(array('filter_value'=>'')) ); // table form $this->response->addHTML( diff --git a/libraries/controllers/server/ServerDatabasesController.php b/libraries/controllers/server/ServerDatabasesController.php index 4d0ef9eb6e..7efbe50e28 100644 --- a/libraries/controllers/server/ServerDatabasesController.php +++ b/libraries/controllers/server/ServerDatabasesController.php @@ -101,7 +101,7 @@ class ServerDatabasesController extends Controller $html .= Template::get('server/databases/create')->render(); } - $html .= Template::get('filter')->render(array('filterValue'=>'')); + $html .= Template::get('filter')->render(array('filter_value'=>'')); /** * Gets the databases list @@ -390,9 +390,9 @@ class ServerDatabasesController extends Controller $html = Template::get('select_all') ->render( array( - 'pmaThemeImage' => $GLOBALS['pmaThemeImage'], - 'text_dir' => $GLOBALS['text_dir'], - 'formName' => 'dbStatsForm', + 'pma_theme_image' => $GLOBALS['pmaThemeImage'], + 'text_dir' => $GLOBALS['text_dir'], + 'form_name' => 'dbStatsForm', ) ); diff --git a/libraries/controllers/server/ServerVariablesController.php b/libraries/controllers/server/ServerVariablesController.php index c22db9fd42..2fc9034f48 100644 --- a/libraries/controllers/server/ServerVariablesController.php +++ b/libraries/controllers/server/ServerVariablesController.php @@ -293,7 +293,7 @@ class ServerVariablesController extends Controller // filter $filterValue = ! empty($_REQUEST['filter']) ? $_REQUEST['filter'] : ''; $output = Template::get('filter') - ->render(array('filterValue' => $filterValue)); + ->render(array('filter_value' => $filterValue)); $output .= ''; $output .= Template::get('server/variables/variable_table_head')->render(); diff --git a/libraries/rte/rte_list.lib.php b/libraries/rte/rte_list.lib.php index 113ea91b51..da235897cf 100644 --- a/libraries/rte/rte_list.lib.php +++ b/libraries/rte/rte_list.lib.php @@ -149,9 +149,9 @@ function PMA_RTE_getList($type, $items) $retval .= Template::get('select_all') ->render( array( - 'pmaThemeImage' => $GLOBALS['pmaThemeImage'], - 'text_dir' => $GLOBALS['text_dir'], - 'formName' => 'rteListForm', + 'pma_theme_image' => $GLOBALS['pmaThemeImage'], + 'text_dir' => $GLOBALS['text_dir'], + 'form_name' => 'rteListForm', ) ); $retval .= PMA\libraries\Util::getButtonOrImage( @@ -480,4 +480,3 @@ function PMA_EVN_getRowForList($event, $rowclass = '') return $retval; } // end PMA_EVN_getRowForList() - diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php index 402d17c414..fb82a01663 100644 --- a/libraries/server_privileges.lib.php +++ b/libraries/server_privileges.lib.php @@ -2356,9 +2356,9 @@ function PMA_getHtmlForSpecificDbPrivileges($db) $html_output .= Template::get('select_all') ->render( array( - 'pmaThemeImage' => $GLOBALS['pmaThemeImage'], - 'text_dir' => $GLOBALS['text_dir'], - 'formName' => "usersForm", + 'pma_theme_image' => $GLOBALS['pmaThemeImage'], + 'text_dir' => $GLOBALS['text_dir'], + 'form_name' => "usersForm", ) ); $html_output .= Util::getButtonOrImage( @@ -2440,9 +2440,9 @@ function PMA_getHtmlForSpecificTablePrivileges($db, $table) $html_output .= Template::get('select_all') ->render( array( - 'pmaThemeImage' => $GLOBALS['pmaThemeImage'], - 'text_dir' => $GLOBALS['text_dir'], - 'formName' => "usersForm", + 'pma_theme_image' => $GLOBALS['pmaThemeImage'], + 'text_dir' => $GLOBALS['text_dir'], + 'form_name' => "usersForm", ) ); $html_output .= Util::getButtonOrImage( @@ -3511,9 +3511,9 @@ function PMA_getUsersOverview($result, $db_rights, $pmaThemeImage, $text_dir) . Template::get('select_all') ->render( array( - 'pmaThemeImage' => $pmaThemeImage, - 'text_dir' => $text_dir, - 'formName' => 'usersForm', + 'pma_theme_image' => $pmaThemeImage, + 'text_dir' => $text_dir, + 'form_name' => 'usersForm', ) ) . "\n"; $html_output .= Util::getButtonOrImage( diff --git a/libraries/tracking.lib.php b/libraries/tracking.lib.php index 856d8f37eb..18fd632f6f 100644 --- a/libraries/tracking.lib.php +++ b/libraries/tracking.lib.php @@ -352,9 +352,9 @@ function PMA_getHtmlForTableVersionDetails( $html .= PMA\libraries\Template::get('select_all') ->render( array( - 'pmaThemeImage' => $pmaThemeImage, - 'text_dir' => $text_dir, - 'formName' => 'versionsForm', + 'pma_theme_image' => $pmaThemeImage, + 'text_dir' => $text_dir, + 'form_name' => 'versionsForm', ) ); $html .= PMA\libraries\Util::getButtonOrImage( @@ -1473,9 +1473,9 @@ function PMA_displayUntrackedTables( echo PMA\libraries\Template::get('select_all') ->render( array( - 'pmaThemeImage' => $pmaThemeImage, - 'text_dir' => $text_dir, - 'formName' => 'untrackedForm', + 'pma_theme_image' => $pmaThemeImage, + 'text_dir' => $text_dir, + 'form_name' => 'untrackedForm', ) ); echo PMA\libraries\Util::getButtonOrImage( @@ -1681,9 +1681,9 @@ function PMA_displayTrackedTables( echo PMA\libraries\Template::get('select_all') ->render( array( - 'pmaThemeImage' => $pmaThemeImage, - 'text_dir' => $text_dir, - 'formName' => 'trackedForm', + 'pma_theme_image' => $pmaThemeImage, + 'text_dir' => $text_dir, + 'form_name' => 'trackedForm', ) ); echo PMA\libraries\Util::getButtonOrImage( diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php index 2c747bdfb4..2d7129b5b9 100644 --- a/libraries/user_preferences.lib.php +++ b/libraries/user_preferences.lib.php @@ -284,7 +284,7 @@ function PMA_userprefsAutoloadGetHeader() return PMA\libraries\Template::get('prefs_autoload') ->render( array( - 'hiddenInputs' => URL::getHiddenInputs(), + 'hidden_inputs' => URL::getHiddenInputs(), 'return_url' => $return_url, ) ); diff --git a/templates/columns_definitions/column_adjust_privileges.twig b/templates/columns_definitions/column_adjust_privileges.twig index e316dae606..820889446e 100644 --- a/templates/columns_definitions/column_adjust_privileges.twig +++ b/templates/columns_definitions/column_adjust_privileges.twig @@ -1,13 +1,13 @@ {% if privs_available %} - {% else %} - render(array( - 'columnNumber' => $columnNumber, + 'column_number' => $columnNumber, 'ci' => $ci++, 'ci_offset' => $ci_offset, 'type_upper' => $type_upper, - 'columnMeta' => isset($columnMeta) ? $columnMeta : null + 'column_meta' => isset($columnMeta) ? $columnMeta : null )); ?> @@ -89,7 +89,7 @@ $ci_offset = -1; render(array( - 'columnNumber' => $columnNumber, + 'column_number' => $columnNumber, 'ci' => $ci++, 'ci_offset' => $ci_offset, 'privs_available' => $privs_available @@ -101,10 +101,10 @@ $ci_offset = -1; @@ -112,10 +112,10 @@ $ci_offset = -1; render(array( - 'columnNumber' => $columnNumber, + 'column_number' => $columnNumber, 'ci' => $ci++, 'ci_offset' => $ci_offset, - 'columnMeta' => $columnMeta + 'column_meta' => $columnMeta )); ?> - - - - \ No newline at end of file diff --git a/templates/server/variables/session_variable_row.twig b/templates/server/variables/session_variable_row.twig new file mode 100644 index 0000000000..eb21e6bf78 --- /dev/null +++ b/templates/server/variables/session_variable_row.twig @@ -0,0 +1,5 @@ + + + + + diff --git a/templates/server/variables/variable_table_head.phtml b/templates/server/variables/variable_table_head.phtml deleted file mode 100644 index a1ac15ba40..0000000000 --- a/templates/server/variables/variable_table_head.phtml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/templates/server/variables/variable_table_head.twig b/templates/server/variables/variable_table_head.twig new file mode 100644 index 0000000000..656717ea8a --- /dev/null +++ b/templates/server/variables/variable_table_head.twig @@ -0,0 +1,7 @@ + + + + + + + diff --git a/test/classes/controllers/ServerCollationsControllerTest.php b/test/classes/controllers/ServerCollationsControllerTest.php index 0daed8aabf..118c8babd9 100644 --- a/test/classes/controllers/ServerCollationsControllerTest.php +++ b/test/classes/controllers/ServerCollationsControllerTest.php @@ -115,7 +115,7 @@ class ServerCollationsControllerTest extends PMATestCase ); //validate 2: Charset Item $this->assertContains( - 'PMA_armscii8_general_ci', + 'PMA_armscii8_general_ci', $html ); $this->assertContains( @@ -123,7 +123,7 @@ class ServerCollationsControllerTest extends PMATestCase $html ); $this->assertContains( - 'PMA_ascii_general_ci', + 'PMA_ascii_general_ci', $html ); $this->assertContains( @@ -131,7 +131,7 @@ class ServerCollationsControllerTest extends PMATestCase $html ); $this->assertContains( - 'PMA_big5_general_ci', + 'PMA_big5_general_ci', $html ); $this->assertContains( From 496abb869f5f4761c91959dfba270e17e578d2f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Fri, 12 May 2017 23:43:57 -0300 Subject: [PATCH 4/4] Port some templates to Twig MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- .../table/TableRelationController.php | 3 +- .../table/TableSearchController.php | 6 +-- .../table/TableStructureController.php | 3 +- libraries/server_privileges.lib.php | 12 +++--- .../privileges/privileges_summary_row.twig | 8 ++-- .../table/relation/dropdown_generate.phtml | 12 ------ .../table/relation/dropdown_generate.twig | 9 +++++ .../table/relation/relational_dropdown.phtml | 18 --------- .../table/relation/relational_dropdown.twig | 18 +++++++++ templates/table/search/fields_table.phtml | 4 +- templates/table/search/replace_preview.phtml | 40 ------------------- templates/table/search/replace_preview.twig | 39 ++++++++++++++++++ templates/table/search/table_header.phtml | 12 ------ templates/table/search/table_header.twig | 12 ++++++ templates/table/secondary_tabs.phtml | 19 --------- templates/table/secondary_tabs.twig | 17 ++++++++ 16 files changed, 114 insertions(+), 118 deletions(-) delete mode 100644 templates/table/relation/dropdown_generate.phtml create mode 100644 templates/table/relation/dropdown_generate.twig delete mode 100644 templates/table/relation/relational_dropdown.phtml create mode 100644 templates/table/relation/relational_dropdown.twig delete mode 100644 templates/table/search/replace_preview.phtml create mode 100644 templates/table/search/replace_preview.twig delete mode 100644 templates/table/search/table_header.phtml create mode 100644 templates/table/search/table_header.twig delete mode 100644 templates/table/secondary_tabs.phtml create mode 100644 templates/table/secondary_tabs.twig diff --git a/libraries/controllers/table/TableRelationController.php b/libraries/controllers/table/TableRelationController.php index db4db1b2c1..163c2d74eb 100644 --- a/libraries/controllers/table/TableRelationController.php +++ b/libraries/controllers/table/TableRelationController.php @@ -158,7 +158,8 @@ class TableRelationController extends TableController 'db' => $GLOBALS['db'], 'table' => $GLOBALS['table'] ), - 'engine' => $engine + 'is_foreign_key_supported' => Util::isForeignKeySupported($engine), + 'cfg_relation' => PMA_getRelationsParam(), ) ) ); diff --git a/libraries/controllers/table/TableSearchController.php b/libraries/controllers/table/TableSearchController.php index 6c8ef98ed9..b37faa1f40 100644 --- a/libraries/controllers/table/TableSearchController.php +++ b/libraries/controllers/table/TableSearchController.php @@ -614,10 +614,10 @@ class TableSearchController extends TableController array( 'db' => $this->db, 'table' => $this->table, - 'columnIndex' => $columnIndex, + 'column_index' => $columnIndex, 'find' => $find, - 'replaceWith' => $replaceWith, - 'useRegex' => $useRegex, + 'replace_with' => $replaceWith, + 'use_regex' => $useRegex, 'result' => $result ) ); diff --git a/libraries/controllers/table/TableStructureController.php b/libraries/controllers/table/TableStructureController.php index ed3f6560d8..20b5ea9eb4 100644 --- a/libraries/controllers/table/TableStructureController.php +++ b/libraries/controllers/table/TableStructureController.php @@ -260,7 +260,8 @@ class TableStructureController extends TableController 'db' => $this->db, 'table' => $this->table ), - 'engine' => $engine + 'is_foreign_key_supported' => Util::isForeignKeySupported($engine), + 'cfg_relation' => PMA_getRelationsParam(), ) ) ); diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php index 261bf6494e..096fe705e3 100644 --- a/libraries/server_privileges.lib.php +++ b/libraries/server_privileges.lib.php @@ -3322,7 +3322,7 @@ function PMA_getHtmlForAllTableSpecificRights( if ($type == 'database') { $name = $row['Db']; $onePrivilege['grant'] = $row['Grant_priv'] == 'Y'; - $onePrivilege['tablePrivs'] = ! empty($row['Table_priv']) + $onePrivilege['table_privs'] = ! empty($row['Table_priv']) || ! empty($row['Column_priv']); $onePrivilege['privileges'] = join(',', PMA_extractPrivInfo($row, true)); @@ -3334,7 +3334,7 @@ function PMA_getHtmlForAllTableSpecificRights( 'Grant', explode(',', $row['Table_priv']) ); - $onePrivilege['columnPrivs'] = ! empty($row['Column_priv']); + $onePrivilege['column_privs'] = ! empty($row['Column_priv']); $onePrivilege['privileges'] = join(',', PMA_extractPrivInfo($row, true)); $paramDbName = $dbname; @@ -3360,9 +3360,9 @@ function PMA_getHtmlForAllTableSpecificRights( $foundRows[] = $name; $onePrivilege['name'] = $name; - $onePrivilege['editLink'] = ''; + $onePrivilege['edit_link'] = ''; if ($GLOBALS['is_grantuser']) { - $onePrivilege['editLink'] = PMA_getUserLink( + $onePrivilege['edit_link'] = PMA_getUserLink( 'edit', $username, $hostname, @@ -3372,9 +3372,9 @@ function PMA_getHtmlForAllTableSpecificRights( ); } - $onePrivilege['revokeLink'] = ''; + $onePrivilege['revoke_link'] = ''; if ($type != 'database' || ! empty($row['can_delete'])) { - $onePrivilege['revokeLink'] = PMA_getUserLink( + $onePrivilege['revoke_link'] = PMA_getUserLink( 'revoke', $username, $hostname, diff --git a/templates/privileges/privileges_summary_row.twig b/templates/privileges/privileges_summary_row.twig index c0115ca730..2838378cad 100644 --- a/templates/privileges/privileges_summary_row.twig +++ b/templates/privileges/privileges_summary_row.twig @@ -4,11 +4,11 @@ {% if type == 'database' %} - + {% elseif type == 'table' %} - + {% endif %} - - + + diff --git a/templates/table/relation/dropdown_generate.phtml b/templates/table/relation/dropdown_generate.phtml deleted file mode 100644 index d9536dec57..0000000000 --- a/templates/table/relation/dropdown_generate.phtml +++ /dev/null @@ -1,12 +0,0 @@ - \ No newline at end of file diff --git a/templates/table/relation/dropdown_generate.twig b/templates/table/relation/dropdown_generate.twig new file mode 100644 index 0000000000..4f95e71577 --- /dev/null +++ b/templates/table/relation/dropdown_generate.twig @@ -0,0 +1,9 @@ +{{ dropdown_question is not empty ? dropdown_question ~ '  ' -}} + diff --git a/templates/table/relation/relational_dropdown.phtml b/templates/table/relation/relational_dropdown.phtml deleted file mode 100644 index 9efa5503a6..0000000000 --- a/templates/table/relation/relational_dropdown.phtml +++ /dev/null @@ -1,18 +0,0 @@ - diff --git a/templates/table/relation/relational_dropdown.twig b/templates/table/relation/relational_dropdown.twig new file mode 100644 index 0000000000..404b6c9cfb --- /dev/null +++ b/templates/table/relation/relational_dropdown.twig @@ -0,0 +1,18 @@ + diff --git a/templates/table/search/fields_table.phtml b/templates/table/search/fields_table.phtml index d084aa2538..72cc04e6e4 100644 --- a/templates/table/search/fields_table.phtml +++ b/templates/table/search/fields_table.phtml @@ -3,7 +3,7 @@ > render(array( - 'geomColumnFlag' => $geomColumnFlag + 'geom_column_flag' => $geomColumnFlag )); ?> @@ -23,4 +23,4 @@ )) ?> -
render(array( - 'columnNumber' => $columnNumber, + 'column_number' => $columnNumber, 'ci' => $ci++, 'ci_offset' => $ci_offset, 'length_values_input_size' => $length_values_input_size, @@ -77,10 +77,10 @@ $ci_offset = -1; render(array( - 'columnNumber' => $columnNumber, + 'column_number' => $columnNumber, 'ci' => $ci++, 'ci_offset' => $ci_offset, - 'columnMeta' => isset($columnMeta) ? $columnMeta : null + 'column_meta' => isset($columnMeta) ? $columnMeta : null )); ?> render(array( - 'columnNumber' => $columnNumber, + 'column_number' => $columnNumber, 'ci' => $ci++, 'ci_offset' => $ci_offset, - 'columnMeta' => $columnMeta + 'column_meta' => $columnMeta )); ?> @@ -194,10 +194,10 @@ $ci_offset = -1; render(array( - 'columnNumber' => $columnNumber, + 'column_number' => $columnNumber, 'ci' => $ci++, 'ci_offset' => $ci_offset, - 'columnMeta' => $columnMeta, + 'column_meta' => $columnMeta, 'mime_map' => $mime_map, 'type_prefix' => '', )); ?> @@ -219,10 +219,10 @@ $ci_offset = -1; render(array( - 'columnNumber' => $columnNumber, + 'column_number' => $columnNumber, 'ci' => $ci++, 'ci_offset' => $ci_offset, - 'columnMeta' => $columnMeta, + 'column_meta' => $columnMeta, 'mime_map' => $mime_map, 'type_prefix' => 'input_', )); ?> diff --git a/templates/columns_definitions/column_auto_increment.twig b/templates/columns_definitions/column_auto_increment.twig index 2729c838f0..9bb1c3a066 100644 --- a/templates/columns_definitions/column_auto_increment.twig +++ b/templates/columns_definitions/column_auto_increment.twig @@ -1,6 +1,6 @@ - - -
( ) 
({% trans 'Session value' %}) {{ value }}
/
{% trans 'Action' %}{% trans 'Variable' %}{% trans 'Session value' %} / {% trans 'Global value' %}
{{ grant ? 'Yes'|trans : 'No'|trans }}{{ tablePrivs ? 'Yes'|trans : 'No'|trans }}{{ table_privs ? 'Yes'|trans : 'No'|trans }}{{ columnPrivs ? 'Yes'|trans : 'No'|trans }}{{ column_privs ? 'Yes'|trans : 'No'|trans }}{{ editLink|raw }}{{ revokeLink|raw }}{{ edit_link|raw }}{{ revoke_link|raw }}
\ No newline at end of file + diff --git a/templates/table/search/replace_preview.phtml b/templates/table/search/replace_preview.phtml deleted file mode 100644 index ad54612b13..0000000000 --- a/templates/table/search/replace_preview.phtml +++ /dev/null @@ -1,40 +0,0 @@ -
- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - -
-
- -
- -
-
diff --git a/templates/table/search/replace_preview.twig b/templates/table/search/replace_preview.twig new file mode 100644 index 0000000000..48067b3f9f --- /dev/null +++ b/templates/table/search/replace_preview.twig @@ -0,0 +1,39 @@ +
+ {{ URL_getHiddenInputs(db, table) }} + + + + + + +
+ {% trans 'Find and replace - preview' %} + + + + + + + + + + {% if result is iterable %} + {% for row in result %} + + {# count #} + {# original #} + {# replaced #} + + {% endfor %} + {% endif %} + +
{% trans 'Count' %}{% trans 'Original string' %}{% trans 'Replaced string' %}
{{ row[2] }}{{ row[0] }}{{ row[1] }}
+
+ +
+ +
+
diff --git a/templates/table/search/table_header.phtml b/templates/table/search/table_header.phtml deleted file mode 100644 index 5841167fff..0000000000 --- a/templates/table/search/table_header.phtml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/templates/table/search/table_header.twig b/templates/table/search/table_header.twig new file mode 100644 index 0000000000..4093f5bfc5 --- /dev/null +++ b/templates/table/search/table_header.twig @@ -0,0 +1,12 @@ + + + {% if geom_column_flag %} + {% trans 'Function' %} + {% endif %} + {% trans 'Column' %} + {% trans 'Type' %} + {% trans 'Collation' %} + {% trans 'Operator' %} + {% trans 'Value' %} + + diff --git a/templates/table/secondary_tabs.phtml b/templates/table/secondary_tabs.phtml deleted file mode 100644 index 35a418b2f8..0000000000 --- a/templates/table/secondary_tabs.phtml +++ /dev/null @@ -1,19 +0,0 @@ - - - -
- \ No newline at end of file diff --git a/templates/table/secondary_tabs.twig b/templates/table/secondary_tabs.twig new file mode 100644 index 0000000000..a38b039e5d --- /dev/null +++ b/templates/table/secondary_tabs.twig @@ -0,0 +1,17 @@ +{% if cfg_relation['relwork'] or is_foreign_key_supported %} + +
+{% endif %}