gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix results table header with transparent background

Browse Source 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
This commit is contained in:
Maurício Meneghini Fauth 2023-06-14 09:55:29 -03:00
parent 1b7fbb9806
commit c6f04fbedc
No known key found for this signature in database
GPG Key ID: 6A16FD38AFC89CC8
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/classes/Display/Results.php
View File

@ -1067,7 +1067,7 @@ class Results
$displayParams = $this->properties['display_params'];
// 1. Displays the full/partial text button (part 1)...
$buttonHtml = '<thead><tr>' . "\n";
$buttonHtml = '';
$emptyPreCondition = $displayParts->hasEditLink && $displayParts->deleteLink !== DeleteLinkEnum::NO_DELETE;
@ -1087,7 +1087,7 @@ class Results
$displayParams['emptypre'] = $emptyPreCondition ? 4 : 0;
$buttonHtml .= '<th class="column_action position-sticky d-print-none"' . $colspan
$buttonHtml .= '<th class="column_action position-sticky bg-body d-print-none"' . $colspan
. '>' . $fullOrPartialTextLink . '</th>';
} elseif (
$leftOrBoth
@ -1101,7 +1101,7 @@ class Results
} elseif ($GLOBALS['cfg']['RowActionLinks'] === self::POSITION_NONE) {
// ... elseif display an empty column if the actions links are
// disabled to match the rest of the table
$buttonHtml .= '<th class="column_action position-sticky"></th>';
$buttonHtml .= '<th class="column_action position-sticky bg-body"></th>';
}
$this->properties['display_params'] = $displayParams;
@ -1732,7 +1732,7 @@ class Results
&& $displayParts->deleteLink !== DeleteLinkEnum::NO_DELETE ? 4 : 1;
$rightColumnHtml .= "\n"
. '<th class="column_action d-print-none"' . $colspan . '>'
. '<th class="column_action position-sticky bg-body d-print-none"' . $colspan . '>'
. $fullOrPartialTextLink
. '</th>';
} elseif (
@ -1748,7 +1748,7 @@ class Results
$displayParams['emptyafter'] = $displayParts->hasEditLink
&& $displayParts->deleteLink !== DeleteLinkEnum::NO_DELETE ? 4 : 1;
$rightColumnHtml .= "\n" . '<td class="d-print-none"' . $colspan
$rightColumnHtml .= "\n" . '<td class="position-sticky bg-body d-print-none"' . $colspan
. '></td>';
}

8
templates/display/results/table.twig
View File

@ -293,10 +293,12 @@
<div class="table-responsive-md">
<table class="table table-striped table-hover table-sm table_results data ajax w-auto" data-uniqueId="{{ unique_id }}">
<thead>
<tr>
{{ headers.button|raw }}
{{ headers.table_headers_for_columns|raw }}
{{ headers.column_at_right_side|raw }}
{{ headers.button|raw }}
{{ headers.table_headers_for_columns|raw }}
{{ headers.column_at_right_side|raw }}
</tr>
</thead>

2
templates/display/results/table_headers_for_columns.twig
View File

@ -1,5 +1,5 @@
{% for column in columns %}
<th class="draggable position-sticky{{ column.is_column_numeric ? ' text-end' }}{{ column.is_column_hidden ? ' hide' -}}
<th class="draggable position-sticky bg-body{{ column.is_column_numeric ? ' text-end' }}{{ column.is_column_hidden ? ' hide' -}}
{{- is_sortable ? ' column_heading' }}{{ is_sortable and column.is_browse_marker_enabled ? ' marker' }}{{ is_sortable and column.is_browse_pointer_enabled ? ' pointer' -}}
{{- not is_sortable and column.has_condition ? ' condition' }}" data-column="{{ column.column_name }}">
{% if is_sortable %}

8
test/classes/Display/ResultsTest.php
View File

@ -1353,9 +1353,9 @@ class ResultsTest extends AbstractTestCase
],
'options' => '$optionsBlock',
'has_bulk_actions_form' => false,
'button' => '<thead><tr>' . "\n",
'button' => '',
'table_headers_for_columns' => $tableHeadersForColumns,
'column_at_right_side' => "\n" . '<td class="d-print-none"></td>',
'column_at_right_side' => "\n" . '<td class="position-sticky bg-body d-print-none"></td>',
],
'body' => '<tr><td data-decimals="0" data-type="real" class="'
. 'text-end data not_null text-nowrap">1</td>' . "\n"
@ -1583,9 +1583,9 @@ class ResultsTest extends AbstractTestCase
'column_order' => [],
'options' => '$optionsBlock',
'has_bulk_actions_form' => false,
'button' => '<thead><tr>' . "\n",
'button' => '',
'table_headers_for_columns' => $tableHeadersForColumns,
'column_at_right_side' => "\n" . '<td class="d-print-none"></td>',
'column_at_right_side' => "\n" . '<td class="position-sticky bg-body d-print-none"></td>',
],
'body' => '<tr><td data-decimals="0" data-type="int" class="'
. 'text-end data not_null text-nowrap">2</td>' . "\n"