From 3738b00c15c09fe98f833f950da8821cc6951788 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 10 Oct 2023 15:50:08 +0000 Subject: [PATCH] Bug 35007: Configure self checkout tables consistently This patch makes some updates to the self checkout page so that checkouts, holds, and account tabs are consistent with each other, with the same DataTables configuration. Included in the DataTables configuration are the same options we use on the OPAC's user summary page to show controls for copy, CSV, and print. Also changed: Some extra markup is removed from holds-table.inc, markup which was used to show table information responsively before we started using the DataTables responsive plugin. To test, apply the patch and log into the self checkout system as a user with checkouts, holds, and present or past charges. Compare the checkouts, holds, and charges tabs to confirm that the tables look correct and work correctly. Test that the copy, CSV, and print controls, and the search and clear filter functions. Test that each table responds correctly at various browser widths. Signed-off-by: David Nind Signed-off-by: Nick Clemens Signed-off-by: Tomas Cohen Arazi --- .../opac-tmpl/bootstrap/css/src/_common.scss | 3 +- .../bootstrap/en/includes/account-table.inc | 4 +- .../bootstrap/en/includes/holds-table.inc | 13 +---- .../bootstrap/en/modules/sco/sco-main.tt | 58 ++++++++++++++----- 4 files changed, 50 insertions(+), 28 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss index 6888ba9a29..8c318e25ab 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss +++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss @@ -705,7 +705,8 @@ table { .nosort, .nosort.sorting_asc, .nosort.sorting_desc, - .nosort.sorting { + .nosort.sorting, + .sorting_disabled { background: #E2E8E8 none; padding-right: 19px; } diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc index 3605fcab1d..70a1508e87 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc @@ -7,8 +7,8 @@ [% IF ENABLE_OPAC_PAYMENTS %] [% END %] Created - Updated - Type + Updated + Type Description Amount Amount outstanding diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc index cd35d2dc92..e74c2b1356 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc @@ -8,7 +8,7 @@ - Title + Title [% IF ( showpriority ) %] Placed on [% ELSE %] @@ -66,17 +66,13 @@ [% END %] - Hold date: - [% HOLD.reservedate | $KohaDates %] - + [% HOLD.reservedate | $KohaDates %] [% IF ! HOLD.found %] [% IF ( HOLD.expirationdate ) %] - Expiration: [% HOLD.expirationdate | $KohaDates %] [% ELSE %] - Expiration: Never expires [% END %] [% ELSE %] @@ -86,7 +82,6 @@ [% UNLESS( singleBranchMode) %] - Pickup location: [% HOLD.branch.branchname | html %] [% IF ( HOLD.can_update_pickup_location_opac ) %]