From 122184f8a2266e2d03cac0973bcec53410295b3e Mon Sep 17 00:00:00 2001
From: oleonard <oleonard>
Date: Mon, 25 Sep 2006 19:01:02 +0000
Subject: [PATCH] Synching with latest changes to default templates

---
 koha-tmpl/intranet-tmpl/npl/en/acqui/basket.tmpl   | 14 ++++++++++++--
 .../intranet-tmpl/npl/en/acqui/lateorders.tmpl     |  2 +-
 .../intranet-tmpl/npl/en/acqui/newbiblio.tmpl      |  2 +-
 koha-tmpl/intranet-tmpl/npl/en/acqui/order.tmpl    |  6 +++++-
 .../intranet-tmpl/npl/en/members/moremember.tmpl   |  2 +-
 .../opac-tmpl/npl/en/opac-authoritiesdetail.tmpl   |  4 ++--
 6 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/npl/en/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/npl/en/acqui/basket.tmpl
index 36efe761f0..5fa978ba45 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/acqui/basket.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/acqui/basket.tmpl
@@ -27,6 +27,12 @@
 		<tr><td><!-- TMPL_VAR name="address3" --></td></tr>
 		<tr><td><!-- TMPL_VAR name="address4" --></td></tr>
 		</table>
+		
+		<table>
+		<tr><th rowspan="4">For Branch:</th><td><!-- TMPL_VAR name="branchname" --></td></tr>
+	   <tr><td><!-- TMPL_VAR name="branchaddress1" --></td></tr>
+	   <tr><td><!-- TMPL_VAR name="branchaddress2" --></td></tr>
+	   <tr><td><!-- TMPL_VAR name="branchaddress3" --></td></tr></table>
 		</div>	
 		
 	<div class="data">
@@ -43,8 +49,10 @@
 				<th scope="col">Total</th>
 				<th scope="col"><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&amp;order=aqorderbreakdown.bookfundid,biblioitems.publishercode">Fund</a></th>
 					<!-- TMPL_IF name="active" -->
-					<th scope="col">Remove</th>
-					<th scope="col">Edit</th>
+						<!-- TMPL_UNLESS name="closedate" -->
+						<th scope="col">Remove</th>
+						<th scope="col">Edit</th>
+						<!-- /TMPL_UNLESS -->
 					<!-- /TMPL_IF -->
 			</tr>
 			<!-- TMPL_LOOP NAME="books_loop" -->
@@ -75,6 +83,7 @@
 					<td><!-- TMPL_VAR NAME="line_total" --></td>
 					<td><!-- TMPL_VAR NAME="bookfundid" --></td>
 					<!-- TMPL_IF name="active" -->
+						<!-- TMPL_UNLESS name="closedate" -->
 					<td>
 							<form action="addorder.pl" method="get"><input type="hidden" name="ordnum" value="<!-- TMPL_VAR NAME="ordernumber" -->" /><input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" /><input type="hidden" name="quantity" value="0" /><input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="delete" value="Delete" /></form>
 						</td>
@@ -82,6 +91,7 @@
 						<form action="newbiblio.pl" method="get"><input type="hidden" name="sub" value="" /><input type="hidden" name="booksellerid" value="<!-- TMPL_VAR NAME="booksellerid" -->" /><input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" /><input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" name="ordnum" value="<!-- TMPL_VAR NAME="ordernumber" -->" /><!--TMPL_IF name="closedate"--><input type="hidden" name="close" value="1" /><!--/TMPL_IF --><input type="submit" class="submit" value="Edit" />
 							</form>
 						</td>
+						<!-- /TMPL_UNLESS -->
 						<!-- /TMPL_IF -->
 				</tr>
 			<!-- /TMPL_LOOP -->
diff --git a/koha-tmpl/intranet-tmpl/npl/en/acqui/lateorders.tmpl b/koha-tmpl/intranet-tmpl/npl/en/acqui/lateorders.tmpl
index 15b7a6c6aa..e139c584ca 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/acqui/lateorders.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/acqui/lateorders.tmpl
@@ -57,7 +57,7 @@
 					<!-- TMPL_VAR name="latesince" -->
 				</td>
 				<td>
-					<!-- TMPL_VAR name="basketno" -->
+					<a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->"><!-- TMPL_VAR name="basketno" --></a>
 				</td>
 				<td >
 					<b><!-- TMPL_VAR name="title" --></b>
