From eb0196cda3f93eeb2289dd4e734ca9a9a1bf40b6 Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmcharlt@gmail.com>
Date: Sat, 1 May 2010 13:40:20 -0400
Subject: [PATCH] bug 4396: create new OPAC template include for item status

As part of preparing to work on bug 4396 (item level item types not
working correctly when biblioitem-level item type is not for loan),
moving the item status template logic to a separate include to make
it easier to work with.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
---
 .../prog/en/includes/item-status.inc          | 36 +++++++++++++++++++
 .../prog/en/modules/opac-detail.tmpl          | 35 ++----------------
 2 files changed, 38 insertions(+), 33 deletions(-)
 create mode 100644 koha-tmpl/opac-tmpl/prog/en/includes/item-status.inc

diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/item-status.inc b/koha-tmpl/opac-tmpl/prog/en/includes/item-status.inc
new file mode 100644
index 0000000000..f242f0191d
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/item-status.inc
@@ -0,0 +1,36 @@
+<!-- TMPL_IF name="bi_notforloan" -->
+    Not for loan <!-- TMPL_IF NAME="notforloanvalue" -->(<!-- TMPL_VAR NAME="notforloanvalue" -->)<!-- /TMPL_IF -->
+<!-- TMPL_ELSIF NAME="itypenotforloan" -->
+    Not for loan <!-- TMPL_IF NAME="notforloanvalue" -->(<!-- TMPL_VAR NAME="notforloanvalue" -->)<!-- /TMPL_IF -->
+<!-- TMPL_ELSE -->
+    <!-- TMPL_IF name="datedue" -->
+        <!-- TMPL_IF name="OPACShowCheckoutName" -->
+            Checked out to <!-- TMPL_VAR NAME="cardnumber" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->
+        <!-- TMPL_ELSE -->
+            Checked out
+        <!-- /TMPL_IF -->
+    <!-- TMPL_ELSE -->
+        <!-- TMPL_IF name="itemnotforloan" -->
+            <!-- TMPL_VAR NAME="notforloanvalue" -->
+        <!-- TMPL_ELSE -->
+            <!-- TMPL_IF name="itemlost"-->
+                <!-- TMPL_IF name="lostimageurl"-->
+                    <img src="<!-- TMPL_VAR NAME="lostimageurl" -->" alt="<!-- TMPL_VAR NAME="lostimagelabel" -->" title="<!-- TMPL_VAR NAME="lostimagelabel" -->">
+                <!-- TMPL_ELSE -->
+                    Item lost
+                <!-- /TMPL_IF -->
+            <!-- TMPL_ELSE -->
+                <!-- TMPL_IF NAME="wthdrawn" -->
+                    Item withdrawn
+                <!-- TMPL_ELSIF NAME="damaged" -->
+                    Item damaged
+                <!-- TMPL_ELSIF Name="transfertwhen" -->
+                    In transit from <!-- TMPL_VAR NAME="transfertfrom" -->
+                    to <!-- TMPL_VAR NAME="transfertto" --> since <!-- TMPL_VAR NAME="transfertwhen" -->
+                <!-- TMPL_ELSE -->
+                    <!-- TMPL_IF NAME="waiting" -->On hold<!-- TMPL_ELSE -->Available<!-- /TMPL_IF -->
+                <!-- /TMPL_IF -->
+            <!-- /TMPL_IF -->
+        <!-- /TMPL_IF -->
+    <!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
index 46eb334641..d7a4ccec40 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
@@ -390,39 +390,8 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 		<!-- TMPL_IF NAME="itemdata_copynumber" --><td><!-- TMPL_VAR NAME="copynumber" --></td><!-- /TMPL_IF -->
 		<!-- TMPL_IF NAME="serial" --><td><!-- TMPL_VAR NAME="serialseq" --> </td>
 		<td><!-- TMPL_VAR NAME="publisheddate" --> </td><!-- /TMPL_IF -->
-		<td><!-- TMPL_IF name="bi_notforloan" -->
-			Not for loan <!-- TMPL_IF NAME="notforloanvalue" -->(<!-- TMPL_VAR NAME="notforloanvalue" -->)<!-- /TMPL_IF -->
-		    <!-- TMPL_ELSIF NAME="itypenotforloan" -->
-			Not for loan <!-- TMPL_IF NAME="notforloanvalue" -->(<!-- TMPL_VAR NAME="notforloanvalue" -->)<!-- /TMPL_IF -->
-		    <!-- TMPL_ELSE -->
-			<!-- TMPL_IF name="datedue" -->
-			     <!-- TMPL_IF name="OPACShowCheckoutName" -->
-			    Checked out to <!-- TMPL_VAR NAME="cardnumber" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->
-			<!-- TMPL_ELSE -->
-			Checked out
-			    <!-- /TMPL_IF -->
-			<!-- TMPL_ELSE -->
-			    <!-- TMPL_IF name="itemnotforloan" -->
-				<!-- TMPL_VAR NAME="notforloanvalue" -->
-			    <!-- TMPL_ELSE -->
-				<!-- TMPL_IF name="itemlost"-->
-				    <!-- TMPL_IF name="lostimageurl"--><img src="<!-- TMPL_VAR NAME="lostimageurl" -->" alt="<!-- TMPL_VAR NAME="lostimagelabel" -->" title="<!-- TMPL_VAR NAME="lostimagelabel" -->"><!-- TMPL_ELSE -->Item lost<!-- /TMPL_IF -->
-				<!-- TMPL_ELSE -->
-				    <!-- TMPL_IF NAME="wthdrawn" -->
-					Item withdrawn
-				    <!-- TMPL_ELSIF NAME="damaged" -->
-					Item damaged
-				    <!-- TMPL_ELSIF Name="transfertwhen" -->
-					In transit from <!-- TMPL_VAR NAME="transfertfrom" -->
-					to <!-- TMPL_VAR NAME="transfertto" --> since <!-- TMPL_VAR NAME="transfertwhen" -->
-				    <!-- TMPL_ELSE -->
-					<!-- TMPL_IF NAME="waiting" -->On hold<!-- TMPL_ELSE -->Available<!-- /TMPL_IF -->
-				    <!-- /TMPL_IF -->
-				<!-- /TMPL_IF -->
-			    <!-- /TMPL_IF -->
-			<!-- /TMPL_IF -->
-		    <!-- /TMPL_IF --></td>
-		    <!-- TMPL_IF NAME="itemdata_itemnotes" --><td><!-- TMPL_VAR NAME="itemnotes" --></td><!-- /TMPL_IF -->
+		<td><!-- TMPL_INCLUDE NAME="item-status.inc" --></td>
+		<!-- TMPL_IF NAME="itemdata_itemnotes" --><td><!-- TMPL_VAR NAME="itemnotes" --></td><!-- /TMPL_IF -->
 		<td><!-- TMPL_VAR NAME="datedue" --></td>
 		<!-- TMPL_IF NAME="type" -->
 		<td><a href="/cgi-bin/koha/maint/catmaintain.pl?type=fixitemtype&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->&amp;item=<!-- TMPL_VAR NAME="itemtype" -->">Fix Itemtype</a></td>
-- 
2.20.1