From c64b77abe142b8d1cf369ca2c02721af272ce0de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Mon, 16 Nov 2020 16:36:16 -0300 Subject: [PATCH] Move HTML's table CSS to the pma-table class MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- js/src/designer/history.js | 2 +- js/src/functions.js | 6 +- js/src/server/status/monitor.js | 6 +- libraries/classes/BrowseForeigners.php | 2 +- libraries/classes/Database/Routines.php | 10 +-- libraries/classes/Database/Triggers.php | 2 +- libraries/classes/Engines/Innodb.php | 4 +- libraries/classes/InsertEdit.php | 4 +- .../Plugins/Auth/AuthenticationConfig.php | 2 +- .../classes/Plugins/Export/ExportHtmlword.php | 8 +- libraries/classes/Relation.php | 2 +- libraries/classes/StorageEngine.php | 2 +- .../column_definitions_form.twig | 4 +- templates/columns_definitions/partitions.twig | 4 +- .../table_fields_definitions.twig | 2 +- .../config/form_display/fieldset_top.twig | 2 +- templates/database/central_columns/edit.twig | 2 +- templates/database/central_columns/main.twig | 8 +- templates/database/data_dictionary/index.twig | 4 +- .../database/designer/database_tables.twig | 2 +- templates/database/designer/main.twig | 30 +++---- templates/database/designer/page_save_as.twig | 2 +- templates/database/events/editor_form.twig | 2 +- templates/database/events/index.twig | 4 +- templates/database/export/index.twig | 2 +- .../database/multi_table_query/form.twig | 2 +- templates/database/privileges/index.twig | 2 +- .../database/qbe/ins_del_and_or_cell.twig | 2 +- templates/database/qbe/selection_form.twig | 2 +- templates/database/routines/index.twig | 2 +- templates/database/search/results.twig | 2 +- templates/database/structure/add_prefix.twig | 2 +- .../structure/change_prefix_form.twig | 2 +- templates/database/structure/show_create.twig | 4 +- .../database/structure/table_header.twig | 2 +- templates/database/tracking/tables.twig | 6 +- templates/database/triggers/list.twig | 2 +- templates/display/results/table.twig | 4 +- templates/export.twig | 4 +- templates/indexes.twig | 2 +- templates/navigation/item_unhide_dialog.twig | 2 +- templates/server/binlog/index.twig | 2 +- templates/server/collations/index.twig | 2 +- templates/server/databases/index.twig | 2 +- templates/server/engines/index.twig | 2 +- templates/server/plugins/index.twig | 2 +- .../server/privileges/change_password.twig | 2 +- templates/server/privileges/initials_row.twig | 2 +- .../server/privileges/privileges_summary.twig | 2 +- .../server/privileges/users_overview.twig | 2 +- .../replication/master_replication.twig | 2 +- .../server/replication/status_table.twig | 2 +- templates/server/status/monitor/index.twig | 2 +- templates/server/status/processes/list.twig | 2 +- templates/server/status/queries/index.twig | 2 +- templates/server/status/status/index.twig | 4 +- templates/server/status/variables/index.twig | 2 +- templates/server/user_groups/user_groups.twig | 2 +- .../server/user_groups/user_listings.twig | 2 +- templates/server/variables/index.twig | 2 +- templates/setup/home/index.twig | 8 +- templates/sql/profiling_chart.twig | 4 +- .../table/find_replace/replace_preview.twig | 2 +- templates/table/index_form.twig | 2 +- templates/table/maintenance/checksum.twig | 2 +- templates/table/privileges/index.twig | 2 +- templates/table/relation/common_form.twig | 4 +- templates/table/search/index.twig | 2 +- .../table/structure/display_partitions.twig | 2 +- .../table/structure/display_structure.twig | 4 +- .../table/structure/display_table_stats.twig | 4 +- templates/table/tracking/main.twig | 2 +- templates/table/tracking/report_table.twig | 2 +- .../tracking/structure_snapshot_columns.twig | 2 +- .../tracking/structure_snapshot_indexes.twig | 2 +- templates/table/zoom_search/index.twig | 4 +- templates/table/zoom_search/result_form.twig | 2 +- templates/transformation_overview.twig | 4 +- templates/view_create.twig | 2 +- themes/bootstrap/scss/_common.scss | 74 ++++++++-------- themes/metro/scss/_common.scss | 60 ++++++------- themes/original/scss/_common.scss | 62 +++++++------- themes/pmahomme/scss/_common.scss | 84 +++++++++---------- 83 files changed, 268 insertions(+), 268 deletions(-) diff --git a/js/src/designer/history.js b/js/src/designer/history.js index 30f80dc7be..2b9d320152 100644 --- a/js/src/designer/history.js +++ b/js/src/designer/history.js @@ -94,7 +94,7 @@ DesignerHistory.display = function (init, finit) { str += '

