From 538dbc73db823c7537d236d788ad2e3d1c6be054 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Wed, 7 Nov 2018 12:16:08 +0000 Subject: [PATCH] Bug 21777: Fix circulation table alignment TO test: 1 - Check out an item to a patron 2 - Note the columns are misaligned 3 - Apply patch 4 - Updatedatabase 5 - Reload the patron 6 - Note the table is fixed Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens (cherry picked from commit 8d4136c7663d351268e8647da7189acacfc1b050) Signed-off-by: Martin Renvoize --- admin/columns_settings.yml | 5 +++++ .../prog/en/includes/checkouts-table-footer.inc | 8 ++++---- .../intranet-tmpl/prog/en/includes/checkouts-table.inc | 1 + 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml index 8f0628f06d..fb09826c7e 100644 --- a/admin/columns_settings.yml +++ b/admin/columns_settings.yml @@ -388,6 +388,11 @@ modules: columnname: location - columnname: homebranch + - + columnname: checkout_on_unformatted + cannot_be_toggled: 1 + cannot_be_modified: 1 + is_hidden: 1 - columnname: checkout_on - diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc index 3adbfa326a..40b7223161 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc @@ -1,9 +1,9 @@ - Totals: - [% totaldue %] - [% finetotal %] - [% totalprice %] + Totals: + [% totaldue | html %] + [% finetotal | html %] + [% totalprice | html %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc index 03b9663214..0a60e25976 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc @@ -18,6 +18,7 @@ Item type Location Home library +   Checked out on Checked out from Call no -- 2.39.5