From 78b73c3fffc6f5125a688e91582da92287fbbef2 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 14 Nov 2013 15:41:02 -0500 Subject: [PATCH] Bug 11179: (follow-up) apply fix to Boostrap theme This follow-up applies the same fix to the Bootstrap theme. This patch also includes the changes to item-status.inc in the Bootstrap theme which were made to the prog theme in Bug 10820: display item status as lost if item is both lost and on loan. Signed-off-by: Liz Rea Bootstrap theme looking so nice. Also the patch works. Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton --- .../bootstrap/en/includes/item-status.inc | 24 +++++++++---------- .../en/modules/opac-course-details.tt | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc index 60fbe64f0b..fa3a919752 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc @@ -1,6 +1,17 @@ [% USE KohaAuthorisedValues %] -[% IF ( item.datedue ) %] +[% IF ( item.itemlost ) %] + [% av_lib_include = KohaAuthorisedValues.GetByCode( 'LOST', item.itemlost, 1 ) %] + [% IF ( av_lib_include ) %] + [% av_lib_include %] + [% ELSE %] + [% IF ( item.lostimageurl ) %] + [% item.lostimagelabel %] + [% ELSE %] + Item lost + [% END %] + [% END %] +[% ELSIF ( item.datedue || issue.date_due ) %] [% IF ( OPACShowCheckoutName ) %] Checked out to [% item.cardnumber %] [% item.firstname %] [% item.surname %] [% ELSE %] @@ -13,17 +24,6 @@ On hold [% ELSIF ( item.withdrawn ) %] Item withdrawn -[% ELSIF ( item.itemlost ) %] - [% av_lib_include = KohaAuthorisedValues.GetByCode( 'LOST', item.itemlost, 1 ) %] - [% IF ( av_lib_include ) %] - [% av_lib_include %] - [% ELSE %] - [% IF ( item.lostimageurl ) %] - [% item.lostimagelabel %] - [% ELSE %] - Item lost - [% END %] - [% END %] [% ELSIF ( item.itemnotforloan ) %] [% IF ( item.notforloanvalueopac ) %] [% item.notforloanvalueopac %] [% IF ( item.restrictedopac ) %]([% item.restrictedopac %])[% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt index 93335114c9..622c2a6c0b 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt @@ -67,7 +67,7 @@ [% AuthorisedValues.GetByCode( 'CCODE', cr.item.ccode ) %] [% cr.item.itemcallnumber %] [% cr.item.copynumber %] - [% INCLUDE 'item-status.inc' item = cr.item %] + [% INCLUDE 'item-status.inc' item=cr.item issue=cr.issue %] [% cr.issue.date_due | $KohaDates %] [% cr.public_note %] -- 2.39.5