[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/circ circulation.tmpl,1.6,1.7

[Owen Leonard]

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18951/koha-tmpl/intranet-tmpl/npl/en/circ

Modified Files:
        circulation.tmpl 
Log Message:
Updating for 2.2

Index: circulation.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ/circulation.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** circulation.tmpl    11 Dec 2004 21:01:15 -0000      1.6
--- circulation.tmpl    12 Jan 2005 20:19:01 -0000      1.7
***************
*** 27,31 ****
                        <!-- /TMPL_IF -->
                        <!-- TMPL_IF NAME="UNKNOWN_BARCODE" -->
!                               <li>The barcode is not found</li>
                        <!-- /TMPL_IF -->
                        <!-- TMPL_IF NAME="NOT_FOR_LOAN" -->
--- 27,31 ----
                        <!-- /TMPL_IF -->
                        <!-- TMPL_IF NAME="UNKNOWN_BARCODE" -->
!                               <li>The barcode was not found</li>
                        <!-- /TMPL_IF -->
                        <!-- TMPL_IF NAME="NOT_FOR_LOAN" -->
***************
*** 33,37 ****
                        <!-- /TMPL_IF -->
                        <!-- TMPL_IF NAME="WTHDRAWN" -->
!                               <li>Item withdrawn</li>
                        <!-- /TMPL_IF -->
                        <!-- TMPL_IF NAME="GNA" -->
--- 33,37 ----
                        <!-- /TMPL_IF -->
                        <!-- TMPL_IF NAME="WTHDRAWN" -->
!                               <li>Item is cancelled</li>
                        <!-- /TMPL_IF -->
                        <!-- TMPL_IF NAME="GNA" -->
***************
*** 60,67 ****
                        <!-- /TMPL_IF -->       
                        <!-- TMPL_IF NAME="RESERVE_WAITING" -->
!                               <p>Reserve waiting</p>
!                       <!-- /TMPL_IF -->       
                        <!-- TMPL_IF NAME="ISSUED_TO_ANOTHER" -->
!                               <p>Item issued to <!-- TMPL_VAR 
NAME="ISSUED_TO_ANOTHER" -->. Return &amp; issue?</p>
                        <!-- /TMPL_IF -->
                        <!-- TMPL_IF NAME="TOO_MANY" -->
--- 60,70 ----
                        <!-- /TMPL_IF -->       
                        <!-- TMPL_IF NAME="RESERVE_WAITING" -->
!                               <p>Item is consigned for <!-- TMPL_VAR 
NAME="RESERVE_WAITING" --></p>
!                       <!-- /TMPL_IF -->
!                       <!-- TMPL_IF NAME="RESERVED" -->
!                               <p>Item is on reserve for <!-- TMPL_VAR 
NAME="RESERVED" --></p>
!                       <!-- /TMPL_IF -->
                        <!-- TMPL_IF NAME="ISSUED_TO_ANOTHER" -->
!                               <p>Item issued to <!-- TMPL_VAR 
NAME="ISSUED_TO_ANOTHER" -->. Return and issue?</p>
                        <!-- /TMPL_IF -->
                        <!-- TMPL_IF NAME="TOO_MANY" -->
***************
*** 69,81 ****
                        <!-- /TMPL_IF -->
                        <!-- TMPL_UNLESS name="IMPOSSIBLE" -->
!                       <form method="post">
                                <input type="hidden" name="barcode" value="<!-- 
TMPL_VAR NAME="barcode" -->" />
!                               <input type="hidden" name="borrnumber" 
value="<!-- TMPL_VAR NAME="borrowernumber">" />
                                <input type="hidden" name="issueconfirmed" 
value="1" />
                                <input type="hidden" name="day" value="<!-- 
TMPL_VAR name="day" -->" />
                                <input type="hidden" name="month" value="<!-- 
TMPL_VAR name="month" -->" />
                                <input type="hidden" name="year" value="<!-- 
TMPL_VAR name="year" -->" />
!                               <input type="submit" value="Confirm issue" 
class="submit" />
!                       </form>
                        </div>
                        <!-- /TMPL_UNLESS -->
--- 72,89 ----
                        <!-- /TMPL_IF -->
                        <!-- TMPL_UNLESS name="IMPOSSIBLE" -->
!                       <div class="action"><form class="inline" method="post" 
action="/cgi-bin/koha/circ/circulation.pl">
!                               <!-- TMPL_IF NAME="RESERVED" -->
!                                       <p><input type="checkbox" 
id="cancelreserve" name="cancelreserve" value="1" /><label 
for="cancelreserve">Cancel Reserve</label></p>
!                               <!-- /TMPL_IF -->
!                               <!-- TMPL_IF NAME="RESERVE_WAITING" -->
!                                       <p><input type="checkbox" 
id="cancelreserve" name="cancelreserve" value="1" /><label 
for="cancelreserve">Cancel Reserve</label></p>
!                               <!-- /TMPL_IF -->
                                <input type="hidden" name="barcode" value="<!-- 
TMPL_VAR NAME="barcode" -->" />
!                               <input type="hidden" name="borrnumber" 
value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
                                <input type="hidden" name="issueconfirmed" 
value="1" />
                                <input type="hidden" name="day" value="<!-- 
TMPL_VAR name="day" -->" />
                                <input type="hidden" name="month" value="<!-- 
TMPL_VAR name="month" -->" />
                                <input type="hidden" name="year" value="<!-- 
TMPL_VAR name="year" -->" />
!                               <input type="submit" value="Confirm Issue" 
class="submit" /></form><form class="inline" method="get" 
action="/cgi-bin/koha/circ/circulation.pl"><input type="hidden" 
name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /><input 
type="submit" class="cancel" value="Don't Issue" /></form></div>
                        </div>
                        <!-- /TMPL_UNLESS -->