diff --git a/js/src/functions.js b/js/src/functions.js index 2f207f5fb3..d1fa52e0f8 100644 --- a/js/src/functions.js +++ b/js/src/functions.js @@ -1114,9 +1114,9 @@ AJAX.registerOnload('functions.js', function () { var checked = $this.prop('checked'); $checkbox.prop('checked', checked).trigger('change'); if (checked) { - $tr.addClass('marked'); + $tr.addClass('marked table-active'); } else { - $tr.removeClass('marked'); + $tr.removeClass('marked table-active'); } lastClickChecked = checked; @@ -1140,7 +1140,7 @@ AJAX.registerOnload('functions.js', function () { } $tr.parent().find('tr:not(.noclick)') .slice(start, end + 1) - .removeClass('marked') + .removeClass('marked table-active') .find(':checkbox') .prop('checked', false) .trigger('change'); @@ -1157,7 +1157,7 @@ AJAX.registerOnload('functions.js', function () { } $tr.parent().find('tr:not(.noclick)') .slice(start, end + 1) - .addClass('marked') + .addClass('marked table-active') .find(':checkbox') .prop('checked', true) .trigger('change'); @@ -4734,7 +4734,7 @@ $(document).on('change', checkboxesSel, Functions.checkboxesChanged); $(document).on('change', 'input.checkall_box', function () { var isChecked = $(this).is(':checked'); $(this.form).find(checkboxesSel).not('.row-hidden').prop('checked', isChecked) - .parents('tr').toggleClass('marked', isChecked); + .parents('tr').toggleClass('marked table-active', isChecked); }); $(document).on('click', '.checkall-filter', function () { diff --git a/js/src/server/privileges.js b/js/src/server/privileges.js index 6da1823f40..5bfc50ca32 100644 --- a/js/src/server/privileges.js +++ b/js/src/server/privileges.js @@ -167,7 +167,7 @@ AJAX.registerOnload('server/privileges.js', function () { $(this).remove(); // If this is the last user with this_user_initial, remove the link from #initials_table - if ($('#tableuserrights').find('input:checkbox[value^="' + thisUserInitial + '"], input:checkbox[value^="' + thisUserInitial.toLowerCase() + '"]').length === 0) { + if ($('#userRightsTable').find('input:checkbox[value^="' + thisUserInitial + '"], input:checkbox[value^="' + thisUserInitial.toLowerCase() + '"]').length === 0) { $('#initials_table').find('td > a:contains(' + thisUserInitial + ')').parent('td').html(thisUserInitial); } diff --git a/js/src/server/status/sorter.js b/js/src/server/status/sorter.js index 4c7d2f85b7..7a60052001 100644 --- a/js/src/server/status/sorter.js +++ b/js/src/server/status/sorter.js @@ -5,7 +5,7 @@ function initTableSorter (tabid) { var opts; switch (tabid) { case 'statustabs_queries': - $table = $('#serverstatusqueriesdetails'); + $table = $('#serverStatusQueriesDetails'); opts = { sortList: [[3, 1]], headers: { diff --git a/js/src/server/status/variables.js b/js/src/server/status/variables.js index fd19cd9de1..aafd773810 100644 --- a/js/src/server/status/variables.js +++ b/js/src/server/status/variables.js @@ -34,10 +34,11 @@ AJAX.registerOnload('server/status/variables.js', function () { $('#dontFormat').on('change', function () { // Hiding the table while changing values speeds up the process a lot - $('#serverstatusvariables').hide(); - $('#serverstatusvariables').find('td.value span.original').toggle(this.checked); - $('#serverstatusvariables').find('td.value span.formatted').toggle(! this.checked); - $('#serverstatusvariables').show(); + const serverStatusVariables = $('#serverStatusVariables'); + serverStatusVariables.hide(); + serverStatusVariables.find('td.value span.original').toggle(this.checked); + serverStatusVariables.find('td.value span.formatted').toggle(! this.checked); + serverStatusVariables.show(); }).trigger('change'); $('#filterText').on('keyup', function () { @@ -85,7 +86,7 @@ AJAX.registerOnload('server/status/variables.js', function () { $('#linkSuggestions').css('display', 'none'); } - $('#serverstatusvariables').find('th.name').each(function () { + $('#serverStatusVariables').find('th.name').each(function () { if ((textFilter === null || textFilter.exec($(this).text())) && (! alertFilter || $(this).next().find('span.attention').length > 0) && (categoryFilter.length === 0 || $(this).parent().hasClass('s_' + categoryFilter)) diff --git a/js/src/server/variables.js b/js/src/server/variables.js index a29cfe6b44..ddc8faf4da 100644 --- a/js/src/server/variables.js +++ b/js/src/server/variables.js @@ -83,7 +83,7 @@ AJAX.registerOnload('server/variables.js', function () { var $editor = $('
', { 'class': 'serverVariableEditor' }) .append( $('
').append( - $('', { type: 'text' }).val(data.message) + $('', { type: 'text', 'class': 'form-control form-control-sm' }).val(data.message) ) ); // Save and replace content diff --git a/libraries/classes/Database/Routines.php b/libraries/classes/Database/Routines.php index bec979fece..5ec151ffdb 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"; diff --git a/libraries/classes/Database/Triggers.php b/libraries/classes/Database/Triggers.php index 9f4564e57a..08f592e809 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 .= "
\n"; + $retval .= "
\n"; $retval .= "\n"; $retval .= ' \n"; $retval .= "
' . __('Trigger name') . "fetchResult($sql, 0, 1); - $output = '' . "\n" - . '
' . "\n" + $output = '' . "\n" + . ' ' . "\n" - . ' ' . "\n" + . ' ' . "\n" . ' ' . "\n" . ' ' . "\n" . ' ' . "\n" . ' ' . "\n" - . ' ' . "\n" - . ' ' . "\n" + . ' ' . "\n" . ' ' . "\n" . ' ' . "\n" - . ' ' . "\n" - . ' ' . "\n" + . ' ' . "\n" . ' ' . "\n" . ' ' . "\n" - . ' ' . "\n" - . ' ' . "\n" + . ' ' . "\n" . ' ' . "\n" . ' ' . "\n" - . ' ' . "\n" - . ' ' . "\n" + . ' ' . "\n" . ' ' . "\n" . ' ' . "\n" - . ' ' . "\n" - . ' ' . "\n" + . ' ' - . ' ' - . ' ' + . ' ' . "\n" . '
' . "\n" . ' ' . __('Buffer Pool Usage') . "\n" . '
' . "\n" - . ' ' . __('Total') . "\n" - . ' : ' + . ' ' . __('Total:') . ' ' . Util::formatNumber( $status['Innodb_buffer_pool_pages_total'], 0 @@ -158,8 +157,8 @@ class Innodb extends StorageEngine . '
' . __('Free pages') . '' + . ' ' . __('Free pages') . '' . Util::formatNumber( $status['Innodb_buffer_pool_pages_free'], 0 @@ -167,8 +166,8 @@ class Innodb extends StorageEngine . '
' . __('Dirty pages') . '' + . ' ' . __('Dirty pages') . '' . Util::formatNumber( $status['Innodb_buffer_pool_pages_dirty'], 0 @@ -176,8 +175,8 @@ class Innodb extends StorageEngine . '
' . __('Pages containing data') . '' + . ' ' . __('Pages containing data') . '' . Util::formatNumber( $status['Innodb_buffer_pool_pages_data'], 0 @@ -185,8 +184,8 @@ class Innodb extends StorageEngine . '
' . __('Pages to be flushed') . '' + . ' ' . __('Pages to be flushed') . '' . Util::formatNumber( $status['Innodb_buffer_pool_pages_flushed'], 0 @@ -194,8 +193,8 @@ class Innodb extends StorageEngine . '
' . __('Busy pages') . '' + . ' ' . __('Busy pages') . '' . Util::formatNumber( $status['Innodb_buffer_pool_pages_misc'], 0 @@ -206,8 +205,8 @@ class Innodb extends StorageEngine // not present at least since MySQL 5.1.40 if (isset($status['Innodb_buffer_pool_pages_latched'])) { $output .= '
' . __('Latched pages') . '' + . ' ' . __('Latched pages') . '' . Util::formatNumber( $status['Innodb_buffer_pool_pages_latched'], 0 @@ -218,14 +217,14 @@ class Innodb extends StorageEngine $output .= '
' . "\n\n" - . '' . "\n" - . '
' . "\n" + . '' . "\n" + . ' ' . "\n" . ' ' . "\n" . ' ' . "\n" - . ' ' . "\n" - . ' ' . "\n" + . ' ' . "\n" . ' ' . "\n" . ' ' . "\n" - . ' ' . "\n" - . ' ' . "\n" + . ' ' . "\n" . ' ' . "\n" . ' ' . "\n" - . ' ' . "\n" - . ' ' . "\n" + . ' ' . "\n" . ' ' . "\n" . ' ' . "\n" - . ' ' . "\n" - . ' ' . "\n" + . ' ' . "\n" . ' ' . "\n" . ' ' . "\n" - . ' ' . "\n" - . ' ' . "\n" + . ' ' . "\n" . ' ' . "\n" . ' ' . "\n" - . ' ' . "\n" - . ' ' . "\n" + . ' ' . "\n" - . ' ' + . ' ' . "\n" - . '
' . "\n" . ' ' . __('Buffer Pool Activity') . "\n" . '
' . __('Read requests') . '' + . ' ' . __('Read requests') . '' . Util::formatNumber( $status['Innodb_buffer_pool_read_requests'], 0 @@ -233,8 +232,8 @@ class Innodb extends StorageEngine . '
' . __('Write requests') . '' + . ' ' . __('Write requests') . '' . Util::formatNumber( $status['Innodb_buffer_pool_write_requests'], 0 @@ -242,8 +241,8 @@ class Innodb extends StorageEngine . '
' . __('Read misses') . '' + . ' ' . __('Read misses') . '' . Util::formatNumber( $status['Innodb_buffer_pool_reads'], 0 @@ -251,8 +250,8 @@ class Innodb extends StorageEngine . '
' . __('Write waits') . '' + . ' ' . __('Write waits') . '' . Util::formatNumber( $status['Innodb_buffer_pool_wait_free'], 0 @@ -260,8 +259,8 @@ class Innodb extends StorageEngine . '
' . __('Read misses in %') . '' + . ' ' . __('Read misses in %') . '' . ($status['Innodb_buffer_pool_read_requests'] == 0 ? '---' : htmlspecialchars( @@ -275,8 +274,8 @@ class Innodb extends StorageEngine . '
' . __('Write waits in %') . '' + . ' ' . __('Write waits in %') . '' . ($status['Innodb_buffer_pool_write_requests'] == 0 ? '---' : htmlspecialchars( diff --git a/libraries/classes/StorageEngine.php b/libraries/classes/StorageEngine.php index 13db341079..a49c9e4541 100644 --- a/libraries/classes/StorageEngine.php +++ b/libraries/classes/StorageEngine.php @@ -233,9 +233,9 @@ class StorageEngine . "\n"; } $ret .= ' ' . htmlspecialchars($details['title']) . '' . htmlspecialchars($details['title']) . ''; + . ' '; switch ($details['type']) { case PMA_ENGINE_DETAILS_TYPE_SIZE: $parsed_size = $this->resolveTypeSize($details['value']); @@ -262,7 +262,8 @@ class StorageEngine . "\n" . '

' . "\n"; } else { - $ret = '' . "\n" . $ret . '
' . "\n"; + $ret = '' + . "\n" . $ret . '
' . "\n"; } return $ret; diff --git a/templates/database/central_columns/main.twig b/templates/database/central_columns/main.twig index cff87c829b..0e738633ae 100644 --- a/templates/database/central_columns/main.twig +++ b/templates/database/central_columns/main.twig @@ -7,12 +7,11 @@ method="post" action="{{ url('/database/central-columns') }}"> {{ get_hidden_inputs(db) }} -
- - +
+
+ - - + + @@ -131,7 +131,7 @@ {% trans 'The central list of columns for the current database is empty' %} {% else %} -
{% trans 'Name' %}
@@ -45,6 +44,7 @@ {% trans 'A_I' %}
+
{% if pos - max_rows >= 0 %} @@ -172,8 +172,8 @@
{% endif %} -{# getHtmlForAddColumn #} - + +
@@ -210,10 +210,10 @@
- +
{% set class = 'column_heading' %} {% set title = 'Click to sort.' | trans %} - + diff --git a/templates/database/events/editor_form.twig b/templates/database/events/editor_form.twig index 5ff5633cb9..feba06af91 100644 --- a/templates/database/events/editor_form.twig +++ b/templates/database/events/editor_form.twig @@ -7,7 +7,7 @@
{% trans 'Details' %} -
+
+ {% for engine, details in engines %} + + + + + {% endfor %} + +
{% trans 'Details' %} diff --git a/templates/database/events/index.twig b/templates/database/events/index.twig index 9d6dc66718..a6429a9012 100644 --- a/templates/database/events/index.twig +++ b/templates/database/events/index.twig @@ -11,7 +11,8 @@ {% trans 'There are no events to display.' %} - +
+ @@ -19,6 +20,8 @@ + + {% for i in 0..6 %}{% endfor %} {% for event in items %} @@ -75,6 +78,7 @@ {% endfor %} +
{% trans 'Name' %}{% trans 'Action' %} {% trans 'Type' %}
{% if items is not empty %} diff --git a/templates/database/privileges/index.twig b/templates/database/privileges/index.twig index 14cca17803..8cc7ef613d 100644 --- a/templates/database/privileges/index.twig +++ b/templates/database/privileges/index.twig @@ -9,17 +9,17 @@ {{ 'Users having access to "%s"'|trans|format('' ~ db|escape('html') ~ '')|raw }} -
- - +
+
+ - - - - - - + + + + + + @@ -27,18 +27,18 @@ {% for privilege in privileges %} {% set privileges_amount = privilege.privileges|length %} - 1 %} rowspan="{{ privileges_amount }}"{% endif %}> + 1 %} class="align-middle" rowspan="{{ privileges_amount }}"{% endif %}> - 1 %} rowspan="{{ privileges_amount }}"{% endif %}> + 1 %} class="align-middle" rowspan="{{ privileges_amount }}"{% endif %}> {% if privilege.user is empty %} {% trans 'Any' %} {% else %} {{ privilege.user }} {% endif %} - 1 %} rowspan="{{ privileges_amount }}"{% endif %}> + 1 %} class="align-middle" rowspan="{{ privileges_amount }}"{% endif %}> {{ privilege.host }} {% for priv in privilege.privileges %} diff --git a/templates/database/qbe/ins_del_and_or_cell.twig b/templates/database/qbe/ins_del_and_or_cell.twig index 3a54d04657..29beef66bd 100644 --- a/templates/database/qbe/ins_del_and_or_cell.twig +++ b/templates/database/qbe/ins_del_and_or_cell.twig @@ -1,26 +1,26 @@ + - - + + {% set row_count_sum = format_number(sum_entries, 0) %} {# If a table shows approximate rows count, display update-all-real-count anchor. #} {% set row_sum_url = [] %} @@ -34,7 +34,7 @@ {% else %} {% set cell_text = row_count_sum %} {% endif %} - + {% if not (properties_num_columns > 1) %} {# MySQL <= 5.5.2 #} {% set default_engine = dbi.fetchValue('SELECT @@storage_engine;') %} @@ -60,12 +60,12 @@ {% set sum = format_byte_down(sum_size, 3, 1) %} {% set sum_formatted = sum[0] %} {% set sum_unit = sum[1] %} - + {% set overhead = format_byte_down(overhead_size, 3, 1) %} {% set overhead_formatted = overhead[0] %} {% set overhead_unit = overhead[1] %} - + {% endif %} {% if show_charset %} @@ -75,19 +75,19 @@ {% endif %} {% if show_creation %} - {% endif %} {% if show_last_update %} - {% endif %} {% if show_last_check %} - {% endif %} - + diff --git a/templates/database/structure/structure_table_row.twig b/templates/database/structure/structure_table_row.twig index dea94c2da9..45563d15b6 100644 --- a/templates/database/structure/structure_table_row.twig +++ b/templates/database/structure/structure_table_row.twig @@ -1,5 +1,5 @@ - {% endif %} - - - {% if not db_is_system_schema %} - {% if table_is_view %} - {% else %} - - {% endif %} @@ -163,32 +163,32 @@ {% endif %} {% if show_creation %} - {% endif %} {% if show_last_update %} - {% endif %} {% if show_last_check %} - {% endif %} {% elseif table_is_view %} - + {% if is_show_stats %} - - + + {% endif %} {% if show_charset %} @@ -197,13 +197,13 @@ {% endif %} {% if show_creation %} - + {% endif %} {% if show_last_update %} - + {% endif %} {% if show_last_check %} - + {% endif %} {% else %} diff --git a/templates/database/structure/table_header.twig b/templates/database/structure/table_header.twig index fc85f2f1ae..edb822191b 100644 --- a/templates/database/structure/table_header.twig +++ b/templates/database/structure/table_header.twig @@ -1,10 +1,10 @@ {{ get_hidden_inputs(db) }} -
-
{% trans 'User name' %}{% trans 'Host name' %}{% trans 'Type' %}{% trans 'Privileges' %}{% trans 'Grant' %}{% trans 'Action' %}{% trans 'User name' %}{% trans 'Host name' %}{% trans 'Type' %}{% trans 'Privileges' %}{% trans 'Grant' %}{% trans 'Action' %}
- +
- - - - - - diff --git a/templates/database/qbe/selection_form.twig b/templates/database/qbe/selection_form.twig index 32a91c3f6b..c58c5c9118 100644 --- a/templates/database/qbe/selection_form.twig +++ b/templates/database/qbe/selection_form.twig @@ -6,8 +6,8 @@ {{ saved_searches_field|raw }} -
-
+ {% trans 'Ins:' %} + {% trans 'And:' %} +
+ {% trans 'Del:' %} + {% trans 'Or:' %} +
+
+
{{ column_names_row|raw }} diff --git a/templates/database/routines/index.twig b/templates/database/routines/index.twig index 14e4da018f..6754df07b0 100644 --- a/templates/database/routines/index.twig +++ b/templates/database/routines/index.twig @@ -23,7 +23,8 @@ {% trans 'There are no routines to display.' %} -
{% trans 'Column:' %}
+
+ @@ -31,9 +32,12 @@ + + {% for i in 0..7 %}{% endfor %} {{ rows|raw }} +
{% trans 'Name' %}{% trans 'Type' %} {% trans 'Returns' %}
{% if items is not empty %} diff --git a/templates/database/structure/body_for_table_summary.twig b/templates/database/structure/body_for_table_summary.twig index 1a21582b7b..9c6b8b9766 100644 --- a/templates/database/structure/body_for_table_summary.twig +++ b/templates/database/structure/body_for_table_summary.twig @@ -1,7 +1,7 @@ -
+ {% set num_tables_trans -%} {% trans %}%s table{% plural num_tables %}%s tables{% endtrans %} {%- endset %} @@ -14,7 +14,7 @@ {% if num_favorite_tables == 0 %} {% set sum_colspan = sum_colspan - 1 %} {% endif %} - {% trans 'Sum' %}{% trans 'Sum' %}{{ cell_text }}{{ cell_text }}{{ sum_formatted }} {{ sum_unit }}{{ sum_formatted }} {{ sum_unit }}{{ overhead_formatted }} {{ overhead_unit }}{{ overhead_formatted }} {{ overhead_unit }} + {{ create_time_all }} + {{ update_time_all }} + {{ check_time_all }}
+ 0 %} - + {# Check if current table is already in favorite list #} {% set fav_params = { 'db': db, @@ -38,35 +38,35 @@ + {{ may_have_rows ? get_icon('b_browse', 'Browse'|trans) : get_icon('bd_browse', 'Browse'|trans) }} + {{ get_icon('b_props', 'Structure'|trans) }} + {{ may_have_rows ? get_icon('b_select', 'Search'|trans) : get_icon('bd_select', 'Search'|trans) }} + {{ get_icon('b_insrow', 'Insert'|trans) }} + {{ get_icon('b_edit', 'Edit'|trans) }} + + {% if approx_rows %} + {{ formatted_size }} {{ unit }} + {{ overhead|raw }} + {{ create_time }} + {{ update_time }} + {{ check_time }} -- {% trans 'View' %} -------------
- +
+
+ - + {% if replication %} @@ -18,7 +18,7 @@ {% if num_favorite_tables > 0 %} {% set action_colspan = action_colspan + 1 %} {% endif %} - {# larger values are more interesting so default sort order is DESC #} diff --git a/templates/database/tracking/tables.twig b/templates/database/tracking/tables.twig index 555c17b6b3..d29c0800bf 100644 --- a/templates/database/tracking/tables.twig +++ b/templates/database/tracking/tables.twig @@ -6,8 +6,8 @@ {{ get_hidden_inputs(db) }} -
{{ sortable_table_header('Table'|trans, 'table') }}{% trans 'Replication' %} + {% trans 'Action' %}
- +
+ @@ -147,8 +147,8 @@ {{ get_hidden_inputs(db) }} -
{% trans 'Table' %}
- +
+ diff --git a/templates/database/triggers/list.twig b/templates/database/triggers/list.twig index 48aa8ea572..f6d33ac280 100644 --- a/templates/database/triggers/list.twig +++ b/templates/database/triggers/list.twig @@ -11,7 +11,8 @@ {% trans 'There are no triggers to display.' %} -
{% trans 'Table' %}
+
+ @@ -22,9 +23,12 @@ + + {% for i in 0..(table is empty ? 7 : 6) %}{% endfor %} {{ rows|raw }} +
{% trans 'Name' %}{% trans 'Time' %} {% trans 'Event' %}
{% if items is not empty %} diff --git a/templates/server/collations/index.twig b/templates/server/collations/index.twig index 7130d06402..c4ad5afc0a 100644 --- a/templates/server/collations/index.twig +++ b/templates/server/collations/index.twig @@ -6,18 +6,18 @@
-
- - +
+
+ - - + + {% for charset in charsets %} - {% for collation in charset.collations %} - - + + {% endfor %} diff --git a/templates/server/databases/index.twig b/templates/server/databases/index.twig index 61ebf89d75..1cc49236bf 100644 --- a/templates/server/databases/index.twig +++ b/templates/server/databases/index.twig @@ -94,7 +94,7 @@ {{ get_hidden_inputs(url_params) }}
-
{% trans 'Collation' %}{% trans 'Description' %}{% trans 'Collation' %}{% trans 'Description' %}
+ {{ charset.name }} {% if charset.description is not empty %} ({{ charset.description }}) @@ -25,8 +25,13 @@
{{ collation.name }} + {{ collation.name }} + {% if collation.is_default %} + {% trans '(default)' %} + {% endif %} + {{ collation.description }}
+
{% if is_drop_allowed %} diff --git a/templates/server/engines/index.twig b/templates/server/engines/index.twig index 56ff04b738..99d1adcce5 100644 --- a/templates/server/engines/index.twig +++ b/templates/server/engines/index.twig @@ -6,28 +6,28 @@ -
-
- - - - - - - - {% for engine, details in engines %} - - - +
+
{% trans 'Storage Engine' %}{% trans 'Description' %}
- - {{ details['Engine'] }} - - {{ details['Comment'] }}
+ + + + - {% endfor %} - -
{% trans 'Storage Engine' %}{% trans 'Description' %}
+ +
+ + {{ details['Engine'] }} + + {{ details['Comment'] }}
diff --git a/templates/server/plugins/index.twig b/templates/server/plugins/index.twig index 0a430b2747..d9aacb6f45 100644 --- a/templates/server/plugins/index.twig +++ b/templates/server/plugins/index.twig @@ -15,19 +15,19 @@ {% for type, list in plugins %} -
-
- -
+
+
+ + - + - - - - - + + + + + @@ -36,7 +36,7 @@ diff --git a/templates/server/privileges/change_password.twig b/templates/server/privileges/change_password.twig index 6529973f13..b74dd8474e 100644 --- a/templates/server/privileges/change_password.twig +++ b/templates/server/privileges/change_password.twig @@ -8,7 +8,7 @@
{% trans 'Change password' %} -
{{ type }}
{% trans 'Plugin' %}{% trans 'Description' %}{% trans 'Version' %}{% trans 'Author' %}{% trans 'License' %}{% trans 'Plugin' %}{% trans 'Description' %}{% trans 'Version' %}{% trans 'Author' %}{% trans 'License' %}
{{ plugin.name }} {% if plugin.status != 'ACTIVE' %} - + {% if plugin.status == 'INACTIVE' %} {% trans 'inactive' %} {% elseif plugin.status == 'DISABLED' %} @@ -46,7 +46,7 @@ {% elseif plugin.status == 'DELETED' %} {% trans 'deleted' %} {% endif %} - + {% endif %} {{ plugin.description }}
+
diff --git a/templates/server/privileges/privileges_summary.twig b/templates/server/privileges/privileges_summary.twig index ec5770b8b1..e42fa12d0d 100644 --- a/templates/server/privileges/privileges_summary.twig +++ b/templates/server/privileges/privileges_summary.twig @@ -8,18 +8,18 @@ {{ legend }} - - +
+ - - - + + + {% if type == 'database' %} - + {% elseif type == 'table' %} - + {% endif %} - + diff --git a/templates/server/privileges/users_overview.twig b/templates/server/privileges/users_overview.twig index abd7e9999f..026435722b 100644 --- a/templates/server/privileges/users_overview.twig +++ b/templates/server/privileges/users_overview.twig @@ -1,22 +1,22 @@ {{ get_hidden_inputs() }} -
-
{{ type_label }}{% trans 'Privileges' %}{% trans 'Grant' %}{{ type_label }}{% trans 'Privileges' %}{% trans 'Grant' %}{% trans 'Table-specific privileges' %}{% trans 'Table-specific privileges' %}{% trans 'Column-specific privileges' %}{% trans 'Column-specific privileges' %}{% trans 'Action' %}{% trans 'Action' %}
- +
+
+ - - - - + + + {% if menus_work %} - + {% endif %} - - + + diff --git a/templates/server/status/processes/list.twig b/templates/server/status/processes/list.twig index 3bef4a78f6..4062ceba2c 100644 --- a/templates/server/status/processes/list.twig +++ b/templates/server/status/processes/list.twig @@ -1,10 +1,10 @@
-
{% trans 'User name' %}{% trans 'Host name' %}{% trans 'Password' %} + {% trans 'User name' %}{% trans 'Host name' %}{% trans 'Password' %} {% trans 'Global privileges' %} {{ show_hint('Note: MySQL privilege names are expressed in English.') }} {% trans 'User group' %}{% trans 'User group' %}{% trans 'Grant' %}{% trans 'Action' %}{% trans 'Grant' %}{% trans 'Action' %}
- +
+ {% for column in columns %} - + - + diff --git a/templates/server/status/queries/index.twig b/templates/server/status/queries/index.twig index 1860e192ca..61700e640e 100644 --- a/templates/server/status/queries/index.twig +++ b/templates/server/status/queries/index.twig @@ -26,28 +26,28 @@
-
{% trans 'Processes' %} + {{ column.name }} {% if column.is_sorted %} @@ -44,7 +44,7 @@ {% trans 'Kill' %} - {{ row.id }}{{ row.id }} {{ row.user }} {{ row.host }} @@ -55,7 +55,7 @@ {% endif %} {{ row.command }}{{ row.time }}{{ row.time }} {{ row.state }} {{ row.progress }} {{ row.info|raw }}
+
- + - - - - + + + + {% for query in queries %} - - - - + + + + {% endfor %} diff --git a/templates/server/status/status/index.twig b/templates/server/status/status/index.twig index 0f3826a031..12473afc8e 100644 --- a/templates/server/status/status/index.twig +++ b/templates/server/status/status/index.twig @@ -7,46 +7,46 @@

{{ 'This MySQL server has been running for %1$s. It started up on %2$s.'|trans|format(uptime, start_time) }}

-
{% trans 'Statements' %}{% trans %}#{% notes %}# = Amount of queries{% endtrans %}ø {% trans 'per hour' %}%{% trans 'Statements' %}{% trans %}#{% notes %}# = Amount of queries{% endtrans %}{% trans 'ø per hour' %}%
{{ query.name }}{{ format_number(query.value, 5, 0, true) }}{{ format_number(query.per_hour, 4, 1, true) }}{{ format_number(query.percentage, 0, 2) }}{{ query.name }}{{ format_number(query.value, 5, 0, true) }}{{ format_number(query.per_hour, 4, 1, true) }}{{ format_number(query.percentage, 0, 2) }}
- +
+ - - - + + {% for each_traffic in traffic %} - - - + + + {% endfor %}
+ {% trans 'Traffic' %} {{ show_hint('On a busy server, the byte counters may overrun, so those statistics as reported by the MySQL server may be incorrect.'|trans) }} #ø {% trans 'per hour' %}#{% trans 'ø per hour' %}
{{ each_traffic.name }}{{ each_traffic.number }}{{ each_traffic.per_hour }}{{ each_traffic.name }}{{ each_traffic.number }}{{ each_traffic.per_hour }}
- - +
+ - - - - + + + + {% for connection in connections %} - - - - + + + + {% endfor %} diff --git a/templates/server/status/variables/index.twig b/templates/server/status/variables/index.twig index ef0b7c4bc3..f0cf50e34b 100644 --- a/templates/server/status/variables/index.twig +++ b/templates/server/status/variables/index.twig @@ -61,17 +61,17 @@
-
{% trans 'Connections' %}#ø {% trans 'per hour' %}%{% trans 'Connections' %}#{% trans 'ø per hour' %}%
{{ connection.name }}{{ connection.number }}{{ connection.per_hour }}{{ connection.percentage }}{{ connection.name }}{{ connection.number }}{{ connection.per_hour }}{{ connection.percentage }}
+
- + - - - + + + @@ -82,7 +82,7 @@ {{ variable.doc|raw }} - -
{% trans 'Variable' %}{% trans 'Value' %}{% trans 'Description' %}{% trans 'Variable' %}{% trans 'Value' %}{% trans 'Description' %}
+ {% if variable.has_alert %} @@ -117,7 +117,7 @@ + {{ variable.description }} {% for doc in variable.description_doc %} {% if doc.name == 'doc' %} diff --git a/templates/server/user_groups/user_groups.twig b/templates/server/user_groups/user_groups.twig index 579ef4aa06..8c0d99b42a 100644 --- a/templates/server/user_groups/user_groups.twig +++ b/templates/server/user_groups/user_groups.twig @@ -2,22 +2,22 @@ {% if has_rows > 0 %} {{ hidden_inputs|raw }} - - - -
+ + + + - - - - @@ -29,7 +29,7 @@ -
{% trans 'User groups' %} + {% trans 'Server level tabs' %} + {% trans 'Database level tabs' %} + {% trans 'Table level tabs' %} + {% trans 'Action' %}
{{ groupName.serverTab }} {{ groupName.dbTab }} {{ groupName.tableTab }} + {{ groupName.viewUsersIcon|raw }}    {{ groupName.editUsersIcon|raw }} diff --git a/templates/server/variables/index.twig b/templates/server/variables/index.twig index a0f7c817fb..627b6b46cc 100644 --- a/templates/server/variables/index.twig +++ b/templates/server/variables/index.twig @@ -23,58 +23,56 @@ 'filter_value': filter_value } only %} -
-
- - - - - - +
+
{% trans 'Action' %}{% trans 'Variable' %}{% trans 'Value' %}
+ + + + + + + + + + {% for variable in variables %} + + + + - - - {% for variable in variables %} - - - - + {% if variable.has_session_value %} + + + + - - {% if variable.has_session_value %} - - - - - - {% endif %} - {% endfor %} - -
{% trans 'Action' %}{% trans 'Variable' %}{% trans 'Value' %}
+ {% if variable.is_editable %} + {{ get_icon('b_edit', 'Edit'|trans) }} + {% else %} + + {{ get_icon('bd_edit', 'Edit'|trans) }} + + {% endif %} + + {% if variable.doc_link != null %} + + {{ variable.doc_link|raw }} + + {% else %} + {{ variable.name|replace({'_': ' '}) }} + {% endif %} + + {% if variable.is_escaped %} + {{ variable.value|raw }} + {% else %} + {{ variable.value|e|replace({',': ',​'})|raw }} + {% endif %} +
- {% if variable.is_editable %} - {{ get_icon('b_edit', 'Edit'|trans) }} - {% else %} - - {{ get_icon('bd_edit', 'Edit'|trans) }} - - {% endif %} - - {% if variable.doc_link != null %} - - {{ variable.doc_link|raw }} - - {% else %} - {{ variable.name|replace({'_': ' '}) }} - {% endif %} - - {% if variable.is_escaped %} - {{ variable.value|raw }} - {% else %} - {{ variable.value|e|replace({',': ',​'})|raw }} - {% endif %} -
{{ variable.name|replace({'_': ' '}) }} ({% trans 'Session value' %}){{ variable.session_value }}
({% trans 'Session value' %}){{ variable.session_value }}
-
+ {% endif %} + {% endfor %} + +
diff --git a/templates/table/privileges/index.twig b/templates/table/privileges/index.twig index 40c6832206..425b9b73d6 100644 --- a/templates/table/privileges/index.twig +++ b/templates/table/privileges/index.twig @@ -11,9 +11,9 @@ }, '&') ~ '">' ~ db|escape('html') ~ '.' ~ table|escape('html') ~ '')|raw }} -
- - +
+
+ @@ -29,18 +29,18 @@ {% for privilege in privileges %} {% set privileges_amount = privilege.privileges|length %} - 1 %} rowspan="{{ privileges_amount }}"{% endif %}> + 1 %} class="align-middle" rowspan="{{ privileges_amount }}"{% endif %}> - 1 %} rowspan="{{ privileges_amount }}"{% endif %}> + 1 %} class="align-middle" rowspan="{{ privileges_amount }}"{% endif %}> {% if privilege.user is empty %} {% trans 'Any' %} {% else %} {{ privilege.user }} {% endif %} - 1 %} rowspan="{{ privileges_amount }}"{% endif %}> + 1 %} class="align-middle" rowspan="{{ privileges_amount }}"{% endif %}> {{ privilege.host }} {% for priv in privilege.privileges %} diff --git a/templates/table/relation/common_form.twig b/templates/table/relation/common_form.twig index 092250c10d..853aa69d98 100644 --- a/templates/table/relation/common_form.twig +++ b/templates/table/relation/common_form.twig @@ -7,9 +7,10 @@ {% if is_foreign_key_supported(tbl_storage_engine) %}
{% trans 'Foreign key constraints' %} -
-
{% trans 'User name' %}
- +
+
+ + {% if tbl_storage_engine|upper == 'INNODB' %} @@ -110,14 +111,19 @@ {% trans 'Internal relationships' %} {{ show_docu('config', 'cfg_Servers_relation') }} -
{% trans 'Actions' %} {% trans 'Constraint properties' %}
- +
+ + - + + + {% set saved_row_cnt = save_row|length - 1 %} {% for i in 0..saved_row_cnt %} {% set myfield = save_row[i]['Field'] %} @@ -185,6 +191,7 @@ {% endfor %} +
{% trans 'Column' %}{% trans 'Internal relation' %} - {% if is_foreign_key_supported(tbl_storage_engine) %} - {{ show_hint('An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'|trans) }} - {% endif %} + + {% trans 'Internal relation' %} + {% if is_foreign_key_supported(tbl_storage_engine) %} + {{ show_hint('An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'|trans) }} + {% endif %}
{% if is_foreign_key_supported(tbl_storage_engine) %} diff --git a/templates/table/search/index.twig b/templates/table/search/index.twig index c00fdeaa5b..e6303d69d5 100644 --- a/templates/table/search/index.twig +++ b/templates/table/search/index.twig @@ -28,9 +28,9 @@ {% trans 'Do a "query by example" (wildcard: "%")' %} -
- - +
+
+ {% if geom_column_flag %} diff --git a/templates/table/structure/display_partitions.twig b/templates/table/structure/display_partitions.twig index 9078460bd0..2f9a6683a1 100644 --- a/templates/table/structure/display_partitions.twig +++ b/templates/table/structure/display_partitions.twig @@ -17,8 +17,8 @@ {{ sub_partition_method }}({{ sub_partition_expression }})

