From 78b73c3fffc6f5125a688e91582da92287fbbef2 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
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 <liz@catalyst.net.nz>
Bootstrap theme looking so nice. Also the patch works.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
---
 .../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 ) %]
+            <img src="[% item.lostimageurl %]" alt="[% item.lostimagelabel %]" title="[% 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 ) %]
-            <img src="[% item.lostimageurl %]" alt="[% item.lostimagelabel %]" title="[% item.lostimagelabel %]">
-        [% ELSE %]
-            Item lost
-        [% END %]
-    [% END %]
 [% ELSIF ( item.itemnotforloan ) %]
     [% IF ( item.notforloanvalueopac ) %]
         [% item.notforloanvalueopac %] [% IF ( item.restrictedopac ) %]<span class="restricted">([% item.restrictedopac %])</span>[% 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 @@
                                     <td>[% AuthorisedValues.GetByCode( 'CCODE', cr.item.ccode ) %]</td>
                                     <td>[% cr.item.itemcallnumber %]</td>
                                     <td>[% cr.item.copynumber %]</td>
-                                    <td>[% INCLUDE 'item-status.inc' item = cr.item %]</td>
+                                    <td>[% INCLUDE 'item-status.inc' item=cr.item issue=cr.issue %]</td>
                                     <td>[% cr.issue.date_due | $KohaDates %]</td>
                                     <td>[% cr.public_note %]</td>
                                 </tr>
-- 
2.39.5