[Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en/acqui acqui... [dev_week]

[Ryan Higgins]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	Ryan Higgins <rych>	07/01/01 00:41:07

Modified files:
	koha-tmpl/intranet-tmpl/npl/en/acqui: acqui-home.tmpl 
	                                      lateorders.tmpl 
	                                      recieve.tmpl 

Log message:
	adding some cross-navigational links

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/acqui-home.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.3.2.3.2.2&r2=1.3.2.3.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/lateorders.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.2&r2=1.1.2.2.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/recieve.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.3.2.2&r2=1.1.2.3.2.3

Patches:
Index: acqui-home.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/Attic/acqui-home.tmpl,v
retrieving revision 1.3.2.3.2.2
retrieving revision 1.3.2.3.2.3
diff -u -b -r1.3.2.3.2.2 -r1.3.2.3.2.3
--- acqui-home.tmpl	12 Dec 2006 17:19:31 -0000	1.3.2.3.2.2
+++ acqui-home.tmpl	1 Jan 2007 00:41:07 -0000	1.3.2.3.2.3
@@ -63,7 +63,7 @@
 		<div class="error">You must <a href="/cgi-bin/koha/admin/aqbookfund.pl">define a budget</a></div>
 	<!-- TMPL_ELSE -->
 	<table>
-		<caption>Budgets and Bookfunds</caption>
+		<caption> <a href="/cgi-bin/koha/admin/aqbookfund.pl" title="[ Manage Bookfunds ]">Budgets and Bookfunds</a></caption>
 			<tr>
 				<th>Budgets</th>
 				<th>From</th>

Index: lateorders.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/Attic/lateorders.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.2.2.1
diff -u -b -r1.1.2.2 -r1.1.2.2.2.1
--- lateorders.tmpl	5 Jan 2006 22:44:23 -0000	1.1.2.2
+++ lateorders.tmpl	1 Jan 2007 00:41:07 -0000	1.1.2.2.2.1
@@ -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>

Index: recieve.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/Attic/recieve.tmpl,v
retrieving revision 1.1.2.3.2.2
retrieving revision 1.1.2.3.2.3
diff -u -b -r1.1.2.3.2.2 -r1.1.2.3.2.3
--- recieve.tmpl	12 Dec 2006 17:19:31 -0000	1.1.2.3.2.2
+++ recieve.tmpl	1 Jan 2007 00:41:07 -0000	1.1.2.3.2.3
@@ -1,6 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Receipt Summary for : <!-- TMPL_VAR name="name" -->, Invoice <!-- TMPL_VAR name="invoice" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE name="masthead.inc" -->
-<!-- TMPL_INCLUDE name="intranet-nav.inc" -->
+<!-- TMPL_INCLUDE NAME="acqui-full-topmenu.inc" --><!-- TMPL_INCLUDE name="intranet-nav.inc" -->
 
 <div id="main">
 	<h1>Receipt parcel for <em><!-- TMPL_VAR NAME="name" --></em></h1>
@@ -85,18 +85,11 @@
 		<!-- TMPL_VAR NAME="countpending" --> lines
 		<!-- TMPL_LOOP NAME="loop_orders" -->
 			<tr bgcolor="<!-- TMPL_VAR NAME="color" -->">
-<<<<<<< recieve.tmpl
-				<td><!-- TMPL_VAR NAME="basketno" --></td>
-				<td><!-- TMPL_VAR NAME="isbn" --></td>
-				<td><a href="acquire.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&amp;biblio=<!-- TMPL_VAR NAME="biblionumber" -->&amp;invoice=<!-- TMPL_VAR NAME="invoice" -->&amp;gst=<!-- TMPL_VAR NAME="gst" -->&amp;freight=<!-- TMPL_VAR NAME="freight" -->&amp;supplierid=<!-- TMPL_VAR NAME="supplierid" -->&amp;datereceived=<!-- TMPL_VAR name="datereceived"-->&amp;catview=yes""><!-- TMPL_VAR NAME="title" --></a></td>
-				<td><!-- TMPL_VAR NAME="author" --></td>
-=======
 				<td class="number"><!-- TMPL_VAR NAME="basketno" --></td>
 				<td><!-- TMPL_VAR NAME="title" --></td>
 				<td class="number"><!-- TMPL_VAR NAME="quantity" --></td>
 				<td class="number"><!-- TMPL_VAR NAME="quantityrecieved" --></td>
                 <td><a href="acquire.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&amp;biblio=<!-- TMPL_VAR NAME="biblionumber" -->&amp;invoice=<!-- TMPL_VAR NAME="invoice" -->&amp;gst=<!-- TMPL_VAR NAME="gst" -->&amp;freight=<!-- TMPL_VAR NAME="freight" -->&amp;supplierid=<!-- TMPL_VAR NAME="supplierid" -->&amp;datereceived=<!-- TMPL_VAR name="datereceived"-->&catview=yes" class="button acquisition">Recieve</td>
->>>>>>> 1.1.2.7
 			</tr>
 		<!-- /TMPL_LOOP -->
 	</table>