diff --git a/koha-tmpl/intranet-tmpl/npl/en/acqui/newbiblio.tmpl b/koha-tmpl/intranet-tmpl/npl/en/acqui/newbiblio.tmpl
index 710ef2680f..62895ebfe2 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/acqui/newbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/acqui/newbiblio.tmpl
@@ -67,7 +67,7 @@ function check(f) {
 
 </script>
 <div id="main">
-<form action="basket.pl" method="get" style="float: right"><input type="hidden" name="basket" value="<!-- TMPL_VAR NAME="basket" -->" /><input type="submit" value="View Basket" class="submit" /></form>
+<form action="basket.pl" method="get" style="float: right"><input type="hidden" name="basket" value="<!-- TMPL_VAR NAME="basketno" -->" /><input type="submit" value="View Basket" class="submit" /></form>
 	<form action="/cgi-bin/koha/acqui/addorder.pl" method="post" name="frusin">
 	<!-- TMPL_UNLESS name="existing" --><input type="hidden" name="existing" value="no" /><!-- /TMPL_UNLESS -->
 	<!-- <!-- TMPL_VAR NAME="title" --> -->
diff --git a/koha-tmpl/intranet-tmpl/npl/en/acqui/order.tmpl b/koha-tmpl/intranet-tmpl/npl/en/acqui/order.tmpl
index 32e48093fe..dbcb942547 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/acqui/order.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/acqui/order.tmpl
@@ -9,7 +9,7 @@
 	<th>Order</th>
 	<th>Receive</th>
 	<th>Company</th>
-	<th>Exisiting Baskets</th>
+	<th>Basket</th>
 </tr>
 
 <!-- TMPL_LOOP name="loop_suppliers" -->
@@ -23,6 +23,7 @@
 		<td><a href="supplier.pl?supplierid=<!-- TMPL_VAR name="supplierid" -->&amp;op=display"><!-- TMPL_VAR name="name" --></a></td>
 		<td>
 <div class="data"><table>
+			     <!-- TMPL_IF name="loop_basket" -->
 					<tr>
 						<th scope="col">Basket</th>
 						<th scope="col">Items</th>
@@ -30,6 +31,9 @@
 						<th scope="col">Date</th>
 						<th scope="col">&nbsp;</th>
 					</tr>
+				<!-- TMPL_ELSE -->
+				    <tr><td>No pending basket</td></tr>
+                <!-- /TMPL_IF -->
 					<!-- TMPL_LOOP NAME="loop_basket" -->
 						<tr>
 							<td><!-- TMPL_VAR NAME="basketno" --></a></td>
diff --git a/koha-tmpl/intranet-tmpl/npl/en/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/npl/en/members/moremember.tmpl
index c1267f8590..d052e3b585 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/members/moremember.tmpl
@@ -11,7 +11,7 @@
 
 <!-- Hide from NPL --><!-- TMPL_IF name="IS_ADULT" --> <!-- TMPL_UNLESS NAME="unvalidlibrarian"--><form action="/cgi-bin/koha/members/jmemberentry.pl" method="post"> <input type="submit" name="submit" value="Add Child" class="submit" alt="Add Child" /><input type="hidden" name="type" value="add" /><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR name="borrowernumber" -->" /></form><!-- /TMPL_UNLESS --><!-- /TMPL_IF --><!-- /Hide from NPL -->
 
-<!-- TMPL_UNLESS NAME="unvalidlibrarian"--><!-- TMPL_IF name="I" --> <form action="/cgi-bin/koha/members/imemberentry.pl" method="post"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR name="bornum" -->" /> <input type="submit" name="modify" class="submit" value="Edit" /></form>
+<!-- TMPL_UNLESS NAME="unvalidlibrarian"--><!-- TMPL_IF name="I" --> <form action="/cgi-bin/koha/members/memberentry.pl" method="post"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR name="bornum" -->" /><input type="hidden" name="categorycode" value="I" /> <input type="submit" name="modify" class="submit" value="Edit" /></form>
 <!-- TMPL_ELSE --> <form action="/cgi-bin/koha/members/memberentry.pl" method="post"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR name="bornum" -->" /> <input type="submit" class="submit" name="modify" value="Edit" /></form>
 <!-- /TMPL_IF --><!-- /TMPL_UNLESS -->
 
diff --git a/koha-tmpl/opac-tmpl/npl/en/opac-authoritiesdetail.tmpl b/koha-tmpl/opac-tmpl/npl/en/opac-authoritiesdetail.tmpl
index 1132863550..46f9df95b1 100644
--- a/koha-tmpl/opac-tmpl/npl/en/opac-authoritiesdetail.tmpl
+++ b/koha-tmpl/opac-tmpl/npl/en/opac-authoritiesdetail.tmpl
@@ -9,9 +9,9 @@
 	<a href="opac-search.pl?type=opac&amp;op=do_search&amp;marclist=<!-- TMPL_VAR NAME="biblio_fields" -->&amp;operator==&amp;value=<!-- TMPL_VAR NAME="authid" -->&amp;and_or=and&amp;excluding="><!-- TMPL_VAR name="count" --> biblios</a>
 </div>
 <table><!-- TMPL_LOOP name="0XX" -->
-        <tr><td colspan="3" class="marctag"><!-- TMPL_VAR name="tag" --></td></tr>
+        <tr><td colspan="2" class="marctag"><!-- TMPL_VAR name="tag" --></td></tr>
         <!-- TMPL_LOOP name="subfield" -->
-                <tr><td class="marcsubfieldletter"><!-- TMPL_VAR name="marc_subfield" --></td>
+                <tr>
                     <td class="marcsubfieldname"><!-- TMPL_VAR name="marc_lib" --></td>
                     <td class="subfieldvalue"><!-- TMPL_VAR name="marc_value" --></td>
                 </tr>
-- 
2.39.5