diff --git a/js/src/ajax.js b/js/src/ajax.js index 97c2289c91..61b6c8f0d7 100644 --- a/js/src/ajax.js +++ b/js/src/ajax.js @@ -378,7 +378,7 @@ var AJAX = { msg = data.errSubmitMsg; } if (data.errors) { - $('
', { id : 'pma_errors', class : 'clearfloat' }) + $('
', { id : 'pma_errors', class : 'clearfloat d-print-none' }) .insertAfter('#selflink') .append(data.errors); // bind for php error reporting forms (bottom) @@ -553,7 +553,7 @@ var AJAX = { msg = data.errSubmitMsg; } if (data.errors) { - $('
', { id : 'pma_errors', class : 'clearfloat' }) + $('
', { id : 'pma_errors', class : 'clearfloat d-print-none' }) .insertAfter('#selflink') .append(data.errors); // bind for php error reporting forms (bottom) diff --git a/js/src/database/structure.js b/js/src/database/structure.js index c0c0566ce9..6c27120998 100644 --- a/js/src/database/structure.js +++ b/js/src/database/structure.js @@ -27,7 +27,6 @@ AJAX.registerTeardown('database/structure.js', function () { $(document).off('click', 'a.drop_table_anchor.ajax'); $(document).off('click', '#real_end_input'); $(document).off('click', 'a.favorite_table_anchor.ajax'); - $(document).off('click', '#printView'); $('a.real_row_count').off('click'); $('a.row_count_sum').off('click'); $('select[name=submit_mult]').off('change'); @@ -399,16 +398,6 @@ AJAX.registerOnload('database/structure.js', function () { }, Functions.loadForeignKeyCheckbox); }); // end of Drop Table Ajax action - /** - * Attach Event Handler for 'Print' link - */ - $(document).on('click', '#printView', function (event) { - event.preventDefault(); - - // Take to preview mode - Functions.printPreview(); - }); // end of Print View action - // Calculate Real End for InnoDB /** * Ajax Event handler for calculating the real end for a InnoDB table diff --git a/js/src/functions.js b/js/src/functions.js index 24f68ea2d8..2e43954291 100644 --- a/js/src/functions.js +++ b/js/src/functions.js @@ -3924,11 +3924,6 @@ Functions.getCellValue = function (td) { } }; -$(window).on('popstate', function () { - $('#printcss').attr('media','print'); - return true; -}); - /** * Unbind all event handlers before tearing down a page */ @@ -3946,49 +3941,10 @@ AJAX.registerOnload('functions.js', function () { }); /** - * Produce print preview + * @implements EventListener */ -Functions.printPreview = function () { - $('#printcss').attr('media','all'); - Functions.createPrintAndBackButtons(); -}; - -/** - * Create print and back buttons in preview page - */ -Functions.createPrintAndBackButtons = function () { - var backButton = $('',{ - type: 'button', - value: Messages.back, - class: 'btn btn-secondary', - id: 'back_button_print_view' - }); - backButton.on('click', Functions.removePrintAndBackButton); - backButton.appendTo('#page_content'); - var printButton = $('',{ - type: 'button', - value: Messages.print, - class: 'btn btn-primary', - id: 'print_button_print_view' - }); - printButton.on('click', Functions.printPage); - printButton.appendTo('#page_content'); -}; - -/** - * Remove print and back buttons and revert to normal view - */ -Functions.removePrintAndBackButton = function () { - $('#printcss').attr('media','print'); - $('#back_button_print_view').remove(); - $('#print_button_print_view').remove(); -}; - -/** - * Print page - */ -Functions.printPage = function () { - if (typeof(window.print) !== 'undefined') { +const PrintPage = { + handleEvent: () => { window.print(); } }; @@ -3997,14 +3953,20 @@ Functions.printPage = function () { * Unbind all event handlers before tearing down a page */ AJAX.registerTeardown('functions.js', function () { - $('input#print').off('click'); + document.querySelectorAll('.jsPrintButton').forEach(item => { + item.removeEventListener('click', PrintPage); + }); + $(document).off('click', 'a.create_view.ajax'); $(document).off('keydown', '#createViewModal input, #createViewModal select'); $(document).off('change', '#fkc_checkbox'); }); AJAX.registerOnload('functions.js', function () { - $('input#print').on('click', Functions.printPage); + document.querySelectorAll('.jsPrintButton').forEach(item => { + item.addEventListener('click', PrintPage); + }); + $('.logout').on('click', function () { var form = $( '
' + diff --git a/js/src/makegrid.js b/js/src/makegrid.js index 6d2c34e249..a4d8655342 100644 --- a/js/src/makegrid.js +++ b/js/src/makegrid.js @@ -1786,7 +1786,7 @@ var makeGrid = function (t, enableResize, enableReorder, enableVisib, enableGrid }); // attach to first row first col of the grid - var thFirst = $(g.t).find('th.print_ignore'); + var thFirst = $(g.t).find('th.d-print-none'); $(thFirst).append(g.cDrop); $(thFirst).append(g.cList); diff --git a/js/src/sql.js b/js/src/sql.js index fe56b31c51..f31c69d1ac 100644 --- a/js/src/sql.js +++ b/js/src/sql.js @@ -203,7 +203,6 @@ AJAX.registerTeardown('sql.js', function () { $(document).off('click', 'th.column_heading.marker'); $(document).off('scroll', window); $(document).off('keyup', '.filter_rows'); - $(document).off('click', '#printView'); if (codeMirrorEditor) { codeMirrorEditor.off('change'); } else { @@ -398,16 +397,6 @@ AJAX.registerOnload('sql.js', function () { document.body.removeChild(textArea); }); // end of Copy to Clipboard action - /** - * Attach Event Handler for 'Print' link - */ - $(document).on('click', '#printView', function (event) { - event.preventDefault(); - - // Take to preview mode - Functions.printPreview(); - }); // end of 'Print' action - /** * Attach the {@link makegrid} function to a custom event, which will be * triggered manually everytime the table of results is reloaded diff --git a/js/src/table/structure.js b/js/src/table/structure.js index 3789d7a250..955199b7e7 100644 --- a/js/src/table/structure.js +++ b/js/src/table/structure.js @@ -49,7 +49,6 @@ AJAX.registerTeardown('table/structure.js', function () { $(document).off('click', 'a.drop_column_anchor.ajax'); $(document).off('click', 'a.add_key.ajax'); $(document).off('click', '#move_columns_anchor'); - $(document).off('click', '#printView'); $(document).off('submit', '.append_fields_form.ajax'); $('body').off('click', '#fieldsForm.ajax button'); $(document).off('click', 'a[id^=partition_action].ajax'); @@ -243,16 +242,6 @@ AJAX.registerOnload('table/structure.js', function () { }); }); // end of Drop Column Anchor action - /** - * Attach Event Handler for 'Print' link - */ - $(document).on('click', '#printView', function (event) { - event.preventDefault(); - - // Take to preview mode - Functions.printPreview(); - }); // end of Print View action - /** * Ajax Event handler for adding keys */ diff --git a/libraries/classes/Config.php b/libraries/classes/Config.php index b322bdac73..9fc57bdc73 100644 --- a/libraries/classes/Config.php +++ b/libraries/classes/Config.php @@ -1067,7 +1067,7 @@ class Config { $retval = ''; if (@file_exists($filename)) { - $retval .= '
'; + $retval .= '
'; ob_start(); include $filename; $retval .= ob_get_clean(); diff --git a/libraries/classes/Controllers/JavaScriptMessagesController.php b/libraries/classes/Controllers/JavaScriptMessagesController.php index fd4a49a8ba..59a92219cc 100644 --- a/libraries/classes/Controllers/JavaScriptMessagesController.php +++ b/libraries/classes/Controllers/JavaScriptMessagesController.php @@ -578,10 +578,6 @@ final class JavaScriptMessagesController 'dropImportDropFiles' => __('Drop files here'), 'dropImportSelectDB' => __('Select database first'), - /* For Print view */ - 'print' => __('Print'), - 'back' => __('Back'), - // this approach does not work when the parameter is changed via user prefs 'strGridEditFeatureHint' => $cfg['GridEditing'] === 'double-click' ? __('You can also edit most values
by double-clicking directly on them.') diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php index 27e7119080..a147189305 100644 --- a/libraries/classes/Display/Results.php +++ b/libraries/classes/Display/Results.php @@ -1360,7 +1360,7 @@ class Results $displayParams['emptypre'] = $emptyPreCondition ? 4 : 0; - $buttonHtml .= '' . $fullOrPartialTextLink . ''; } elseif ( $leftOrBoth @@ -2106,7 +2106,7 @@ class Results && ($displayParts['del_lnk'] != self::NO_EDIT_OR_DELETE) ? 4 : 1; $rightColumnHtml .= "\n" - . '' + . '' . $fullOrPartialTextLink . ''; } elseif ( @@ -2122,7 +2122,7 @@ class Results $displayParams['emptyafter'] = ($displayParts['edit_lnk'] != self::NO_EDIT_OR_DELETE) && ($displayParts['del_lnk'] != self::NO_EDIT_OR_DELETE) ? 4 : 1; - $rightColumnHtml .= "\n" . ''; } diff --git a/libraries/classes/Html/Generator.php b/libraries/classes/Html/Generator.php index 9dd300ee28..71c6e709bd 100644 --- a/libraries/classes/Html/Generator.php +++ b/libraries/classes/Html/Generator.php @@ -721,7 +721,7 @@ class Generator $retval .= $queryBase; $retval .= '
'; - $retval .= '
'; + $retval .= '
'; $retval .= ''; $retval .= Url::getHiddenInputs($GLOBALS['db'], $GLOBALS['table']); $retval .= ' +
{# Console toolbar #} {% include 'console/toolbar.twig' with { diff --git a/templates/database/data_dictionary/index.twig b/templates/database/data_dictionary/index.twig index 915c2055b3..d1b1b221cb 100644 --- a/templates/database/data_dictionary/index.twig +++ b/templates/database/data_dictionary/index.twig @@ -5,7 +5,7 @@ {% endif %}

- +

@@ -121,6 +121,6 @@

- +

diff --git a/templates/database/structure/check_all_tables.twig b/templates/database/structure/check_all_tables.twig index a55222067d..ac14dafc90 100644 --- a/templates/database/structure/check_all_tables.twig +++ b/templates/database/structure/check_all_tables.twig @@ -1,4 +1,4 @@ -
+
{% trans 'With selected:' %} diff --git a/templates/database/structure/index.twig b/templates/database/structure/index.twig index 6bef3a91df..5c0c745eb0 100644 --- a/templates/database/structure/index.twig +++ b/templates/database/structure/index.twig @@ -15,10 +15,8 @@ {{ list_navigator_html|raw }}
-

- - {{ get_icon('b_print', 'Print'|trans, true) }} - +

+ {{ get_icon('b_tblanalyse', 'Data dictionary'|trans, true) }} diff --git a/templates/display/results/checkbox_and_links.twig b/templates/display/results/checkbox_and_links.twig index 3e41159667..101487df95 100644 --- a/templates/display/results/checkbox_and_links.twig +++ b/templates/display/results/checkbox_and_links.twig @@ -1,6 +1,6 @@ {% if position == 'left' %} {% if has_checkbox %} - + @@ -8,7 +8,7 @@ {% endif %} {% if edit.url is not empty %} - + {{ link_or_button(edit.url, edit.string) }} {% if where_clause is not empty %} @@ -19,7 +19,7 @@ {% endif %} {% if copy.url is not empty %} - + {{ link_or_button(copy.url, copy.string) }} {% if where_clause is not empty %} @@ -30,7 +30,7 @@ {% endif %} {% if delete.url is not empty %} - + {{ link_or_button(delete.url, delete.string, {'class': 'delete_row requireConfirm' ~ (is_ajax ? ' ajax') }) }} {% if js_conf is not empty %} @@ -41,7 +41,7 @@ {% endif %} {% elseif position == 'right' %} {% if delete.url is not empty %} - + {{ link_or_button(delete.url, delete.string, {'class': 'delete_row requireConfirm' ~ (is_ajax ? ' ajax') }) }} {% if js_conf is not empty %} @@ -52,7 +52,7 @@ {% endif %} {% if copy.url is not empty %} - + {{ link_or_button(copy.url, copy.string) }} {% if where_clause is not empty %} @@ -63,7 +63,7 @@ {% endif %} {% if edit.url is not empty %} - + {{ link_or_button(edit.url, edit.string) }} {% if where_clause is not empty %} @@ -74,7 +74,7 @@ {% endif %} {% if has_checkbox %} - + @@ -82,7 +82,7 @@ {% endif %} {% else %} {% if has_checkbox %} - + diff --git a/templates/display/results/table.twig b/templates/display/results/table.twig index 27f99d20cc..6605950b79 100644 --- a/templates/display/results/table.twig +++ b/templates/display/results/table.twig @@ -1,6 +1,6 @@ {% set navigation_html %} {% if navigation is not empty %} - +
@@ -65,7 +65,7 @@ - + @@ -32,7 +32,7 @@ {# @see table/structure.js, function moreOptsMenuResize() #} {% if not db_is_system_schema and not tbl_is_view %} + " class="action d-print-none">{% trans 'Action' %} {% endif %} @@ -49,7 +49,7 @@ {# Underline commented fields and display a hover-title (CSS only) #} - @@ -99,7 +99,7 @@ {% endif %} {% if not tbl_is_view and not db_is_system_schema %} -
{% if navigation.sort_by_key is not empty %} - + {{ get_hidden_fields(navigation.sort_by_key.hidden_fields) }} {% trans 'Sort by key:' %} @@ -251,16 +251,11 @@ {{ navigation_html }} {% if operations is not empty %} -
+
{% trans 'Query results operations' %} {% if operations.has_print_link %} - {{ link_or_button( - '#', - get_icon('b_print', 'Print'|trans, true), - {'id': 'printView', 'class': 'btn'}, - 'print_view' - ) }} + {{ link_or_button( '#', diff --git a/templates/footer.twig b/templates/footer.twig index 158b19cdc8..de9e8b2b35 100644 --- a/templates/footer.twig +++ b/templates/footer.twig @@ -3,7 +3,7 @@ {% endif %} {% if not is_ajax and not is_minimal %} {% if self_url is not empty %} -
-
+
{{ get_hidden_inputs(db, table) }} diff --git a/templates/table/structure/display_structure.twig b/templates/table/structure/display_structure.twig index 76c9c99892..a63807ac83 100644 --- a/templates/table/structure/display_structure.twig +++ b/templates/table/structure/display_structure.twig @@ -17,7 +17,7 @@ {# Table header #}
# {% trans 'Name' %} {% trans 'Type' %}{% trans 'Action' %}
+ {{ rownum }}{{ row['Extra']|upper }} + + +
    {% if hide_structure_actions %}
  • @@ -137,7 +137,7 @@ {% if type == 'text' or type == 'blob' or tbl_storage_engine == 'ARCHIVE' or (primary and primary.hasColumn(field_name)) %} {{ get_icon('bd_primary', 'Primary'|trans) }} {% else %} - +
    {% include 'select_all.twig' with { 'text_dir': text_dir, 'form_name': 'fieldsForm' @@ -311,7 +311,7 @@ {% endif %}
    -
    +