From 81b41d44e4f4f85fe1a1ad9bfa204f8692706df9 Mon Sep 17 00:00:00 2001 From: Andreas Roussos Date: Sat, 6 Oct 2018 10:15:26 +0300 Subject: [PATCH] Bug 21506: DataTables four button pagination uses the wrong icon for First and Last buttons MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Pages with DataTables' four button pagination use the wrong icon for 'First' and 'Last'. Also, the icons for all four buttons are truncated at the bottom. This patch fixes that. Test plan: 1) Go to a page that uses four button pagination (e.g. Home > Administration > MARC frameworks) and notice how the pagination icons for First/Previous and Next/Last are the same. Also notice all four icons are clipped at the bottom. 2) Apply the patch. 3) Refresh the page; the First and Last buttons' icons now include a vertical bar, and there is no clipping visible. 4) For completeness, check other affected pages as well. Signed-off-by: Séverine QUEUNE Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 074c329774adb7b23f85293a7f6d146c0d989f99) Signed-off-by: Martin Renvoize (cherry picked from commit 8802d32b7f4e9f4642d3b0f7f7f8a871b85662ed) Signed-off-by: Fridolin Somers --- koha-tmpl/intranet-tmpl/prog/css/datatables.css | 4 +++- koha-tmpl/intranet-tmpl/prog/js/datatables.js | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/datatables.css b/koha-tmpl/intranet-tmpl/prog/css/datatables.css index 71fdb6b2ec..94b03e8cbf 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/datatables.css +++ b/koha-tmpl/intranet-tmpl/prog/css/datatables.css @@ -167,7 +167,7 @@ div.dataTables_paginate.paging_four_button { .paginate_enabled_last { cursor: pointer; *cursor: hand; - padding: .1em 0; + padding: .2em 0; } .paginate_disabled_previous, @@ -177,6 +177,8 @@ div.dataTables_paginate.paging_four_button { color: #111 !important; } +.paginate_disabled_first, +.paginate_enabled_first, .paginate_disabled_previous, .paginate_enabled_previous { padding-left: 23px; diff --git a/koha-tmpl/intranet-tmpl/prog/js/datatables.js b/koha-tmpl/intranet-tmpl/prog/js/datatables.js index 99aec8396e..e6f9252b86 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/datatables.js +++ b/koha-tmpl/intranet-tmpl/prog/js/datatables.js @@ -255,24 +255,24 @@ $.fn.dataTableExt.oPagination.four_button = { var buttons = an[i].getElementsByTagName('span'); if ( oSettings._iDisplayStart === 0 ) { - buttons[0].className = "paginate_disabled_previous"; + buttons[0].className = "paginate_disabled_first"; buttons[1].className = "paginate_disabled_previous"; } else { - buttons[0].className = "paginate_enabled_previous"; + buttons[0].className = "paginate_enabled_first"; buttons[1].className = "paginate_enabled_previous"; } if ( oSettings.fnDisplayEnd() == oSettings.fnRecordsDisplay() ) { buttons[2].className = "paginate_disabled_next"; - buttons[3].className = "paginate_disabled_next"; + buttons[3].className = "paginate_disabled_last"; } else { buttons[2].className = "paginate_enabled_next"; - buttons[3].className = "paginate_enabled_next"; + buttons[3].className = "paginate_enabled_last"; } } } -- 2.20.1