From 4a40e9184dd6862d78dd240491aff2ea2511f5c4 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Sat, 6 Apr 2024 10:17:25 +0100 Subject: [PATCH 1/2] Backend: remove invalid "name" element, removed redundant nobr spans, added data-column-id to grids --- .../Adminhtml/Block/Widget/Grid/Column/Renderer/Abstract.php | 3 +-- .../adminhtml/default/default/template/widget/grid.phtml | 2 +- skin/adminhtml/default/default/boxes.css | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Abstract.php index 436131036c8..eebb7e33318 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Abstract.php @@ -124,8 +124,7 @@ public function renderHeader() if ($this->getColumn()->getDir()) { $className = 'sort-arrow-' . $dir; } - $out = '' + $out = '' . $this->escapeHtml($this->getColumn()->getHeader()) . ''; } else { $out = $this->escapeHtml($this->getColumn()->getHeader()); diff --git a/app/design/adminhtml/default/default/template/widget/grid.phtml b/app/design/adminhtml/default/default/template/widget/grid.phtml index d28723ea8ca..d24045dedc3 100644 --- a/app/design/adminhtml/default/default/template/widget/grid.phtml +++ b/app/design/adminhtml/default/default/template/widget/grid.phtml @@ -114,7 +114,7 @@ $numColumns = count($this->getColumns()); getHeadersVisibility()): ?> getColumns() as $_column): ?> - getHeaderHtmlProperty() ?>>getHeaderHtml() ?> + getHeaderHtmlProperty() ?> data-column-id="getId() ?>">getHeaderHtml() ?> diff --git a/skin/adminhtml/default/default/boxes.css b/skin/adminhtml/default/default/boxes.css index cce5794d22a..79b3f355ab5 100644 --- a/skin/adminhtml/default/default/boxes.css +++ b/skin/adminhtml/default/default/boxes.css @@ -159,7 +159,7 @@ table.actions td { vertical-align:top; } /* Grid - Headings */ .grid tr.headings { background:url(images/sort_row_bg.gif) 0 50% repeat-x; } -.grid tr.headings th { border-width:1px; border-color:#f9f9f9 #d1cfcf #f9f9f9 #f9f9f9; border-style:solid; padding-top:1px; padding-bottom:0; font-size:.9em; } +.grid tr.headings th { border-width:1px; border-color:#f9f9f9 #d1cfcf #f9f9f9 #f9f9f9; border-style:solid; padding-top:1px; padding-bottom:0; font-size:.9em; white-space:nowrap;} .grid tr.headings th.last { border-right:0; } .grid tr.headings th.no-link { /* Grid th with no sorting functionality */ padding-top:2px; padding-bottom:1px; color:#67767e; } .grid tr.headings th span.nobr { display:block; /* FF3 fix */ } From 83abe139ebb50c54c88bf025b508f9fa6d8e17fc Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Mon, 8 Apr 2024 10:33:25 +0100 Subject: [PATCH 2/2] Removed FireFox3 hack... --- skin/adminhtml/default/default/boxes.css | 1 - 1 file changed, 1 deletion(-) diff --git a/skin/adminhtml/default/default/boxes.css b/skin/adminhtml/default/default/boxes.css index 79b3f355ab5..8f8d3b3710c 100644 --- a/skin/adminhtml/default/default/boxes.css +++ b/skin/adminhtml/default/default/boxes.css @@ -162,7 +162,6 @@ table.actions td { vertical-align:top; } .grid tr.headings th { border-width:1px; border-color:#f9f9f9 #d1cfcf #f9f9f9 #f9f9f9; border-style:solid; padding-top:1px; padding-bottom:0; font-size:.9em; white-space:nowrap;} .grid tr.headings th.last { border-right:0; } .grid tr.headings th.no-link { /* Grid th with no sorting functionality */ padding-top:2px; padding-bottom:1px; color:#67767e; } -.grid tr.headings th span.nobr { display:block; /* FF3 fix */ } .grid tr.headings th a { display:block; padding:2px 4px 1px 0; color:#2d444f; text-decoration:none; } .grid tr.headings th a:hover { color:#d85909; text-decoration:none; } .grid tr.headings th a.sort-arrow-desc,