diff --git a/js/src/functions.js b/js/src/functions.js index fce8b14218..13c21c4624 100644 --- a/js/src/functions.js +++ b/js/src/functions.js @@ -3612,7 +3612,7 @@ AJAX.registerOnload('functions.js', function () { var listSize = centralColumnList[db + '_' + table].length; var min = (listSize <= maxRows) ? listSize : maxRows; for (i = 0; i < min; i++) { - fields += '
' + + fields += '
' + Functions.escapeHtml(centralColumnList[db + '_' + table][i].col_name) + '
' + centralColumnList[db + '_' + table][i].col_type; @@ -3638,7 +3638,7 @@ AJAX.registerOnload('functions.js', function () { } var seeMore = ''; if (listSize > maxRows) { - seeMore = '
' + + seeMore = '
' + '' + Messages.seeMore + '
'; } var centralColumnsDialog = '
' + @@ -3674,7 +3674,7 @@ AJAX.registerOnload('functions.js', function () { fields = ''; min = (listSize <= maxRows + resultPointer) ? listSize : maxRows + resultPointer; for (i = resultPointer; i < min; i++) { - fields += '
' + + fields += '
' + centralColumnList[db + '_' + table][i].col_name + '
' + centralColumnList[db + '_' + table][i].col_type; @@ -4327,7 +4327,7 @@ Functions.slidingMessage = function (msg, $object) { if ($('#PMA_slidingMessage').length === 0) { $('#page_content').prepend( '' + 'class="d-inline-block">' ); } $obj = $('#PMA_slidingMessage'); diff --git a/js/src/server/status/monitor.js b/js/src/server/status/monitor.js index 5fcffbe89b..422495aa17 100644 --- a/js/src/server/status/monitor.js +++ b/js/src/server/status/monitor.js @@ -1961,7 +1961,7 @@ AJAX.registerOnload('server/status/monitor.js', function () { if (i === 0) { $.each(rows[0], tempPushKey); $table.append('' + - '' + cols.join('') + '' + + '' + cols.join('') + '' + '' ); diff --git a/libraries/classes/Database/Routines.php b/libraries/classes/Database/Routines.php index 5ec151ffdb..f2fcf87e25 100644 --- a/libraries/classes/Database/Routines.php +++ b/libraries/classes/Database/Routines.php @@ -856,7 +856,7 @@ class Routines } else { $retval .= "\n" - . "
\n" + . "
\n" . $routine['item_type'] . "\n" . "
\n" . "addClass($class, $conditionField, $meta, 'nowrap'); + $classes = $this->addClass($class, $conditionField, $meta, 'text-nowrap'); return $this->template->render('display/results/empty_display', [ 'align' => $align, @@ -3336,7 +3336,7 @@ class Results if (isset($GLOBALS['cfg']['RowActionType']) && $GLOBALS['cfg']['RowActionType'] === self::ACTION_LINK_CONTENT_ICONS ) { - $linkContent .= '' + $linkContent .= '' . Generator::getImage( $icon, $display_text @@ -3345,7 +3345,7 @@ class Results } elseif (isset($GLOBALS['cfg']['RowActionType']) && $GLOBALS['cfg']['RowActionType'] === self::ACTION_LINK_CONTENT_TEXT ) { - $linkContent .= '' . $display_text . ''; + $linkContent .= '' . $display_text . ''; } else { $linkContent .= Generator::getIcon( $icon, @@ -3456,7 +3456,7 @@ class Results '' ); } elseif ($column != '') { - $nowrap = ' nowrap'; + $nowrap = ' text-nowrap'; $where_comparison = ' = ' . $column; $cell = $this->getRowData( @@ -3787,7 +3787,7 @@ class Results // do not wrap if date field type or if no-wrapping enabled by transform functions // otherwise, preserve whitespaces and wrap $nowrap = preg_match('@DATE|TIME@i', $meta->type) - || $bool_nowrap ? 'nowrap' : 'pre_wrap'; + || $bool_nowrap ? 'text-nowrap' : 'pre_wrap'; $where_comparison = ' = \'' . $dbi->escapeString($column) diff --git a/libraries/classes/Html/Generator.php b/libraries/classes/Html/Generator.php index ac40a71ccd..d0e9f9f1e1 100644 --- a/libraries/classes/Html/Generator.php +++ b/libraries/classes/Html/Generator.php @@ -218,7 +218,7 @@ class Generator } // Sometimes use a span (we rely on this in js/sql.js). But for menu bar // we don't need a span - $button = $menu_icon ? '' : ''; + $button = $menu_icon ? '' : ''; if ($include_icon) { $button .= self::getImage($icon, $alternate); } diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php index 97d63dc541..a98be1deb9 100644 --- a/libraries/classes/InsertEdit.php +++ b/libraries/classes/InsertEdit.php @@ -473,12 +473,12 @@ class InsertEdit $column['first_timestamp'] = true; } $column['pma_type'] = $column['Type']; - $column['wrap'] = ' nowrap'; + $column['wrap'] = ' text-nowrap'; break; default: $column['pma_type'] = $column['Type']; - $column['wrap'] = ' nowrap'; + $column['wrap'] = ' text-nowrap'; break; } @@ -1841,7 +1841,7 @@ class InsertEdit $html_output = '
' . '' . '' - . '' - . ' - - - - - - - - diff --git a/templates/database/central_columns/main.twig b/templates/database/central_columns/main.twig index a072d8f7f4..d68efcbd0a 100644 --- a/templates/database/central_columns/main.twig +++ b/templates/database/central_columns/main.twig @@ -50,7 +50,7 @@ - - - - - - - - {{ get_hidden_inputs(db) }} - @@ -273,7 +273,7 @@ - - - - - - - - {% for column in table.columns %} - - -
' + . '' . $this->getSubmitTypeDropDown($where_clause, $tabindex, $tabindex_for_value) . "\n"; @@ -1850,7 +1850,7 @@ class InsertEdit . '   ' . __('and then') . '   ' . '' + . '' . $this->getAfterInsertDropDown( $where_clause, $after_insert, diff --git a/print.css b/print.css index 60f829299e..9c20220b56 100644 --- a/print.css +++ b/print.css @@ -1,7 +1,3 @@ -.nowrap { - white-space: nowrap; -} - .hide { display: none; } @@ -44,10 +40,6 @@ th { display: none; } - .nowrap { - white-space: nowrap; - } - .hide { display: none; } diff --git a/templates/database/central_columns/edit_table_row.twig b/templates/database/central_columns/edit_table_row.twig index 81e333cabe..b454b255a8 100644 --- a/templates/database/central_columns/edit_table_row.twig +++ b/templates/database/central_columns/edit_table_row.twig @@ -1,6 +1,6 @@
+ {% include 'columns_definitions/column_name.twig' with { 'column_number': row_num, 'ci': 0, @@ -11,20 +11,20 @@ } only %} + +

{% trans 'Edit ENUM/SET values' %}

+ + + {% include 'columns_definitions/column_attribute.twig' with { 'column_number': row_num, 'ci': 5, @@ -73,12 +73,12 @@ } only %} + +
+ {% include 'columns_definitions/column_name.twig' with { 'column_number': 0, 'ci': 0, @@ -62,18 +62,18 @@ 'max_rows': max_rows, } only %} + +

{% trans 'Edit ENUM/SET values' %}

+ {% endif %} + + {% include 'columns_definitions/column_attribute.twig' with { 'column_number': 0, 'ci': 5, @@ -111,10 +111,10 @@ 'attribute_types': attribute_types, } only %} + + @@ -259,7 +259,7 @@
+ + {{ row['col_name'] }} {% include 'columns_definitions/column_name.twig' with { @@ -289,20 +289,20 @@ 'max_rows': max_rows } only %} + {{ row['col_type'] }} + {{ (row['col_length']?(row['col_length']):'') }}

{% trans 'Edit ENUM/SET values' %}

+ {% if row['col_default'] is defined %} {{ row['col_default'] }} {% else %} @@ -328,7 +328,7 @@ {% endif %} + {{ row['col_collation'] }} + {{ row['col_attribute']?(row['col_attribute']):"" }} {% include 'columns_definitions/column_attribute.twig' with { 'column_number': row_num, @@ -356,12 +356,12 @@ 'attribute_types': attribute_types, } only %} + {{ row['col_isNull'] ? 'Yes' | trans : 'No' | trans }} + {{ row['col_extra'] }} diff --git a/templates/database/data_dictionary/index.twig b/templates/database/data_dictionary/index.twig index 4a3e300244..54e16dc49f 100644 --- a/templates/database/data_dictionary/index.twig +++ b/templates/database/data_dictionary/index.twig @@ -27,17 +27,17 @@
+ {{ column.name }} {% if column.has_primary_key %} ({% trans 'Primary' %}) {% endif %} + {{ column.print_type }} {{ column.is_nullable ? 'Yes'|trans : 'No'|trans }} + {% if column.default is null and column.is_nullable %} NULL {% else %} diff --git a/templates/database/designer/database_tables.twig b/templates/database/designer/database_tables.twig index 615ef7e0f1..eef933f920 100644 --- a/templates/database/designer/database_tables.twig +++ b/templates/database/designer/database_tables.twig @@ -46,7 +46,7 @@ title="{% trans 'See table structure' %}"> {{ designerTable.getDatabaseName() }} @@ -97,7 +97,7 @@ {% endif %} -
+
{% set type = columns_type[t_n ~ '.' ~ tab_column[t_n]['COLUMN_NAME'][j]] %} * {{ tab_column[t_n]['COLUMN_NAME'][j] }} : {{ tab_column[t_n]['TYPE'][j] }} diff --git a/templates/database/designer/main.twig b/templates/database/designer/main.twig index 8d647fd40b..9493a509e1 100644 --- a/templates/database/designer/main.twig +++ b/templates/database/designer/main.twig @@ -268,7 +268,7 @@ var designerConfig = {{ designer_config|raw }}; - - - - -
+ {% trans 'Create relationship' %} @@ -277,14 +277,14 @@ var designerConfig = {{ designer_config|raw }};
+ FOREIGN KEY
+ on delete @@ -308,7 +308,7 @@ var designerConfig = {{ designer_config|raw }};
+ on update @@ -334,7 +334,7 @@ var designerConfig = {{ designer_config|raw }};
+ - - - - - - - - - - - - - - - - -
+ {% trans 'Delete relationship' %}
+
+
+ WHERE
+ {% trans 'Relationship operator' %} @@ -482,7 +482,7 @@ var designerConfig = {{ designer_config|raw }};
+ {% trans 'Value' %}
{% trans 'subquery' %} @@ -492,14 +492,14 @@ var designerConfig = {{ designer_config|raw }};
+ {% trans 'Rename to' %}
+ {% trans 'New name' %} @@ -507,14 +507,14 @@ var designerConfig = {{ designer_config|raw }};
+ {% trans 'Aggregate' %}
+ {% trans 'Operator' %} @@ -541,7 +541,7 @@ var designerConfig = {{ designer_config|raw }};
+ GROUP BY @@ -551,7 +551,7 @@ var designerConfig = {{ designer_config|raw }};
+ ORDER BY @@ -571,14 +571,14 @@ var designerConfig = {{ designer_config|raw }};
+ HAVING
+ {% trans 'Operator' %} @@ -608,7 +608,7 @@ var designerConfig = {{ designer_config|raw }};
+ {% trans 'Relationship operator' %} @@ -647,7 +647,7 @@ var designerConfig = {{ designer_config|raw }};
+ {% trans 'Value' %}
{% trans 'subquery' %} @@ -659,7 +659,7 @@ var designerConfig = {{ designer_config|raw }};
+ @@ -708,7 +708,7 @@ var designerConfig = {{ designer_config|raw }}; - - - - - - - - - - - - - - - - @@ -61,13 +61,13 @@ - - diff --git a/templates/database/qbe/ins_del_and_or_cell.twig b/templates/database/qbe/ins_del_and_or_cell.twig index 29beef66bd..a0bc981275 100644 --- a/templates/database/qbe/ins_del_and_or_cell.twig +++ b/templates/database/qbe/ins_del_and_or_cell.twig @@ -1,7 +1,7 @@ -
+ {% trans 'Rename to' %} @@ -717,7 +717,7 @@ var designerConfig = {{ designer_config|raw }};
+ {% trans 'New name' %} @@ -727,7 +727,7 @@ var designerConfig = {{ designer_config|raw }};
+
+ HAVING @@ -783,7 +783,7 @@ var designerConfig = {{ designer_config|raw }};
+ {% trans 'Operator' %} @@ -814,7 +814,7 @@ var designerConfig = {{ designer_config|raw }};
+ {% trans 'Operator' %} @@ -853,7 +853,7 @@ var designerConfig = {{ designer_config|raw }};
+ {% trans 'Value' %}
{% trans 'subquery' %} @@ -866,7 +866,7 @@ var designerConfig = {{ designer_config|raw }};
+
+ {% trans 'Aggregate' %} @@ -922,7 +922,7 @@ var designerConfig = {{ designer_config|raw }};
+ {% trans 'Operator' %} @@ -951,7 +951,7 @@ var designerConfig = {{ designer_config|raw }};
+
+ WHERE @@ -1007,7 +1007,7 @@ var designerConfig = {{ designer_config|raw }};
+ {% trans 'Operator' %} @@ -1046,7 +1046,7 @@ var designerConfig = {{ designer_config|raw }};
+ {% trans 'Value' %}
{% trans 'subquery' %} @@ -1058,7 +1058,7 @@ var designerConfig = {{ designer_config|raw }};
+ {% else %} -
+
{{ event.item_type }}
@@ -44,7 +44,7 @@
{% trans 'Execute at' %} +
{% trans %}Start{% context %}Start of recurring event{% endtrans %} +
{% trans %}End{% context %}End of recurring event{% endtrans %} +
+ - @@ -13,7 +13,7 @@ - diff --git a/templates/database/structure/structure_table_row.twig b/templates/database/structure/structure_table_row.twig index a872328d44..0cfe109280 100644 --- a/templates/database/structure/structure_table_row.twig +++ b/templates/database/structure/structure_table_row.twig @@ -115,7 +115,7 @@ {% if not (properties_num_columns > 1) %} - {% if collation|length > 0 %} - {% endif %} @@ -142,7 +142,7 @@ {% if not (show_charset > 1) %} {% if charset|length > 0 %} - {% endif %} @@ -182,10 +182,10 @@ {% elseif table_is_view %} - - + {% if is_show_stats %} diff --git a/templates/display/results/checkbox_and_links.twig b/templates/display/results/checkbox_and_links.twig index e210fc21c9..3e41159667 100644 --- a/templates/display/results/checkbox_and_links.twig +++ b/templates/display/results/checkbox_and_links.twig @@ -9,7 +9,7 @@ {% if edit.url is not empty %} diff --git a/templates/setup/home/index.twig b/templates/setup/home/index.twig index cca6a70bf6..2e0ba9bf3b 100644 --- a/templates/setup/home/index.twig +++ b/templates/setup/home/index.twig @@ -51,7 +51,7 @@ - - - + {{ extracted_columnspec['displayed_type']|raw }} {% if relation_commwork and relation_mimework and browse_mime @@ -77,9 +77,9 @@ {{ collations[row['Collation']].name }} {% endif %} - + - {% endif %} - + {% if not tbl_is_view and not db_is_system_schema %} -
+ {% trans 'Ins:' %}
+ {% trans 'Del:' %} + {% if current_table['ENGINE'] is not empty %} {{ current_table['ENGINE'] }} {% elseif table_is_view %} @@ -123,7 +123,7 @@ {% endif %} + {{ collation|raw }} + {{ charset|raw }} - + {% trans 'View' %} ------- - - + {% trans 'Show all' %} {{ server.name }} {{ server.auth_type }} {{ server.dsn }} + {% trans 'Edit' %} diff --git a/templates/table/browse_foreigners/column_element.twig b/templates/table/browse_foreigners/column_element.twig index f2ec2ba741..38938752d0 100644 --- a/templates/table/browse_foreigners/column_element.twig +++ b/templates/table/browse_foreigners/column_element.twig @@ -1,4 +1,4 @@ - + {{ is_selected ? '' }} diff --git a/templates/table/structure/display_structure.twig b/templates/table/structure/display_structure.twig index 9e298b0868..4ef0a2c705 100644 --- a/templates/table/structure/display_structure.twig +++ b/templates/table/structure/display_structure.twig @@ -53,7 +53,7 @@ {{ rownum }} + {{ attributes[rownum] }}{{ attributes[rownum] }} {{ row['Null'] == 'YES' ? 'Yes'|trans : 'No'|trans }} + {% if row['Default'] is not null %} {% if extracted_columnspec['type'] == 'bit' %} {{ row['Default']|convert_bit_default_value }} @@ -97,7 +97,7 @@ {{ comments }} {{ row['Extra']|upper }}{{ row['Extra']|upper }}{{ entry.date }} {{ entry.username }} {{ entry.formated_statement|raw }} + {{ drop_image_or_text|raw }} diff --git a/templates/view_create.twig b/templates/view_create.twig index 7552098f1b..5cf5af7d42 100644 --- a/templates/view_create.twig +++ b/templates/view_create.twig @@ -17,7 +17,7 @@ {% if view['operation'] == 'create' %} - + + - + - + - + @@ -76,14 +76,14 @@ {% endif %} - + - + - + ' . "\n", + . 'class="grid_edit text-nowrap transformed">foo bar baz' . "\n", ], [ 'all', @@ -1007,7 +1007,7 @@ class ResultsTest extends AbstractTestCase '', '' . "\n", + . 'class="grid_edit text-nowrap">2020-09-20 16:35:00' . "\n", ], ]; } diff --git a/test/classes/Html/GeneratorTest.php b/test/classes/Html/GeneratorTest.php index a5f373add8..6e3f6e1411 100644 --- a/test/classes/Html/GeneratorTest.php +++ b/test/classes/Html/GeneratorTest.php @@ -112,7 +112,7 @@ class GeneratorTest extends AbstractTestCase $GLOBALS['cfg']['ActionLinksMode'] = 'text'; $this->assertEquals( - '', + '', Generator::getIcon('b_comment') ); } @@ -125,7 +125,7 @@ class GeneratorTest extends AbstractTestCase $GLOBALS['cfg']['ActionLinksMode'] = 'icons'; $this->assertEquals( - '', + '', Generator::getIcon('b_comment') ); } @@ -139,7 +139,7 @@ class GeneratorTest extends AbstractTestCase $alternate_text = 'alt_str'; $this->assertEquals( - '' . $alternate_text
             . '', Generator::getIcon('b_comment', $alternate_text) @@ -157,7 +157,7 @@ class GeneratorTest extends AbstractTestCase // Here we are checking for an icon embedded inside a span (i.e not a menu // bar icon $this->assertEquals( - '' . $alternate_text
             . ' ' . $alternate_text . '', Generator::getIcon('b_comment', $alternate_text, true, false) diff --git a/test/classes/InsertEditTest.php b/test/classes/InsertEditTest.php index ece97aa8d4..e5aa73aeb4 100644 --- a/test/classes/InsertEditTest.php +++ b/test/classes/InsertEditTest.php @@ -501,7 +501,7 @@ class InsertEditTest extends AbstractTestCase $this->assertEquals( $result['wrap'], - ' nowrap' + ' text-nowrap' ); $this->assertEquals( @@ -666,7 +666,7 @@ class InsertEditTest extends AbstractTestCase $this->assertEquals( [ 'date', - ' nowrap', + ' text-nowrap', true, ], $this->callFunction( @@ -685,7 +685,7 @@ class InsertEditTest extends AbstractTestCase $this->assertEquals( [ 'date', - ' nowrap', + ' text-nowrap', false, ], $this->callFunction( @@ -704,7 +704,7 @@ class InsertEditTest extends AbstractTestCase $this->assertEquals( [ 'num', - ' nowrap', + ' text-nowrap', false, ], $this->callFunction( @@ -723,7 +723,7 @@ class InsertEditTest extends AbstractTestCase $this->assertEquals( [ 'num', - ' nowrap', + ' text-nowrap', false, ], $this->callFunction( @@ -2238,7 +2238,7 @@ class InsertEditTest extends AbstractTestCase $GLOBALS['cfg']['ActionLinksMode'] = 'icons'; $GLOBALS['cfg']['LinkLengthLimit'] = 2; $this->assertStringContainsString( - 'Edit/Insert' . '', $this->callFunction( diff --git a/themes/bootstrap/scss/_common.scss b/themes/bootstrap/scss/_common.scss index 4e66259242..ae02365318 100644 --- a/themes/bootstrap/scss/_common.scss +++ b/themes/bootstrap/scss/_common.scss @@ -700,10 +700,6 @@ td.disabled { color: #aaa; } -.nowrap { - white-space: nowrap; -} - .pre_wrap { white-space: pre-wrap; } @@ -802,10 +798,6 @@ label.col-3.d-flex.align-items-center { width: 30px; } -.font_weight_bold { - font-weight: bold; -} - .color_gray { color: gray; } @@ -814,10 +806,6 @@ label.col-3.d-flex.align-items-center { max-height: 400px; } -.pma_sliding_message { - display: inline-block; -} - li.last.database { margin-bottom: 15px; } diff --git a/themes/bootstrap/scss/printview.scss b/themes/bootstrap/scss/printview.scss index 68a3bc2313..c33439e262 100644 --- a/themes/bootstrap/scss/printview.scss +++ b/themes/bootstrap/scss/printview.scss @@ -10,10 +10,6 @@ display: none; } -.nowrap { - white-space: nowrap; -} - .hide { display: none; } diff --git a/themes/metro/scss/_common.scss b/themes/metro/scss/_common.scss index a09bc7cd66..511d9adbd3 100644 --- a/themes/metro/scss/_common.scss +++ b/themes/metro/scss/_common.scss @@ -846,10 +846,6 @@ td.disabled { color: #aaa; } -.nowrap { - white-space: nowrap; -} - .pre_wrap { white-space: pre-wrap; } @@ -858,10 +854,6 @@ td.disabled { display: none; } -.font_weight_bold { - font-weight: bold; -} - /* specific elements */ ul.tabs { diff --git a/themes/metro/scss/printview.scss b/themes/metro/scss/printview.scss index 279716b8b4..f58f02761c 100644 --- a/themes/metro/scss/printview.scss +++ b/themes/metro/scss/printview.scss @@ -10,10 +10,6 @@ display: none; } -.nowrap { - white-space: nowrap; -} - .hide { display: none; } diff --git a/themes/original/scss/_common.scss b/themes/original/scss/_common.scss index 7b0f0bed30..2f3050ffc5 100644 --- a/themes/original/scss/_common.scss +++ b/themes/original/scss/_common.scss @@ -525,10 +525,6 @@ td.disabled { background-color: #ccc; } -.nowrap { - white-space: nowrap; -} - .pre_wrap { white-space: pre-wrap; } @@ -643,10 +639,6 @@ form.login label { width: 30px; } -.font_weight_bold { - font-weight: bold; -} - .color_gray { color: gray; } @@ -655,10 +647,6 @@ form.login label { max-height: 400px; } -.pma_sliding_message { - display: inline-block; -} - li.last.database { margin-bottom: 20px !important; } diff --git a/themes/pmahomme/scss/_common.scss b/themes/pmahomme/scss/_common.scss index 9c6c515a10..4390480cf7 100644 --- a/themes/pmahomme/scss/_common.scss +++ b/themes/pmahomme/scss/_common.scss @@ -760,10 +760,6 @@ div.tools a:hover, color: #aaa; } -.nowrap { - white-space: nowrap; -} - .pre_wrap { white-space: pre-wrap; } @@ -871,10 +867,6 @@ label.col-3.d-flex.align-items-center { width: 30px; } -.font_weight_bold { - font-weight: bold; -} - .color_gray { color: gray; } @@ -883,10 +875,6 @@ label.col-3.d-flex.align-items-center { max-height: 400px; } -.pma_sliding_message { - display: inline-block; -} - li.last.database { margin-bottom: 15px !important; } diff --git a/themes/pmahomme/scss/printview.scss b/themes/pmahomme/scss/printview.scss index 68a3bc2313..c33439e262 100644 --- a/themes/pmahomme/scss/printview.scss +++ b/themes/pmahomme/scss/printview.scss @@ -10,10 +10,6 @@ display: none; } -.nowrap { - white-space: nowrap; -} - .hide { display: none; }
-
{% trans 'Definer' %}{% trans 'Definer' %}
SQL SECURITYSQL SECURITY
{% trans 'VIEW name' %}{% trans 'VIEW name' %}
{% trans 'Column names' %}{% trans 'Column names' %}
ASAS
@@ -92,7 +92,7 @@
WITH CHECK OPTIONWITH CHECK OPTION foo bar baz2020-09-20 16:35:00