From 27fc4d459598f071f0219346de81b6303f538eeb Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Fri, 5 Jan 2024 12:14:31 +0000 Subject: [PATCH] Bug 35707: Add clearfix to item statuses This patch adds the clearfix class to each of item status/availabiliy spans. This has the effect of pushing each status onto it's own line. Test plan 1) Add an item to stockrotation and trigger the first transfer 2) Place a hold on the item 3) Note that you will now see two status's, one above the other as displayed in the screenshots attached to the bug. --- .../prog/en/modules/catalogue/detail.tt | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index 05da5acf56f..2d2e2142e6a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -471,9 +471,9 @@ [% IF item.object.checkout %] [% IF item.object.checkout.onsite_checkout %] - Currently in local use + Currently in local use [% ELSE %] - Checked out + Checked out [% END %] [% IF item.can_be_edited %] [% IF item.object.checkout.onsite_checkout %] @@ -487,9 +487,9 @@ [% ELSIF ( transfer = item.object.get_transfer ) %] [% IF (transfer.datesent) %] - In transit from [% Branches.GetName( transfer.frombranch ) | html %] to [% Branches.GetName( transfer.tobranch ) | html %] since [% transfer.datesent | $KohaDates %] + In transit from [% Branches.GetName( transfer.frombranch ) | html %] to [% Branches.GetName( transfer.tobranch ) | html %] since [% transfer.datesent | $KohaDates %] [% ELSE %] - Transit pending from [% Branches.GetName( transfer.frombranch ) | html %] to [% Branches.GetName( transfer.tobranch ) | html %] since [% item.transfer.daterequested | $KohaDates %] + Transit pending from [% Branches.GetName( transfer.frombranch ) | html %] to [% Branches.GetName( transfer.tobranch ) | html %] since [% item.transfer.daterequested | $KohaDates %] [% END %] [% END %] @@ -497,32 +497,32 @@ [% IF ( item.itemlost ) %] [% SET itemlost_description = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.itemlost', authorised_value => item.itemlost ) %] [% IF itemlostloop %] - [% itemlost_description | html %] + [% itemlost_description | html %] [% ELSE %] - Unavailable (lost or missing) + Unavailable (lost or missing) [% END %] [% END %] [% IF ( item.withdrawn ) %] [% SET withdrawn_description = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.withdrawn', authorised_value => item.withdrawn ) %] [% IF withdrawn_description %] - [% withdrawn_description | html %] + [% withdrawn_description | html %] [% ELSE %] - Withdrawn + Withdrawn [% END %] [% END %] [% IF ( item.damaged ) %] [% SET damaged_description = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.damaged', authorised_value => item.damaged ) %] [% IF damaged_description %] - [% damaged_description | html %] + [% damaged_description | html %] [% ELSE %] - Damaged + Damaged [% END %] [% END %] [% IF ( item.notforloan || item.itemtype.notforloan ) %] - Not for loan + Not for loan [% SET not_for_loan_description = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.notforloan', authorised_value => item.notforloan ) %] [% IF not_for_loan_description %] ([% not_for_loan_description | html %]) @@ -533,13 +533,13 @@ [% SET hold = item.first_hold %] [% IF hold %] [% IF hold.waitingdate %] - Waiting at [% Branches.GetName( hold.branchcode ) | html %][% IF ( hold.desk_id ) %], [% hold.desk.desk_name | html %][% END %] since [% hold.waitingdate | $KohaDates %]. + Waiting at [% Branches.GetName( hold.branchcode ) | html %][% IF ( hold.desk_id ) %], [% hold.desk.desk_name | html %][% END %] since [% hold.waitingdate | $KohaDates %]. [% IF canreservefromotherbranches AND ( hold.waitingdate OR hold.priority == 1 ) %] Hold for: [% INCLUDE 'patron-title.inc' patron=hold.borrower hide_patron_infos_if_needed=1 %] [% END %] [% ELSE %] - There is an item level hold on this item (priority = [% hold.priority | html %]). + There is an item level hold on this item (priority = [% hold.priority | html %]). [% END %] [% END %] @@ -547,24 +547,24 @@ [% SET recall = item.object.recall %] [% IF recall %] [% IF recall.waiting_date %] - Waiting at [% Branches.GetName( recall.pickup_library_id ) | html %] since [% recall.waiting_date | $KohaDates %] + Waiting at [% Branches.GetName( recall.pickup_library_id ) | html %] since [% recall.waiting_date | $KohaDates %] [% ELSE %] [% patron_link = BLOCK %][% recall.patron.firstname | html %] [% recall.patron.surname | html %] ([% recall.patron.cardnumber | html %])[% END %] - recalled by [% patron_link| $raw %] on [% recall.created_date | $KohaDates %] + recalled by [% patron_link| $raw %] on [% recall.created_date | $KohaDates %] [% END %] [% END %] [% END %] [% UNLESS ( item.notforloan || item.itemtype.notforloan || item.onloan || item.itemlost || item.withdrawn || item.damaged || item.transfer || hold || ( Koha.Preference('UseRecalls') && recall ) ) %] - Available + Available [% END %] [% IF ( item.restricted ) %] - ([% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.restricted', authorised_value => item.restricted ) | html %]) + ([% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.restricted', authorised_value => item.restricted ) | html %]) [% END %] [% IF ( item.bundle_host ) %] - In bundle: [% INCLUDE 'biblio-title.inc' biblio = item.bundle_host.biblio link = 1 %] + In bundle: [% INCLUDE 'biblio-title.inc' biblio = item.bundle_host.biblio link = 1 %] [% END %] -- 2.43.0