' + temp + '

'; str += '
\n'; while ((historyArray[i].getTab()) === temp) { // + '.' + historyArray[i].getObjNo()) === temp) { - str += '
'; + str += '
'; str += ''; diff --git a/js/src/functions.js b/js/src/functions.js index 6f412e8ff0..2f207f5fb3 100644 --- a/js/src/functions.js +++ b/js/src/functions.js @@ -3503,9 +3503,9 @@ AJAX.registerOnload('functions.js', function () { '' + title + '' + '

' + Functions.getImage('s_notice') + Messages.enum_hint + '

' + - '
'; if (historyArray[i].getAndOr()) { str += '
' + fields + '
' + + '' + fields + '
' + '
' + - '
' + + '
' + '
' + '		' + '
' + '
' + searchIn + - '' + fields + '
' + + '' + fields + '
' + '
' + seeMore + '
'; diff --git a/js/src/server/status/monitor.js b/js/src/server/status/monitor.js index 2d94db414d..3f8ebb2ce7 100644 --- a/js/src/server/status/monitor.js +++ b/js/src/server/status/monitor.js @@ -1939,7 +1939,7 @@ AJAX.registerOnload('server/status/monitor.js', function () { function buildLogTable (data, groupInserts) { var rows = data.rows; var cols = []; - var $table = $('
'); + var $table = $('
'); var $tBody; var $tRow; var $tCell; @@ -2092,7 +2092,7 @@ AJAX.registerOnload('server/status/monitor.js', function () { var totalTime = 0; // Float sux, I'll use table :( $('#queryAnalyzerDialog').find('div.placeHolder') - .html('
'); + .html('
'); var explain = '' + Messages.strExplainOutput + ' ' + $('#explain_docu').html(); if (data.explain.length > 1) { @@ -2137,7 +2137,7 @@ AJAX.registerOnload('server/status/monitor.js', function () { if (data.profiling) { var chartData = []; - var numberTable = ''; + var numberTable = '
' + Messages.strStatus + '' + Messages.strTime + '
'; var duration; var otherTime = 0; diff --git a/libraries/classes/BrowseForeigners.php b/libraries/classes/BrowseForeigners.php index 8ccbeb140b..c865588d30 100644 --- a/libraries/classes/BrowseForeigners.php +++ b/libraries/classes/BrowseForeigners.php @@ -208,7 +208,7 @@ class BrowseForeigners . '' . ''; - $output .= '
' + Messages.strStatus + '' + Messages.strTime + '
'; + $output .= '
'; if (! is_array($foreignData['disp_row'])) { return $output . '' diff --git a/libraries/classes/Database/Routines.php b/libraries/classes/Database/Routines.php index 2dfeb5e7f0..6e212ef335 100644 --- a/libraries/classes/Database/Routines.php +++ b/libraries/classes/Database/Routines.php @@ -839,7 +839,7 @@ class Routines $retval .= Url::getHiddenInputs($db) . "\n"; $retval .= "
\n"; $retval .= '' . __('Details') . "\n"; - $retval .= "
\n"; + $retval .= "
\n"; $retval .= "\n"; $retval .= ' \n"; $retval .= "
' . __('Routine name') . "\n"; $retval .= " \n"; // parameter handling start - $retval .= " \n"; + $retval .= "
\n"; $retval .= " \n"; $retval .= " \n"; $retval .= " \n"; @@ -1446,7 +1446,7 @@ class Routines $num_rows = $this->dbi->numRows($result); if (($result !== false) && ($num_rows > 0)) { - $output .= '
'; + $output .= '
'; foreach ($this->dbi->getFieldsMeta($result) as $field) { $output .= '
'; $output .= htmlspecialchars($field->name); @@ -1642,13 +1642,13 @@ class Routines $retval .= "
\n"; if (! $this->response->isAjax()) { $retval .= '' . $routine['item_name'] . "\n"; - $retval .= "\n"; + $retval .= "
\n"; $retval .= "\n"; } else { $retval .= '' . __('Routine parameters') . "\n"; - $retval .= "
\n"; $retval .= __('Routine parameters'); $retval .= "
\n"; + $retval .= "
\n"; } $retval .= "\n"; $retval .= '\n"; diff --git a/libraries/classes/Database/Triggers.php b/libraries/classes/Database/Triggers.php index 168da52a94..9f4564e57a 100644 --- a/libraries/classes/Database/Triggers.php +++ b/libraries/classes/Database/Triggers.php @@ -387,7 +387,7 @@ class Triggers $retval .= Url::getHiddenInputs($db, $table) . "\n"; $retval .= "
\n"; $retval .= '' . __('Details') . "\n"; - $retval .= "
' . __('Name') . "
\n"; + $retval .= "
\n"; $retval .= "\n"; $retval .= ' \n"; $retval .= "
' . __('Trigger name') . "fetchResult($sql, 0, 1); - $output = '' . "\n" + $output = '
' . "\n" . ' ' . "\n" @@ -218,7 +218,7 @@ class Innodb extends StorageEngine $output .= ' ' . "\n" . '
' . "\n" . ' ' . __('Buffer Pool Usage') . "\n" . '
' . "\n\n" - . '' . "\n" + . '
' . "\n" . ' ' . "\n" diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php index b183067b83..cd0cb62c62 100644 --- a/libraries/classes/InsertEdit.php +++ b/libraries/classes/InsertEdit.php @@ -1839,7 +1839,7 @@ class InsertEdit $found_unique_key ) { $html_output = '
' - . '
' . "\n" . ' ' . __('Buffer Pool Activity') . "\n" . '
' + . '
' . '' . '
' . $this->getSubmitTypeDropDown($where_clause, $tabindex, $tabindex_for_value) @@ -1990,7 +1990,7 @@ class InsertEdit private function getHeadAndFootOfInsertRowTable(array $url_params) { $html_output = '
' - . '' + . '
' . '' . '' . ''; diff --git a/libraries/classes/Plugins/Auth/AuthenticationConfig.php b/libraries/classes/Plugins/Auth/AuthenticationConfig.php index 8a65c4ede4..92bf7c089e 100644 --- a/libraries/classes/Plugins/Auth/AuthenticationConfig.php +++ b/libraries/classes/Plugins/Auth/AuthenticationConfig.php @@ -95,7 +95,7 @@ class AuthenticationConfig extends AuthenticationPlugin echo '
-
' . __('Column') . '
+
'; if (isset($GLOBALS['allowDeny_forbidden']) diff --git a/libraries/classes/Plugins/Export/ExportHtmlword.php b/libraries/classes/Plugins/Export/ExportHtmlword.php index c8963e835e..8c4de40aa9 100644 --- a/libraries/classes/Plugins/Export/ExportHtmlword.php +++ b/libraries/classes/Plugins/Export/ExportHtmlword.php @@ -211,7 +211,7 @@ class ExportHtmlword extends ExportPlugin return false; } if (! $this->export->outputHandler( - '' + '
' ) ) { return false; @@ -283,7 +283,7 @@ class ExportHtmlword extends ExportPlugin { global $dbi; - $schema_insert = '
' + $schema_insert = '
' . '' . '
' . __('Column') @@ -382,7 +382,7 @@ class ExportHtmlword extends ExportPlugin /** * Displays the table structure */ - $schema_insert .= ''; + $schema_insert .= '
'; $schema_insert .= ''; $schema_insert .= '
' @@ -487,7 +487,7 @@ class ExportHtmlword extends ExportPlugin { global $dbi; - $dump = ''; + $dump = '
'; $dump .= ''; $dump .= ''; $dump .= ''; diff --git a/libraries/classes/Relation.php b/libraries/classes/Relation.php index 410e33e497..8c3e9ce71a 100644 --- a/libraries/classes/Relation.php +++ b/libraries/classes/Relation.php @@ -165,7 +165,7 @@ class Relation } } } else { - $retval .= '
' . __('Name') . '' . __('Time') . '
' . "\n"; + $retval .= '
' . "\n"; if (! $cfgRelation['allworks'] && $GLOBALS['cfg']['ZeroConf'] diff --git a/libraries/classes/StorageEngine.php b/libraries/classes/StorageEngine.php index f5e5f9fd4c..13db341079 100644 --- a/libraries/classes/StorageEngine.php +++ b/libraries/classes/StorageEngine.php @@ -262,7 +262,7 @@ class StorageEngine . "\n" . '

' . "\n"; } else { - $ret = '
' . "\n" . $ret . '
' . "\n"; + $ret = '' . "\n" . $ret . '
' . "\n"; } return $ret; diff --git a/templates/columns_definitions/column_definitions_form.twig b/templates/columns_definitions/column_definitions_form.twig index f878566cf9..480e167897 100644 --- a/templates/columns_definitions/column_definitions_form.twig +++ b/templates/columns_definitions/column_definitions_form.twig @@ -18,7 +18,7 @@ {% if action == url('/table/create') %}
- +
{% trans 'Table name' %}: - +
diff --git a/templates/columns_definitions/partitions.twig b/templates/columns_definitions/partitions.twig index 14c20ea158..1398978cfc 100644 --- a/templates/columns_definitions/partitions.twig +++ b/templates/columns_definitions/partitions.twig @@ -12,7 +12,7 @@ {% set sub_partition_options = ['', 'HASH', 'LINEAR HASH', 'KEY', 'LINEAR KEY'] %} {% set value_type_options = ['', 'LESS THAN', 'LESS THAN MAXVALUE', 'IN'] %} -
{% trans 'Table comments:' %}  
+
@@ -71,7 +71,7 @@ {% endif %}
{% if partition_details['partition_count'] > 1 %} - +
{% if partition_details['value_enabled'] %} diff --git a/templates/columns_definitions/table_fields_definitions.twig b/templates/columns_definitions/table_fields_definitions.twig index b3ebdb06ea..4a59a872d3 100644 --- a/templates/columns_definitions/table_fields_definitions.twig +++ b/templates/columns_definitions/table_fields_definitions.twig @@ -1,5 +1,5 @@
-
{% trans 'Partition' %}
+
{% trans 'Structure' %} {{ show_mysql_docu('CREATE_TABLE') }} diff --git a/templates/config/form_display/fieldset_top.twig b/templates/config/form_display/fieldset_top.twig index e359e92db6..317fd36e27 100644 --- a/templates/config/form_display/fieldset_top.twig +++ b/templates/config/form_display/fieldset_top.twig @@ -14,4 +14,4 @@ {% endfor %} {% endif %} - +
diff --git a/templates/database/central_columns/edit.twig b/templates/database/central_columns/edit.twig index b148b7a1b1..5e8b893406 100644 --- a/templates/database/central_columns/edit.twig +++ b/templates/database/central_columns/edit.twig @@ -1,5 +1,5 @@ -
+
diff --git a/templates/database/central_columns/main.twig b/templates/database/central_columns/main.twig index 94610e83cd..cff87c829b 100644 --- a/templates/database/central_columns/main.twig +++ b/templates/database/central_columns/main.twig @@ -8,7 +8,7 @@ {{ get_hidden_inputs(db) }}
-
{% trans 'Structure' %}
+
@@ -131,7 +131,7 @@ {% trans 'The central list of columns for the current database is empty' %} {% else %} -
+
{% if pos - max_rows >= 0 %} @@ -173,7 +173,7 @@
{% endif %} {# getHtmlForAddColumn #} - +
@@ -210,7 +210,7 @@
- +
{% set class = 'column_heading' %} {% set title = 'Click to sort.' | trans %} diff --git a/templates/database/data_dictionary/index.twig b/templates/database/data_dictionary/index.twig index eee9cf8d58..4a3e300244 100644 --- a/templates/database/data_dictionary/index.twig +++ b/templates/database/data_dictionary/index.twig @@ -11,7 +11,7 @@

{% trans 'Table comments:' %} {{ table.comment }}

{% endif %} -
+
@@ -59,7 +59,7 @@

{% trans 'Indexes' %}

-
{% trans 'Column' %} {% trans 'Type' %}
+
diff --git a/templates/database/designer/database_tables.twig b/templates/database/designer/database_tables.twig index 5453bb5b8e..615ef7e0f1 100644 --- a/templates/database/designer/database_tables.twig +++ b/templates/database/designer/database_tables.twig @@ -14,7 +14,7 @@ table_name_url="{{ designerTable.getTableName()|escape('url') }}" cellpadding="0" cellspacing="0" - class="designer_tab" + class="pma-table designer_tab" style="position:absolute; left: {{- tab_pos[t_n] is defined ? tab_pos[t_n]['X'] : random(range(20, 700)) }}px; top: {{- tab_pos[t_n] is defined ? tab_pos[t_n]['Y'] : random(range(20, 550)) }}px; display: diff --git a/templates/database/designer/main.twig b/templates/database/designer/main.twig index dec077c495..ce50264a1a 100644 --- a/templates/database/designer/main.twig +++ b/templates/database/designer/main.twig @@ -218,7 +218,7 @@ var designerConfig = {{ designer_config|raw }};
-
{% trans 'Keyname' %}
+
{# end id_scroll_tab #}
@@ -249,7 +249,7 @@ var designerConfig = {{ designer_config|raw }};
{# create relation pane #} - +
@@ -265,7 +265,7 @@ var designerConfig = {{ designer_config|raw }}; - +
@@ -360,7 +360,7 @@ var designerConfig = {{ designer_config|raw }};
{# delete relation pane #} - +
@@ -376,7 +376,7 @@ var designerConfig = {{ designer_config|raw }}; - +
@@ -411,7 +411,7 @@ var designerConfig = {{ designer_config|raw }};
{% if has_query %} {# options pane #} - +
@@ -427,7 +427,7 @@ var designerConfig = {{ designer_config|raw }}; - +
@@ -689,7 +689,7 @@ var designerConfig = {{ designer_config|raw }};
{# rename to pane #} - +
@@ -705,7 +705,7 @@ var designerConfig = {{ designer_config|raw }}; - +
@@ -755,7 +755,7 @@ var designerConfig = {{ designer_config|raw }};
{# having query panel #} - +
@@ -771,7 +771,7 @@ var designerConfig = {{ designer_config|raw }}; - +
@@ -894,7 +894,7 @@ var designerConfig = {{ designer_config|raw }};
{# aggregate query pane #} - +
@@ -910,7 +910,7 @@ var designerConfig = {{ designer_config|raw }}; - +
@@ -979,7 +979,7 @@ var designerConfig = {{ designer_config|raw }};
{# where query pane #} - +
@@ -995,7 +995,7 @@ var designerConfig = {{ designer_config|raw }}; - +
diff --git a/templates/database/designer/page_save_as.twig b/templates/database/designer/page_save_as.twig index c49c663205..3c2b4c3f17 100644 --- a/templates/database/designer/page_save_as.twig +++ b/templates/database/designer/page_save_as.twig @@ -1,7 +1,7 @@ {{ get_hidden_inputs(db) }}
- +
diff --git a/templates/database/events/editor_form.twig b/templates/database/events/editor_form.twig index 73ba148122..5ff5633cb9 100644 --- a/templates/database/events/editor_form.twig +++ b/templates/database/events/editor_form.twig @@ -7,7 +7,7 @@
{% trans 'Details' %} - +
{% trans 'Details' %} diff --git a/templates/database/events/index.twig b/templates/database/events/index.twig index 7eaf79a843..9d6dc66718 100644 --- a/templates/database/events/index.twig +++ b/templates/database/events/index.twig @@ -11,7 +11,7 @@ {% trans 'There are no events to display.' %} - +
@@ -119,7 +119,7 @@
-
{% trans 'Name' %}
+
diff --git a/templates/database/export/index.twig b/templates/database/export/index.twig index 43762e0431..b21b5b4b63 100644 --- a/templates/database/export/index.twig +++ b/templates/database/export/index.twig @@ -16,7 +16,7 @@
- +
diff --git a/templates/database/multi_table_query/form.twig b/templates/database/multi_table_query/form.twig index d6f99b5a7d..57ba255bd9 100644 --- a/templates/database/multi_table_query/form.twig +++ b/templates/database/multi_table_query/form.twig @@ -53,7 +53,7 @@
+
diff --git a/templates/database/privileges/index.twig b/templates/database/privileges/index.twig index 6563d47d79..14cca17803 100644 --- a/templates/database/privileges/index.twig +++ b/templates/database/privileges/index.twig @@ -10,7 +10,7 @@
-
{% trans 'Sort' %}
+
diff --git a/templates/database/qbe/ins_del_and_or_cell.twig b/templates/database/qbe/ins_del_and_or_cell.twig index b8bdd34d67..3a54d04657 100644 --- a/templates/database/qbe/ins_del_and_or_cell.twig +++ b/templates/database/qbe/ins_del_and_or_cell.twig @@ -1,5 +1,5 @@
- +
{% trans 'Ins:' %} diff --git a/templates/database/qbe/selection_form.twig b/templates/database/qbe/selection_form.twig index f691b56e12..32a91c3f6b 100644 --- a/templates/database/qbe/selection_form.twig +++ b/templates/database/qbe/selection_form.twig @@ -7,7 +7,7 @@ {{ saved_searches_field|raw }}
- +
{{ column_names_row|raw }} diff --git a/templates/database/routines/index.twig b/templates/database/routines/index.twig index ce5686f97b..14e4da018f 100644 --- a/templates/database/routines/index.twig +++ b/templates/database/routines/index.twig @@ -23,7 +23,7 @@ {% trans 'There are no routines to display.' %} -
{% trans 'Column:' %}
+
diff --git a/templates/database/search/results.twig b/templates/database/search/results.twig index 34d7e60e22..83d4b89d61 100644 --- a/templates/database/search/results.twig +++ b/templates/database/search/results.twig @@ -1,4 +1,4 @@ -
{% trans 'Name' %}
+
{{ 'Search results for "%s" %s:'|format( criteria_search_string, diff --git a/templates/database/structure/add_prefix.twig b/templates/database/structure/add_prefix.twig index 3b700cea9f..1defbda864 100644 --- a/templates/database/structure/add_prefix.twig +++ b/templates/database/structure/add_prefix.twig @@ -2,7 +2,7 @@ {{ get_hidden_inputs(url_params) }}
- +
{% trans 'Add prefix' %} diff --git a/templates/database/structure/change_prefix_form.twig b/templates/database/structure/change_prefix_form.twig index 84ed9c245e..4db0c394de 100644 --- a/templates/database/structure/change_prefix_form.twig +++ b/templates/database/structure/change_prefix_form.twig @@ -2,7 +2,7 @@ {{ get_hidden_inputs(url_params) }}
- +
{% trans 'From' %} diff --git a/templates/database/structure/show_create.twig b/templates/database/structure/show_create.twig index 6626e0c29d..efacc1b869 100644 --- a/templates/database/structure/show_create.twig +++ b/templates/database/structure/show_create.twig @@ -4,7 +4,7 @@ {% if tables.tables is not empty %}
{% trans 'Tables' %} - +
@@ -26,7 +26,7 @@ {% if tables.views is not empty %}
{% trans 'Views' %} -
{% trans 'Table' %}
+
diff --git a/templates/database/structure/table_header.twig b/templates/database/structure/table_header.twig index 2ca9275473..fc85f2f1ae 100644 --- a/templates/database/structure/table_header.twig +++ b/templates/database/structure/table_header.twig @@ -1,7 +1,7 @@ {{ get_hidden_inputs(db) }}
-
{% trans 'View' %}
+
diff --git a/templates/database/tracking/tables.twig b/templates/database/tracking/tables.twig index bbb1d0660c..555c17b6b3 100644 --- a/templates/database/tracking/tables.twig +++ b/templates/database/tracking/tables.twig @@ -6,7 +6,7 @@ {{ get_hidden_inputs(db) }} -
+
@@ -46,7 +46,7 @@
-
+
@@ -147,7 +147,7 @@ {{ get_hidden_inputs(db) }} - +
diff --git a/templates/database/triggers/list.twig b/templates/database/triggers/list.twig index ba6174ed2d..48aa8ea572 100644 --- a/templates/database/triggers/list.twig +++ b/templates/database/triggers/list.twig @@ -11,7 +11,7 @@ {% trans 'There are no triggers to display.' %} -
+
diff --git a/templates/display/results/table.twig b/templates/display/results/table.twig index ae452defdb..d4477fe880 100644 --- a/templates/display/results/table.twig +++ b/templates/display/results/table.twig @@ -1,6 +1,6 @@ {% set navigation_html %} {% if navigation is not empty %} -
{% trans 'Name' %}
+
@@ -185,7 +185,7 @@ {% endif %}
-
+
{{ headers.button|raw }} {{ headers.table_headers_for_columns|raw }} diff --git a/templates/export.twig b/templates/export.twig index c7ad8efc8a..2e01f83df0 100644 --- a/templates/export.twig +++ b/templates/export.twig @@ -155,7 +155,7 @@ {% endif %}
-
+
@@ -224,7 +224,7 @@
- +
diff --git a/templates/indexes.twig b/templates/indexes.twig index f3c80503a3..edc5c14dac 100644 --- a/templates/indexes.twig +++ b/templates/indexes.twig @@ -8,7 +8,7 @@ {{ indexes_duplicates|raw }}
-
{% trans 'Define new aliases' %}
+
diff --git a/templates/navigation/item_unhide_dialog.twig b/templates/navigation/item_unhide_dialog.twig index e510220c07..d54d98b9e5 100644 --- a/templates/navigation/item_unhide_dialog.twig +++ b/templates/navigation/item_unhide_dialog.twig @@ -6,7 +6,7 @@ {% if (item_type is empty or item_type == type) and hidden[type] is iterable %} {{ not loop.first ? '
' }} {{ label }} -
{% trans 'Action' %}
+
{% for item in hidden[type] %} diff --git a/templates/server/binlog/index.twig b/templates/server/binlog/index.twig index f5a46ec75c..f6c27e2d41 100644 --- a/templates/server/binlog/index.twig +++ b/templates/server/binlog/index.twig @@ -37,7 +37,7 @@ {{ sql_message|raw }} -
+
diff --git a/templates/server/collations/index.twig b/templates/server/collations/index.twig index 333498c3c3..7130d06402 100644 --- a/templates/server/collations/index.twig +++ b/templates/server/collations/index.twig @@ -7,7 +7,7 @@
- +
diff --git a/templates/server/databases/index.twig b/templates/server/databases/index.twig index 8ed3adc88d..77f6563c6e 100644 --- a/templates/server/databases/index.twig +++ b/templates/server/databases/index.twig @@ -94,7 +94,7 @@ {{ get_hidden_inputs(url_params) }}
-
{% trans 'Collation' %}
+
{% if is_drop_allowed %} diff --git a/templates/server/engines/index.twig b/templates/server/engines/index.twig index abfbb50ec2..56ff04b738 100644 --- a/templates/server/engines/index.twig +++ b/templates/server/engines/index.twig @@ -7,7 +7,7 @@
-
+
diff --git a/templates/server/plugins/index.twig b/templates/server/plugins/index.twig index d5e4d5dca3..0a430b2747 100644 --- a/templates/server/plugins/index.twig +++ b/templates/server/plugins/index.twig @@ -17,7 +17,7 @@ {% for type, list in plugins %}
-
{% trans 'Storage Engine' %}
+
diff --git a/templates/server/privileges/change_password.twig b/templates/server/privileges/change_password.twig index 5f4398283b..6529973f13 100644 --- a/templates/server/privileges/change_password.twig +++ b/templates/server/privileges/change_password.twig @@ -8,7 +8,7 @@
{% trans 'Change password' %} -
{{ type }}
+
diff --git a/templates/server/privileges/initials_row.twig b/templates/server/privileges/initials_row.twig index 3af5decad0..a6e10bfc0b 100644 --- a/templates/server/privileges/initials_row.twig +++ b/templates/server/privileges/initials_row.twig @@ -1,4 +1,4 @@ - +
{% for tmp_initial, initial_was_found in array_initials %} {% if tmp_initial is not same as(null) %} diff --git a/templates/server/privileges/privileges_summary.twig b/templates/server/privileges/privileges_summary.twig index de180cccf0..ec5770b8b1 100644 --- a/templates/server/privileges/privileges_summary.twig +++ b/templates/server/privileges/privileges_summary.twig @@ -8,7 +8,7 @@ {{ legend }} -
+
diff --git a/templates/server/privileges/users_overview.twig b/templates/server/privileges/users_overview.twig index 18484e20da..abd7e9999f 100644 --- a/templates/server/privileges/users_overview.twig +++ b/templates/server/privileges/users_overview.twig @@ -1,7 +1,7 @@ {{ get_hidden_inputs() }}
-
{{ type_label }}
+
diff --git a/templates/server/replication/master_replication.twig b/templates/server/replication/master_replication.twig index cf6391017f..faba227a7e 100644 --- a/templates/server/replication/master_replication.twig +++ b/templates/server/replication/master_replication.twig @@ -17,7 +17,7 @@

+
diff --git a/templates/server/replication/status_table.twig b/templates/server/replication/status_table.twig index 79c45f6d6a..6e96e5c4ff 100644 --- a/templates/server/replication/status_table.twig +++ b/templates/server/replication/status_table.twig @@ -10,7 +10,7 @@ {% endif %} -
{% trans 'Server ID' %}
+
diff --git a/templates/server/status/monitor/index.twig b/templates/server/status/monitor/index.twig index fec804751c..1769a39bb7 100644 --- a/templates/server/status/monitor/index.twig +++ b/templates/server/status/monitor/index.twig @@ -241,7 +241,7 @@
-
{% trans 'Variable' %}
+