From 43131cfe57e5f5faaa1e51de71f2d104ba7e85e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Wed, 18 Nov 2020 22:59:35 -0300 Subject: [PATCH 01/21] Convert server status tables to Bootstrap style MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- templates/server/databases/index.twig | 2 +- templates/server/status/status/index.twig | 36 +++++++++++------------ themes/bootstrap/scss/_common.scss | 17 +++-------- themes/metro/scss/_common.scss | 15 ++++------ themes/metro/scss/_tables.scss | 2 -- themes/original/scss/_common.scss | 18 ------------ themes/original/scss/_tables.scss | 1 - themes/pmahomme/scss/_common.scss | 18 ++++-------- themes/pmahomme/scss/_tables.scss | 4 +-- 9 files changed, 34 insertions(+), 79 deletions(-) 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) }}
- +
{% if is_drop_allowed %} diff --git a/templates/server/status/status/index.twig b/templates/server/status/status/index.twig index 0f3826a031..ea05bcb3e9 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) }}

-
- +
+ - - - + + {% 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/themes/bootstrap/scss/_common.scss b/themes/bootstrap/scss/_common.scss index d35a1517ff..6c2cf29271 100644 --- a/themes/bootstrap/scss/_common.scss +++ b/themes/bootstrap/scss/_common.scss @@ -1178,13 +1178,12 @@ div#serverstatusquerieschart { } table { - &#serverstatusqueriesdetails, - &#serverstatustraffic { + &#serverstatusqueriesdetails { float: $left; - } - &#serverstatusqueriesdetails th { - min-width: 35px; + th { + min-width: 35px; + } } &#serverstatusvariables { @@ -1200,10 +1199,6 @@ table { width: 6em; } } - - &#serverstatusconnections { - float: $left; - } } div { @@ -3738,10 +3733,6 @@ body .ui-dialog { display: none; } - table#serverstatusconnections { - margin-#{$left}: 0; - } - #table_name_col_no { top: 62px; } diff --git a/themes/metro/scss/_common.scss b/themes/metro/scss/_common.scss index f57a9ab0c7..e2a095237b 100644 --- a/themes/metro/scss/_common.scss +++ b/themes/metro/scss/_common.scss @@ -1227,14 +1227,14 @@ div#serverstatusquerieschart { } table { - &#serverstatusqueriesdetails, - &#serverstatustraffic { + &#serverstatusqueriesdetails { float: $left; + + th { + min-width: 35px; + } } - &#serverstatusqueriesdetails th { - min-width: 35px; - } &#serverstatusvariables { width: 100%; @@ -1249,11 +1249,6 @@ table { width: 6em; } } - - &#serverstatusconnections { - float: $left; - margin-#{$left}: 30px; - } } div { diff --git a/themes/metro/scss/_tables.scss b/themes/metro/scss/_tables.scss index 6502d0dfa3..1f3575011d 100644 --- a/themes/metro/scss/_tables.scss +++ b/themes/metro/scss/_tables.scss @@ -1,6 +1,4 @@ .table { - width: auto; - td { touch-action: manipulation; vertical-align: middle; diff --git a/themes/original/scss/_common.scss b/themes/original/scss/_common.scss index 8143fe147d..02a28dac9c 100644 --- a/themes/original/scss/_common.scss +++ b/themes/original/scss/_common.scss @@ -968,15 +968,6 @@ div { } table { - &#serverstatustraffic { - float: $left; - } - - &#serverstatusconnections { - float: $left; - margin-#{$left}: 30px; - } - &#serverstatusvariables { width: 100%; margin-bottom: 1em; @@ -990,11 +981,6 @@ table { width: 6em; } } - - &#serverstatusconnections { - float: $left; - margin-#{$left}: 30px; - } } div { @@ -3429,10 +3415,6 @@ body { display: none; } - table#serverstatusconnections { - margin-#{$left}: 0; - } - #table_name_col_no { top: 62px; } diff --git a/themes/original/scss/_tables.scss b/themes/original/scss/_tables.scss index 13e68c9975..ea6a20660d 100644 --- a/themes/original/scss/_tables.scss +++ b/themes/original/scss/_tables.scss @@ -1,6 +1,5 @@ .table { border-collapse: separate; - width: auto; td { touch-action: manipulation; diff --git a/themes/pmahomme/scss/_common.scss b/themes/pmahomme/scss/_common.scss index c8e75edde7..7598f2df04 100644 --- a/themes/pmahomme/scss/_common.scss +++ b/themes/pmahomme/scss/_common.scss @@ -1233,14 +1233,14 @@ div#serverstatusquerieschart { } table { - &#serverstatusqueriesdetails, - &#serverstatustraffic { + &#serverstatusqueriesdetails { float: $left; + + th { + min-width: 35px; + } } - &#serverstatusqueriesdetails th { - min-width: 35px; - } &#serverstatusvariables { width: 100%; @@ -1255,10 +1255,6 @@ table { width: 6em; } } - - &#serverstatusconnections { - float: $left; - } } div { @@ -3801,10 +3797,6 @@ body .ui-dialog { display: none; } - table#serverstatusconnections { - margin-#{$left}: 0; - } - #table_name_col_no { top: 62px; } diff --git a/themes/pmahomme/scss/_tables.scss b/themes/pmahomme/scss/_tables.scss index 68a74dbd1c..d947a147db 100644 --- a/themes/pmahomme/scss/_tables.scss +++ b/themes/pmahomme/scss/_tables.scss @@ -1,6 +1,4 @@ .table { - width: auto; - th, td { text-shadow: 0 1px 0 #fff; @@ -8,7 +6,6 @@ th { text-align: $left; - background-image: linear-gradient(#fff, #ccc); } td { @@ -18,6 +15,7 @@ thead th { border-#{$right}: 1px solid #fff; + background-image: linear-gradient(#fff, #ccc); } } From 6f616783914689f737f2a31e92fe43fc0e9603e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Thu, 19 Nov 2020 15:30:16 -0300 Subject: [PATCH 02/21] Convert tables of server status pages to Bootstrap style MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- js/src/server/status/sorter.js | 2 +- js/src/server/status/variables.js | 11 ++++---- templates/server/status/processes/list.twig | 10 ++++---- templates/server/status/queries/index.twig | 20 +++++++-------- templates/server/status/status/index.twig | 6 ++--- templates/server/status/variables/index.twig | 14 +++++------ .../Server/Status/ProcessesControllerTest.php | 3 +-- .../Server/Status/StatusControllerTest.php | 22 ++++++++-------- .../Server/Status/VariablesControllerTest.php | 8 +++--- themes/bootstrap/scss/_common.scss | 24 ------------------ themes/metro/scss/_common.scss | 25 ------------------- themes/original/scss/_common.scss | 20 --------------- themes/pmahomme/scss/_common.scss | 25 ------------------- 13 files changed, 48 insertions(+), 142 deletions(-) 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/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 '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 }}
- +
+ {% 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 ea05bcb3e9..12473afc8e 100644 --- a/templates/server/status/status/index.twig +++ b/templates/server/status/status/index.twig @@ -7,7 +7,7 @@

{{ '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) }}
+
@@ -30,7 +30,7 @@
- +
@@ -43,7 +43,7 @@ {% for connection in connections %} - + 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' %}
{{ connection.name }}{{ 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/test/classes/Controllers/Server/Status/ProcessesControllerTest.php b/test/classes/Controllers/Server/Status/ProcessesControllerTest.php index e89a764462..65ae19630e 100644 --- a/test/classes/Controllers/Server/Status/ProcessesControllerTest.php +++ b/test/classes/Controllers/Server/Status/ProcessesControllerTest.php @@ -80,8 +80,7 @@ class ProcessesControllerTest extends AbstractTestCase ); $this->assertStringContainsString( - '', + '
', $html ); $this->assertStringContainsString( diff --git a/test/classes/Controllers/Server/Status/StatusControllerTest.php b/test/classes/Controllers/Server/Status/StatusControllerTest.php index d615af777e..554f08e790 100644 --- a/test/classes/Controllers/Server/Status/StatusControllerTest.php +++ b/test/classes/Controllers/Server/Status/StatusControllerTest.php @@ -85,7 +85,7 @@ class StatusControllerTest extends AbstractTestCase ); //validate 2: Status::getHtmlForServerStateTraffic - $trafficHtml = '
'; + $trafficHtml = '
'; $this->assertStringContainsString( $trafficHtml, $html @@ -98,48 +98,48 @@ class StatusControllerTest extends AbstractTestCase ); //$bytes_received $this->assertStringContainsString( - '', + '', $html ); $this->assertStringContainsString( - '', + '', $html ); $this->assertStringContainsString( - '
' . $bytesReceived . ' B', + '' . $bytesReceived . ' B', $html ); //$bytes_sent $this->assertStringContainsString( - '' . $bytesSent . ' B', + '' . $bytesSent . ' B', $html ); //validate 3: Status::getHtmlForServerStateConnections $this->assertStringContainsString( - 'ConnectionsConnectionsø per hourø per hour
', + '
', $html ); $this->assertStringContainsString( - '', + '', $html ); //Max_used_connections $this->assertStringContainsString( - '', + '', $html ); //Aborted_connects $this->assertStringContainsString( - '', + '', $html ); } diff --git a/test/classes/Controllers/Server/Status/VariablesControllerTest.php b/test/classes/Controllers/Server/Status/VariablesControllerTest.php index c6301a8fa8..9a6fb5b212 100644 --- a/test/classes/Controllers/Server/Status/VariablesControllerTest.php +++ b/test/classes/Controllers/Server/Status/VariablesControllerTest.php @@ -93,19 +93,19 @@ class VariablesControllerTest extends AbstractTestCase ); $this->assertStringContainsString( - '
Max. concurrent connectionsMax. concurrent connections' . $maxUsedConnections, + '' . $maxUsedConnections, $html ); $this->assertStringContainsString( - 'Failed attemptsFailed attempts' . $abortedConnections, + '' . $abortedConnections, $html ); $this->assertStringContainsString( - 'AbortedAborted
', + '
', $html ); $this->assertStringContainsString( - '', + '', $html ); $this->assertStringContainsString( - '', + '', $html ); $this->assertStringContainsString( - '', + '', $html ); diff --git a/themes/bootstrap/scss/_common.scss b/themes/bootstrap/scss/_common.scss index 6c2cf29271..b8e316bca6 100644 --- a/themes/bootstrap/scss/_common.scss +++ b/themes/bootstrap/scss/_common.scss @@ -1177,30 +1177,6 @@ div#serverstatusquerieschart { margin-#{$right}: 50px; } -table { - &#serverstatusqueriesdetails { - float: $left; - - th { - min-width: 35px; - } - } - - &#serverstatusvariables { - width: 100%; - margin-bottom: 1em; - - .name { - width: 18em; - white-space: nowrap; - } - - .value { - width: 6em; - } - } -} - div { &#serverstatus table { tbody td.descr a, diff --git a/themes/metro/scss/_common.scss b/themes/metro/scss/_common.scss index e2a095237b..329a9bcf95 100644 --- a/themes/metro/scss/_common.scss +++ b/themes/metro/scss/_common.scss @@ -1226,31 +1226,6 @@ div#serverstatusquerieschart { padding-#{$left}: 30px; } -table { - &#serverstatusqueriesdetails { - float: $left; - - th { - min-width: 35px; - } - } - - - &#serverstatusvariables { - width: 100%; - margin-bottom: 1em; - - .name { - width: 18em; - white-space: nowrap; - } - - .value { - width: 6em; - } - } -} - div { &#serverstatus table { tbody td.descr a, diff --git a/themes/original/scss/_common.scss b/themes/original/scss/_common.scss index 02a28dac9c..6742d91ed6 100644 --- a/themes/original/scss/_common.scss +++ b/themes/original/scss/_common.scss @@ -961,26 +961,6 @@ div { height: 350px; margin-#{$right}: 50px; } - - &#serverstatus table#serverstatusqueriesdetails { - float: $left; - } -} - -table { - &#serverstatusvariables { - width: 100%; - margin-bottom: 1em; - - .name { - width: 18em; - white-space: nowrap; - } - - .value { - width: 6em; - } - } } div { diff --git a/themes/pmahomme/scss/_common.scss b/themes/pmahomme/scss/_common.scss index 7598f2df04..9a4486d5b4 100644 --- a/themes/pmahomme/scss/_common.scss +++ b/themes/pmahomme/scss/_common.scss @@ -1232,31 +1232,6 @@ div#serverstatusquerieschart { margin-#{$right}: 50px; } -table { - &#serverstatusqueriesdetails { - float: $left; - - th { - min-width: 35px; - } - } - - - &#serverstatusvariables { - width: 100%; - margin-bottom: 1em; - - .name { - width: 18em; - white-space: nowrap; - } - - .value { - width: 6em; - } - } -} - div { &#serverstatus table { tbody td.descr a, From c86e1c15e2b16d315af3724a291d819195137c00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Fri, 20 Nov 2020 14:26:28 -0300 Subject: [PATCH 03/21] Use Bootstrap's table style for User Accounts page tables MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- js/src/functions.js | 10 +++++----- js/src/server/privileges.js | 2 +- .../server/privileges/change_password.twig | 2 +- .../server/privileges/privileges_summary.twig | 16 +++++++-------- .../server/privileges/users_overview.twig | 20 +++++++++---------- templates/server/user_groups/user_groups.twig | 18 ++++++++--------- themes/bootstrap/scss/_common.scss | 1 - themes/metro/scss/_common.scss | 1 - themes/original/scss/_common.scss | 1 - themes/pmahomme/scss/_common.scss | 1 - 10 files changed, 34 insertions(+), 38 deletions(-) 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/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' %} -
VariableVariableValueValueDescriptionDescription
+
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/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 }} -
{% 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' %}
- - -
+ + + + - - - - @@ -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/themes/bootstrap/scss/_common.scss b/themes/bootstrap/scss/_common.scss index b8e316bca6..67f324f18a 100644 --- a/themes/bootstrap/scss/_common.scss +++ b/themes/bootstrap/scss/_common.scss @@ -1014,7 +1014,6 @@ div#tablestatistics table { // end table stats // server privileges -#tableuserrights td, #tablespecificuserrights td { vertical-align: middle; } diff --git a/themes/metro/scss/_common.scss b/themes/metro/scss/_common.scss index 329a9bcf95..a0eac27287 100644 --- a/themes/metro/scss/_common.scss +++ b/themes/metro/scss/_common.scss @@ -1051,7 +1051,6 @@ div#tablestatistics table { /* END table stats */ /* server privileges */ -#tableuserrights td, #tablespecificuserrights td { vertical-align: middle; } diff --git a/themes/original/scss/_common.scss b/themes/original/scss/_common.scss index 6742d91ed6..924e476f30 100644 --- a/themes/original/scss/_common.scss +++ b/themes/original/scss/_common.scss @@ -808,7 +808,6 @@ div#tablestatistics table { min-width: 16em; } -#tableuserrights td, #tablespecificuserrights td { vertical-align: middle; } diff --git a/themes/pmahomme/scss/_common.scss b/themes/pmahomme/scss/_common.scss index 9a4486d5b4..7aa45cd7b7 100644 --- a/themes/pmahomme/scss/_common.scss +++ b/themes/pmahomme/scss/_common.scss @@ -1069,7 +1069,6 @@ div#tablestatistics table { // end table stats // server privileges -#tableuserrights td, #tablespecificuserrights td { vertical-align: middle; } From 9115f1ba7caa7f49922834e686ba692d593222d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Fri, 20 Nov 2020 17:35:30 -0300 Subject: [PATCH 04/21] Use Bootstrap tables for server variables page tables MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- js/src/server/variables.js | 2 +- templates/server/variables/index.twig | 96 +++++++++++++-------------- themes/bootstrap/scss/_common.scss | 75 --------------------- themes/metro/scss/_common.scss | 83 ----------------------- themes/original/scss/_common.scss | 66 ------------------ themes/pmahomme/scss/_common.scss | 75 --------------------- 6 files changed, 48 insertions(+), 349 deletions(-) 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/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/themes/bootstrap/scss/_common.scss b/themes/bootstrap/scss/_common.scss index 67f324f18a..dd12cca7cb 100644 --- a/themes/bootstrap/scss/_common.scss +++ b/themes/bootstrap/scss/_common.scss @@ -1290,81 +1290,6 @@ div { // end serverstatus -// server variables -#serverVariables { - width: 100%; - - .var-row > td { - line-height: 2em; - } - - .var-header { - color: $th-color; - background: #f3f3f3; - background: linear-gradient(#fff, #ccc); - font-weight: bold; - text-align: $left; - } - - .var-row { - padding: 0.5em; - min-height: 18px; - } - - .var-name { - font-weight: bold; - - &.session { - font-weight: normal; - font-style: italic; - } - } - - .var-value { - float: $right; - text-align: $right; - } - - .var-doc { - overflow: visible; - float: $right; - } - - // server variables editor - .editLink { - padding-#{$right}: 1em; - font-family: sans-serif; - } - - .serverVariableEditor { - width: 100%; - overflow: hidden; - - input { - width: 100%; - margin: 0 0.5em; - box-sizing: border-box; - -ms-box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - height: 2.2em; - } - - div { - display: block; - overflow: hidden; - padding-#{$right}: 1em; - } - - a { - margin: 0 0.5em; - line-height: 2em; - } - } -} - -// end server variables - // profiling div#profilingchart { diff --git a/themes/metro/scss/_common.scss b/themes/metro/scss/_common.scss index a0eac27287..1850320a93 100644 --- a/themes/metro/scss/_common.scss +++ b/themes/metro/scss/_common.scss @@ -1327,89 +1327,6 @@ div { /* end serverstatus */ -/* server variables */ -#serverVariables { - table-layout: fixed; - width: 100%; - - .var-row > td { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - line-height: 2em; - } - - .var-header { - color: $th-color; - background: #f3f3f3; - font-weight: bold; - text-align: $left; - } - - .var-row { - padding: 0.5em; - min-height: 18px; - } - - .var-action { - width: 120px; - } - - .var-name { - float: $left; - - &.session { - font-weight: normal; - font-style: italic; - } - } - - .var-value { - width: 50%; - float: $right; - text-align: $right; - } - - .var-doc { - overflow: visible; - float: $right; - } - - /* server variables editor */ - .editLink { - padding-#{$right}: 1em; - float: $left; - font-family: sans-serif; - } - - .serverVariableEditor { - width: 100%; - overflow: hidden; - - input { - width: 100%; - margin: 0 0.5em; - box-sizing: border-box; - -ms-box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - height: 2.2em; - } - - div { - display: block; - overflow: hidden; - padding-#{$right}: 1em; - } - - a { - float: $right; - margin: 0 0.5em; - line-height: 2em; - } - } -} - /* profiling */ div#profilingchart { diff --git a/themes/original/scss/_common.scss b/themes/original/scss/_common.scss index 924e476f30..2c6554c240 100644 --- a/themes/original/scss/_common.scss +++ b/themes/original/scss/_common.scss @@ -1052,72 +1052,6 @@ div#logTable { } } -/* server variables */ -#serverVariables { - width: 100%; - - .var-row > tr { - line-height: 2em; - } - - .var-header { - font-weight: bold; - color: $th-color; - background: $th-background; - text-align: $left; - } - - .var-row { - padding: 0.5em; - min-height: 18px; - } - - .var-name { - font-weight: bold; - - &.session { - font-weight: normal; - font-style: italic; - } - } - - .var-value { - text-align: $right; - float: $right; - } - - .editLink { - padding-#{$right}: 1em; - font-family: sans-serif; - } - - .serverVariableEditor { - width: 100%; - overflow: hidden; - - input { - width: 100%; - margin: 0 0.5em; - box-sizing: border-box; - -ms-box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - height: 2.2em; - } - - div { - display: block; - overflow: hidden; - padding-#{$right}: 1em; - } - - a { - margin: 0 0.5em; - line-height: 2em; - } - } -} - /* profiling */ div#profilingchart { width: 850px; diff --git a/themes/pmahomme/scss/_common.scss b/themes/pmahomme/scss/_common.scss index 7aa45cd7b7..d2cbc498b4 100644 --- a/themes/pmahomme/scss/_common.scss +++ b/themes/pmahomme/scss/_common.scss @@ -1345,81 +1345,6 @@ div { // end serverstatus -// server variables -#serverVariables { - width: 100%; - - .var-row > td { - line-height: 2em; - } - - .var-header { - color: $th-color; - background: #f3f3f3; - background: linear-gradient(#fff, #ccc); - font-weight: bold; - text-align: $left; - } - - .var-row { - padding: 0.5em; - min-height: 18px; - } - - .var-name { - font-weight: bold; - - &.session { - font-weight: normal; - font-style: italic; - } - } - - .var-value { - float: $right; - text-align: $right; - } - - .var-doc { - overflow: visible; - float: $right; - } - - // server variables editor - .editLink { - padding-#{$right}: 1em; - font-family: sans-serif; - } - - .serverVariableEditor { - width: 100%; - overflow: hidden; - - input { - width: 100%; - margin: 0 0.5em; - box-sizing: border-box; - -ms-box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - height: 2.2em; - } - - div { - display: block; - overflow: hidden; - padding-#{$right}: 1em; - } - - a { - margin: 0 0.5em; - line-height: 2em; - } - } -} - -// end server variables - // profiling div#profilingchart { From 2dc3cee4151bd62ecafafab3604d35e44b843c03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Fri, 20 Nov 2020 18:17:37 -0300 Subject: [PATCH 05/21] Use Bootstrap's table style for server/collations page MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- templates/server/collations/index.twig | 21 ++++++++++++------- .../Server/CollationsControllerTest.php | 8 ++++--- themes/bootstrap/scss/_common.scss | 13 ------------ themes/metro/scss/_common.scss | 13 ------------ themes/original/scss/_common.scss | 13 ------------ themes/pmahomme/scss/_common.scss | 13 ------------ 6 files changed, 18 insertions(+), 63 deletions(-) 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/test/classes/Controllers/Server/CollationsControllerTest.php b/test/classes/Controllers/Server/CollationsControllerTest.php index a33ab3e102..fd7b1b8756 100644 --- a/test/classes/Controllers/Server/CollationsControllerTest.php +++ b/test/classes/Controllers/Server/CollationsControllerTest.php @@ -19,6 +19,7 @@ class CollationsControllerTest extends AbstractTestCase parent::setUp(); $GLOBALS['text_dir'] = 'ltr'; parent::setGlobalConfig(); + parent::defineVersionConstants(); parent::setTheme(); $GLOBALS['PMA_Config']->enableBc(); @@ -39,7 +40,7 @@ class CollationsControllerTest extends AbstractTestCase $actual = $response->getHTMLResult(); $this->assertStringContainsString( - '
', + '
{% 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 }}
', $actual ); $this->assertStringContainsString( @@ -55,9 +56,10 @@ class CollationsControllerTest extends AbstractTestCase $actual ); $this->assertStringContainsString( - '', + 'utf8_general_ci', $actual ); + $this->assertStringContainsString('(default)', $actual); $this->assertStringContainsString( '', $actual @@ -67,7 +69,7 @@ class CollationsControllerTest extends AbstractTestCase $actual ); $this->assertStringContainsString( - '', + 'latin1_swedish_ci', $actual ); $this->assertStringContainsString( diff --git a/themes/bootstrap/scss/_common.scss b/themes/bootstrap/scss/_common.scss index dd12cca7cb..28a039d8b4 100644 --- a/themes/bootstrap/scss/_common.scss +++ b/themes/bootstrap/scss/_common.scss @@ -1471,19 +1471,6 @@ li.no_bullets { float: $left; } -#div_mysql_charset_collations table { - float: $left; - - th, - td { - padding: 0.4em; - } - - th#collationHeader { - width: 35%; - } -} - #qbe_div_table_list, #qbe_div_sql_query { float: $left; diff --git a/themes/metro/scss/_common.scss b/themes/metro/scss/_common.scss index 1850320a93..83ea78a01b 100644 --- a/themes/metro/scss/_common.scss +++ b/themes/metro/scss/_common.scss @@ -1525,19 +1525,6 @@ li { float: $left; } -#div_mysql_charset_collations table { - float: $left; - - th, - td { - padding: 0.4em; - } - - th#collationHeader { - width: 35%; - } -} - .operations_half_width { width: 100%; float: $left; diff --git a/themes/original/scss/_common.scss b/themes/original/scss/_common.scss index 2c6554c240..6d82d48128 100644 --- a/themes/original/scss/_common.scss +++ b/themes/original/scss/_common.scss @@ -1169,19 +1169,6 @@ li.no_bullets { float: $left; } -#div_mysql_charset_collations table { - float: $left; - - th, - td { - padding: 0.4em; - } - - th#collationHeader { - width: 35%; - } -} - #qbe_div_table_list, #qbe_div_sql_query { float: $left; diff --git a/themes/pmahomme/scss/_common.scss b/themes/pmahomme/scss/_common.scss index d2cbc498b4..8bcccb56e8 100644 --- a/themes/pmahomme/scss/_common.scss +++ b/themes/pmahomme/scss/_common.scss @@ -1526,19 +1526,6 @@ li.no_bullets { float: $left; } -#div_mysql_charset_collations table { - float: $left; - - th, - td { - padding: 0.4em; - } - - th#collationHeader { - width: 35%; - } -} - #qbe_div_table_list, #qbe_div_sql_query { float: $left; From 36c1eaa93cc714fae48064b713c0b7ae9ece3c0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Sun, 22 Nov 2020 23:03:51 -0300 Subject: [PATCH 06/21] Use Bootstrap's table style for server/engines pages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- libraries/classes/Engines/Innodb.php | 61 +++++++++---------- libraries/classes/StorageEngine.php | 7 ++- templates/server/engines/index.twig | 44 ++++++------- .../Server/EnginesControllerTest.php | 5 +- test/classes/Engines/InnodbTest.php | 57 +++++++++-------- themes/bootstrap/scss/_common.scss | 5 -- themes/metro/scss/_common.scss | 5 -- themes/original/scss/_common.scss | 5 -- themes/pmahomme/scss/_common.scss | 5 -- 9 files changed, 87 insertions(+), 107 deletions(-) diff --git a/libraries/classes/Engines/Innodb.php b/libraries/classes/Engines/Innodb.php index dda48f45a5..08f3be2798 100644 --- a/libraries/classes/Engines/Innodb.php +++ b/libraries/classes/Engines/Innodb.php @@ -131,15 +131,14 @@ class Innodb extends StorageEngine . ' OR Variable_name = \'Innodb_page_size\';'; $status = $dbi->fetchResult($sql, 0, 1); - $output = '
utf8_general_ciUnicode, case-insensitivelatin1_swedish_ci
' . "\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" - . ' ', + '', $actual ); $this->assertStringContainsString( - '', + '', $actual ); diff --git a/test/classes/Engines/InnodbTest.php b/test/classes/Engines/InnodbTest.php index bc83d982d8..b1e32299e4 100644 --- a/test/classes/Engines/InnodbTest.php +++ b/test/classes/Engines/InnodbTest.php @@ -140,76 +140,75 @@ class InnodbTest extends AbstractTestCase public function testGetPageBufferpool(): void { $this->assertEquals( - '
' . "\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" - . ' + {% for engine, details in engines %} + + + + + {% endfor %} + +
' . "\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/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/test/classes/Controllers/Server/EnginesControllerTest.php b/test/classes/Controllers/Server/EnginesControllerTest.php index 6d81216b13..0677ed5b5a 100644 --- a/test/classes/Controllers/Server/EnginesControllerTest.php +++ b/test/classes/Controllers/Server/EnginesControllerTest.php @@ -22,6 +22,7 @@ class EnginesControllerTest extends AbstractTestCase parent::setUp(); $GLOBALS['text_dir'] = 'ltr'; parent::setGlobalConfig(); + parent::defineVersionConstants(); parent::setTheme(); $GLOBALS['PMA_Config']->enableBc(); @@ -44,11 +45,11 @@ class EnginesControllerTest extends AbstractTestCase $actual = $response->getHTMLResult(); $this->assertStringContainsString( - '
Storage EngineStorage EngineDescriptionDescription
' . "\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" . '
' . "\n" . ' Buffer Pool Usage' . "\n" . '
' . "\n" . - ' Total' . "\n" . - ' : 4,096 pages / 65,536 KiB' . "\n" . + ' Total: 4,096 pages / 65,536 KiB' . "\n" . '
Free pages0Free pages0
Dirty pages0Dirty pages0
Pages containing data0' . "\n" . + ' Pages containing data0' . "\n" . '
Pages to be flushed0' . "\n" . + ' Pages to be flushed0' . "\n" . '
Busy pages0' . "\n" . + ' Busy pages0' . "\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" . ' ' . "\n" . diff --git a/themes/bootstrap/scss/_common.scss b/themes/bootstrap/scss/_common.scss index 28a039d8b4..0a246df826 100644 --- a/themes/bootstrap/scss/_common.scss +++ b/themes/bootstrap/scss/_common.scss @@ -1466,11 +1466,6 @@ li.no_bullets { border-top: 0.1em solid silver; } -#table_innodb_bufferpool_usage, -#table_innodb_bufferpool_activity { - float: $left; -} - #qbe_div_table_list, #qbe_div_sql_query { float: $left; diff --git a/themes/metro/scss/_common.scss b/themes/metro/scss/_common.scss index 83ea78a01b..c3655f14bd 100644 --- a/themes/metro/scss/_common.scss +++ b/themes/metro/scss/_common.scss @@ -1520,11 +1520,6 @@ li { text-align: $right; } -#table_innodb_bufferpool_usage, -#table_innodb_bufferpool_activity { - float: $left; -} - .operations_half_width { width: 100%; float: $left; diff --git a/themes/original/scss/_common.scss b/themes/original/scss/_common.scss index 6d82d48128..b5edc3e3c6 100644 --- a/themes/original/scss/_common.scss +++ b/themes/original/scss/_common.scss @@ -1164,11 +1164,6 @@ li.no_bullets { text-align: $right; } -#table_innodb_bufferpool_usage, -#table_innodb_bufferpool_activity { - float: $left; -} - #qbe_div_table_list, #qbe_div_sql_query { float: $left; diff --git a/themes/pmahomme/scss/_common.scss b/themes/pmahomme/scss/_common.scss index 8bcccb56e8..fa6c764a9e 100644 --- a/themes/pmahomme/scss/_common.scss +++ b/themes/pmahomme/scss/_common.scss @@ -1521,11 +1521,6 @@ li.no_bullets { border-top: 0.1em solid silver; } -#table_innodb_bufferpool_usage, -#table_innodb_bufferpool_activity { - float: $left; -} - #qbe_div_table_list, #qbe_div_sql_query { float: $left; From 6d9ae185f910b49f7949a1d1497b96d1dfb1b34f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Sun, 22 Nov 2020 23:18:22 -0300 Subject: [PATCH 07/21] Use Bootstrap's tables for server plugins page MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- templates/server/plugins/index.twig | 24 +++++++++---------- .../Server/PluginsControllerTest.php | 11 +++++---- themes/bootstrap/scss/_common.scss | 5 ---- themes/metro/scss/_common.scss | 5 ---- themes/original/scss/_common.scss | 4 ---- themes/pmahomme/scss/_common.scss | 5 ---- 6 files changed, 18 insertions(+), 36 deletions(-) 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 %} -
-
-
' . "\n" . ' Buffer Pool Activity' . "\n" . '
Read requests64' . "\n" . + ' Read requests64' . "\n" . '
Write requests64' . "\n" . + ' Write requests64' . "\n" . '
Read misses32' . "\n" . + ' Read misses32' . "\n" . '
Write waits0' . "\n" . + ' Write waits0' . "\n" . '
Read misses in %50 %' . "\n" . + ' Read misses in %50 %' . "\n" . '
Write waits in %0 %' . "\n" . + ' Write waits in %0 %' . "\n" . '
-
+
+
+ + - + - - - - - + + + + + @@ -36,7 +36,7 @@ diff --git a/test/classes/Controllers/Server/PluginsControllerTest.php b/test/classes/Controllers/Server/PluginsControllerTest.php index 6c4764b0c6..f7f7647629 100644 --- a/test/classes/Controllers/Server/PluginsControllerTest.php +++ b/test/classes/Controllers/Server/PluginsControllerTest.php @@ -21,6 +21,7 @@ class PluginsControllerTest extends AbstractTestCase parent::setUp(); $GLOBALS['text_dir'] = 'ltr'; parent::setGlobalConfig(); + parent::defineVersionConstants(); parent::setTheme(); $GLOBALS['PMA_Config']->enableBc(); @@ -73,23 +74,23 @@ class PluginsControllerTest extends AbstractTestCase //validate 1:Items $this->assertStringContainsString( - '', + '', $actual ); $this->assertStringContainsString( - '', + '', $actual ); $this->assertStringContainsString( - '', + '', $actual ); $this->assertStringContainsString( - '', + '', $actual ); $this->assertStringContainsString( - '', + '', $actual ); diff --git a/themes/bootstrap/scss/_common.scss b/themes/bootstrap/scss/_common.scss index 0a246df826..3619db15a6 100644 --- a/themes/bootstrap/scss/_common.scss +++ b/themes/bootstrap/scss/_common.scss @@ -23,11 +23,6 @@ h2 { margin: 0 0 12px; } -.data_full_width { - margin: 0 0 12px; - width: 100%; -} - h3 { font-weight: bold; font-size: 1rem; diff --git a/themes/metro/scss/_common.scss b/themes/metro/scss/_common.scss index c3655f14bd..6f7d1277d2 100644 --- a/themes/metro/scss/_common.scss +++ b/themes/metro/scss/_common.scss @@ -189,11 +189,6 @@ h2 { margin: 10px 0; } -.data_full_width { - margin: 10px 0; - width: 100%; -} - h3 { font-family: $font-family-extra-bold; text-transform: uppercase; diff --git a/themes/original/scss/_common.scss b/themes/original/scss/_common.scss index b5edc3e3c6..34f3ee8fc1 100644 --- a/themes/original/scss/_common.scss +++ b/themes/original/scss/_common.scss @@ -2158,10 +2158,6 @@ input#auto_increment_opt { } } -.data_full_width { - width: 100%; -} - .cDrop { #{$left}: 0; position: absolute; diff --git a/themes/pmahomme/scss/_common.scss b/themes/pmahomme/scss/_common.scss index fa6c764a9e..e7e8dbd88a 100644 --- a/themes/pmahomme/scss/_common.scss +++ b/themes/pmahomme/scss/_common.scss @@ -33,11 +33,6 @@ h2 { margin: 0 0 12px; } -.data_full_width { - margin: 0 0 12px; - width: 100%; -} - h3 { font-weight: bold; font-size: 1rem; From 8fab4a7bfb0de97a4049a752cb466375d7872c61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Tue, 24 Nov 2020 16:21:14 -0300 Subject: [PATCH 08/21] Use Bootstrap's table for the db structure page MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- .../structure/body_for_table_summary.twig | 22 +++++----- .../structure/structure_table_row.twig | 42 +++++++++---------- .../database/structure/table_header.twig | 10 ++--- 3 files changed, 37 insertions(+), 37 deletions(-) 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 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) }} -
-
{{ 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 }}PluginPluginDescriptionDescriptionVersionVersionAuthorAuthorLicenseLicense
+ {% 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 #} From 8b46daefcd7314a930d4769728464ad37c74ba0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Thu, 26 Nov 2020 16:02:16 -0300 Subject: [PATCH 09/21] Use Bootstrap's table for db qbe page MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- templates/database/qbe/ins_del_and_or_cell.twig | 14 +++++++------- templates/database/qbe/selection_form.twig | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) 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 @@
{{ sortable_table_header('Table'|trans, 'table') }}{% trans 'Replication' %} + {% 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 }} From 088c9e587488943d44e6f8f19574486dbf04ca45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Thu, 26 Nov 2020 16:16:02 -0300 Subject: [PATCH 10/21] Use Bootstrap's table for db privileges page MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- templates/database/privileges/index.twig | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) 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 }} -
-
{% trans 'Column:' %}
- +
+
+ - - - - - - + + + + + + @@ -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 %} From 5bad0f74af03ac04d236272c843c53fb07150452 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Thu, 26 Nov 2020 16:25:13 -0300 Subject: [PATCH 11/21] Use Bootstrap's table for db routines page MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- libraries/classes/Database/Routines.php | 4 ++-- templates/database/routines/index.twig | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) 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 .= "
{% 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' %}
\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/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.' %} -
+
+ @@ -31,9 +32,12 @@ + + {% for i in 0..7 %}{% endfor %} {{ rows|raw }} +
{% trans 'Name' %}{% trans 'Type' %} {% trans 'Returns' %}
{% if items is not empty %} From ca679a66b9ce61d3889582e01aa95aba2251feba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Thu, 26 Nov 2020 17:00:09 -0300 Subject: [PATCH 12/21] Use Bootstrap's table for db events page MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- templates/database/events/editor_form.twig | 2 +- templates/database/events/index.twig | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) 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' %} - +
{% 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 %} From c698be7a70dbcf6386217f56c040122e571f4eb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Thu, 26 Nov 2020 17:29:16 -0300 Subject: [PATCH 13/21] Use Bootstrap's table for db triggers page MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- libraries/classes/Database/Triggers.php | 2 +- templates/database/triggers/list.twig | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) 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') . " - +
+ @@ -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 %} From b7d9f13d8adc1cebd53937e375e24e33a87d2bb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Fri, 27 Nov 2020 11:49:00 -0300 Subject: [PATCH 14/21] Use Bootstrap's table for db tracking page MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- templates/database/tracking/tables.twig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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) }} - - +
+ @@ -147,8 +147,8 @@ {{ get_hidden_inputs(db) }} -
{% trans 'Table' %}
- +
+ From 532c1eee83ebbff160596c0f0ebab00e7691f256 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Fri, 27 Nov 2020 16:14:13 -0300 Subject: [PATCH 15/21] Use Bootstrap's table for db central columns page MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- templates/database/central_columns/main.twig | 20 ++++++++++---------- themes/bootstrap/scss/_common.scss | 6 ------ themes/original/scss/_common.scss | 6 ------ themes/pmahomme/scss/_common.scss | 6 ------ 4 files changed, 10 insertions(+), 28 deletions(-) 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) }} -
-
{% trans 'Table' %}
- +
+
+ - - + + @@ -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/themes/bootstrap/scss/_common.scss b/themes/bootstrap/scss/_common.scss index 3619db15a6..7f7bb72096 100644 --- a/themes/bootstrap/scss/_common.scss +++ b/themes/bootstrap/scss/_common.scss @@ -882,12 +882,6 @@ label.col-3.d-flex.align-items-center { padding: 1.5% 0 !important; } -.central_columns_add_column { - display: inline-block; - margin-#{$left}: 1%; - max-width: 50%; -} - .message_errors_found { margin-top: 20px; } diff --git a/themes/original/scss/_common.scss b/themes/original/scss/_common.scss index 34f3ee8fc1..fb94599ba1 100644 --- a/themes/original/scss/_common.scss +++ b/themes/original/scss/_common.scss @@ -683,12 +683,6 @@ form.login label { padding: 1.5% 0 !important; } -.central_columns_add_column { - display: inline-block; - margin-#{$left}: 1%; - max-width: 50%; -} - .message_errors_found { margin-top: 20px; } diff --git a/themes/pmahomme/scss/_common.scss b/themes/pmahomme/scss/_common.scss index e7e8dbd88a..d662872d16 100644 --- a/themes/pmahomme/scss/_common.scss +++ b/themes/pmahomme/scss/_common.scss @@ -930,12 +930,6 @@ label.col-3.d-flex.align-items-center { padding: 1.5% 0 !important; } -.central_columns_add_column { - display: inline-block; - margin-#{$left}: 1%; - max-width: 50%; -} - .message_errors_found { margin-top: 20px; } From 6627ff7e143294aff86cb7e8fe4471ec9b950929 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Fri, 27 Nov 2020 18:34:06 -0300 Subject: [PATCH 16/21] Use Bootstrap's table for table structure page MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- .../table/structure/display_partitions.twig | 6 +++--- .../table/structure/display_structure.twig | 12 ++++++------ .../table/structure/display_table_stats.twig | 18 ++++++++++-------- 3 files changed, 19 insertions(+), 17 deletions(-) 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 %} -

- +
+ @@ -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 %} From a86b8622ba60d67f2b35223957c533753ce27c83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Mon, 30 Nov 2020 23:20:32 -0300 Subject: [PATCH 17/21] Use Bootstrap's table for table relation page MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- templates/table/relation/common_form.twig | 25 +++++++++++++++-------- 1 file changed, 16 insertions(+), 9 deletions(-) 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 'Row statistics' %}
- +
+
+ + {% 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) %} From 2d7678d4b2d89df224a83daf3055abb1002b04b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Mon, 30 Nov 2020 23:24:39 -0300 Subject: [PATCH 18/21] Use Bootstrap's table for table search page MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- templates/table/search/index.twig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 %} From 78f17058b297f52d651ae258c89ed3faa1d59a4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Mon, 30 Nov 2020 23:32:28 -0300 Subject: [PATCH 19/21] Use Bootstrap's table for table zoom search page MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- templates/table/zoom_search/index.twig | 10 +++++----- themes/bootstrap/scss/_common.scss | 6 +----- themes/metro/scss/_common.scss | 4 ---- themes/original/scss/_common.scss | 4 ---- themes/pmahomme/scss/_common.scss | 4 ---- 5 files changed, 6 insertions(+), 22 deletions(-) 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 'Function' %}
- +
+ {% 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' %} - +
- +