{% endif %} -

{% trans 'Function' %}
- +
+ @@ -36,7 +36,7 @@ {% for partition in partitions %} - + {% if has_sub_partitions %} diff --git a/templates/table/structure/display_structure.twig b/templates/table/structure/display_structure.twig index 65f3e2debb..99a96af9f2 100644 --- a/templates/table/structure/display_structure.twig +++ b/templates/table/structure/display_structure.twig @@ -12,10 +12,10 @@ {%- else -%} "table" {%- endif %}> -
-
# {% trans 'Partition' %}
{{ partition.getOrdinal() }}
+
+
{# Table header #} - + @@ -406,9 +406,9 @@ {% if indexes is not empty %} {{ indexes_duplicates|raw }} -
-
#
- +
+
+ diff --git a/templates/table/structure/display_table_stats.twig b/templates/table/structure/display_table_stats.twig index e56beb2021..f8c2afd109 100644 --- a/templates/table/structure/display_table_stats.twig +++ b/templates/table/structure/display_table_stats.twig @@ -10,8 +10,8 @@ {% if not tbl_is_view and not db_is_system_schema %} -
{% trans 'Action' %} {% trans 'Keyname' %}
- +
{% trans 'Space usage' %}
+ @@ -47,6 +47,7 @@ {% endif %} + {# Optimize link if overhead #} {% if free_size is defined @@ -55,8 +56,9 @@ or tbl_storage_engine == 'MARIA' or tbl_storage_engine == 'BDB') or (tbl_storage_engine == 'INNODB' and innodb_file_per_table == true) %} - - + + + {% endif %} -
{% trans 'Space usage' %}
{% trans 'Data' %}{{ tot_unit }}
+
{{ get_icon('b_tbloptimize', 'Optimize table'|trans) }} - +
{% endif %} {% set avg_size = avg_size is defined ? avg_size : null %} {% set avg_unit = avg_unit is defined ? avg_unit : null %} - - +
{% trans 'Row statistics' %}
+ {% if showtable['Row_format'] is defined %} diff --git a/templates/table/tracking/main.twig b/templates/table/tracking/main.twig index cbb46ef644..357276b035 100644 --- a/templates/table/tracking/main.twig +++ b/templates/table/tracking/main.twig @@ -21,8 +21,8 @@ {% if last_version > 0 %} {{ get_hidden_inputs(db, table) }} -
{% trans 'Row statistics' %}
- +
+ diff --git a/templates/table/tracking/report_table.twig b/templates/table/tracking/report_table.twig index eac6b84945..19e33274b0 100644 --- a/templates/table/tracking/report_table.twig +++ b/templates/table/tracking/report_table.twig @@ -1,5 +1,5 @@ -
{% trans 'Version' %}
- +
+ diff --git a/templates/table/tracking/structure_snapshot_columns.twig b/templates/table/tracking/structure_snapshot_columns.twig index b7f1beaa41..5be46fbc2a 100644 --- a/templates/table/tracking/structure_snapshot_columns.twig +++ b/templates/table/tracking/structure_snapshot_columns.twig @@ -1,6 +1,6 @@

{% trans 'Structure' %}

-
{% trans %}#{% context %}Number{% endtrans %} {% trans 'Date' %}
- +
+ diff --git a/templates/table/tracking/structure_snapshot_indexes.twig b/templates/table/tracking/structure_snapshot_indexes.twig index 70fd093c22..b77c54c3ac 100644 --- a/templates/table/tracking/structure_snapshot_indexes.twig +++ b/templates/table/tracking/structure_snapshot_indexes.twig @@ -1,6 +1,6 @@

{% trans 'Indexes' %}

-
{% trans %}#{% context %}Number{% endtrans %} {% trans 'Column' %}
- +
+ diff --git a/templates/table/zoom_search/index.twig b/templates/table/zoom_search/index.twig index e0fb24daad..81e2801f48 100644 --- a/templates/table/zoom_search/index.twig +++ b/templates/table/zoom_search/index.twig @@ -29,8 +29,8 @@ {% trans 'Do a "query by example" (wildcard: "%") for two different columns' %} -
{% trans 'Keyname' %} {% trans 'Type' %}
- +
+ {% if geom_column_flag %} @@ -52,9 +52,9 @@ {# After X-Axis and Y-Axis column rows, display additional criteria option #} {% if i == 2 %} - {% endif %} @@ -111,7 +111,7 @@
{% trans 'Function' %}
+ {% trans 'Additional search criteria' %} - +
- +