[Koha-cvs] koha/koha-tmpl/intranet-tmpl default/en/catalog... [rel_2_2]

[Owen Leonard]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_2_2
Changes by:     Owen Leonard <address@hidden>   06/05/18 19:14:10

Modified files:
        koha-tmpl/intranet-tmpl/default/en/catalogue: detail.tmpl 
        koha-tmpl/intranet-tmpl/npl/en/catalogue: detail.tmpl 

Log message:
        Corrections to fix Bug 1058 (Intranet detail screen does not show lost 
or cancelled statuses). Chris's fix got lost statuses to appear. Adding similar 
fix to show cancelled status.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl.diff?only_with_tag=rel_2_2&tr1=1.17.2.10&tr2=1.17.2.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue/detail.tmpl.diff?only_with_tag=rel_2_2&tr1=1.4.2.11&tr2=1.4.2.12&r1=text&r2=text

Patches:
Index: koha/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl
diff -u koha/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:1.17.2.10 
koha/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:1.17.2.11
--- koha/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:1.17.2.10     
Fri May 12 08:17:03 2006
+++ koha/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl       Thu May 
18 19:14:10 2006
@@ -150,7 +150,7 @@
                                                    <!-- TMPL_IF 
name="itemlost"-->
                                                        Item lost
                                                    <!-- TMPL_ELSE -->
-                                                       Available
+                                                       <!-- TMPL_IF 
NAME="wthdrawn" -->Item Cancelled<!-- TMPL_ELSE -->Available<!-- /TMPL_IF -->
                                                    <!-- /TMPL_IF -->
                                                <!-- /TMPL_IF -->
                                        <!-- /TMPL_IF -->
Index: koha/koha-tmpl/intranet-tmpl/npl/en/catalogue/detail.tmpl
diff -u koha/koha-tmpl/intranet-tmpl/npl/en/catalogue/detail.tmpl:1.4.2.11 
koha/koha-tmpl/intranet-tmpl/npl/en/catalogue/detail.tmpl:1.4.2.12
--- koha/koha-tmpl/intranet-tmpl/npl/en/catalogue/detail.tmpl:1.4.2.11  Thu Apr 
13 19:52:54 2006
+++ koha/koha-tmpl/intranet-tmpl/npl/en/catalogue/detail.tmpl   Thu May 18 
19:14:10 2006
@@ -62,6 +62,7 @@
                <th>Item Type</th>
                <th>Call Number</th>
                <th>Location</th>
+               <th>Status</th>
                <th>Date Due</th>
                <th>Last Seen</th>
                <th>Barcode</th>
@@ -72,6 +73,19 @@
                        <td><!-- TMPL_VAR NAME="itemtype" --></td>
                        <td><!-- TMPL_IF NAME="classification" --><!-- <a 
href="/cgi-bin/koha/search.pl?class=<!-- TMPL_VAR NAME="class" ESCAPE=URL -->"> 
--><!-- TMPL_VAR NAME="classification" --><!-- </a> --><!-- TMPL_ELSE 
-->&nbsp;<!-- /TMPL_IF --></td>
                        <td><!-- TMPL_VAR NAME="branchname" --></td>
+                       <td>                                    <!-- TMPL_IF 
name="datedue" -->
+                                               On issue to <a 
href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR 
NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="cardnumber" --></a>
+                                       <!-- TMPL_ELSE -->
+                                               <!-- TMPL_IF 
name="notforloantext" -->
+                                                       <!-- TMPL_VAR 
name="notforloantext" -->
+                                               <!-- TMPL_ELSE -->
+                                                   <!-- TMPL_IF 
name="itemlost"-->
+                                                       Item Lost
+                                                   <!-- TMPL_ELSE -->
+                                                       <!-- TMPL_IF 
NAME="wthdrawn" -->Item Cancelled<!-- TMPL_ELSE -->Available<!-- /TMPL_IF -->
+                                                   <!-- /TMPL_IF -->
+                                               <!-- /TMPL_IF -->
+                                       <!-- /TMPL_IF --></td>
                        <td><!-- TMPL_VAR NAME="datedue" --></td>
                        <td><!-- TMPL_VAR NAME="datelastseen" --></td>
                        <td><a href="/cgi-bin/koha/moredetail.pl?type=<!-- 
TMPL_VAR NAME="type" -->&amp;item=<!-- TMPL_VAR NAME="itemnumber" 
-->&amp;bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR 
NAME="biblioitemnumber" -->#<!-- TMPL_VAR NAME="barcode" -->"><!-- TMPL_VAR 
NAME="barcode" --></a></td>