[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui acquire.tmpl,1.7,1.7.2.1 basket.tmpl,1.7,1.7.2.1 newbiblio.tmpl,1.8,1.8.2.1 recieveorder.tmpl,1.6,1.6.2.1

Paul POULAIN tipaul at users.sourceforge.net
Tue Jan 13 18:29:33 CET 2004


Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui
In directory sc8-pr-cvs1:/tmp/cvs-serv1951/koha-tmpl/intranet-tmpl/default/en/acqui

Modified Files:
      Tag: rel_2_0
	acquire.tmpl basket.tmpl newbiblio.tmpl recieveorder.tmpl 
Log Message:
* minor html fixes
* adding publisher in acquisition process (& ordering basket by publisher)

Index: acquire.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C2 -r1.7 -r1.7.2.1
*** acquire.tmpl	9 Dec 2003 10:29:08 -0000	1.7
--- acquire.tmpl	13 Jan 2004 17:29:30 -0000	1.7.2.1
***************
*** 84,90 ****
  				<input type=hidden name=gst value="<!-- TMPL_VAR name="gst" -->">
  				<!-- TMPL_IF name="catview" -->
! 					<input type=image  name=submit src="/<!-- TMPL_VAR name="theme" -->/images/filesave.png" border=0 title="continue" alt="save" border=0 border=0>
  				<!-- TMPL_ELSE -->
! 					<a href=/cgi-bin/koha/acqui/newbiblio.pl?ordnum=<!-- TMPL_VAR name="ordernumber" -->&id=<!-- TMPL_VAR name="booksellerid" -->><img src="/<!-- TMPL_VAR name="theme" -->/images/fileopen.png" border=0 title="edit" alt="edit" border=0 border=0></a>
  				<!-- /TMPL_IF -->
  			</td>
--- 84,90 ----
  				<input type=hidden name=gst value="<!-- TMPL_VAR name="gst" -->">
  				<!-- TMPL_IF name="catview" -->
! 					<input type="submit" class="button" value="save">
  				<!-- TMPL_ELSE -->
! 					<a class="button" href=/cgi-bin/koha/acqui/newbiblio.pl?ordnum=<!-- TMPL_VAR name="ordernumber" -->&id=<!-- TMPL_VAR name="booksellerid" -->>Edit</a>
  				<!-- /TMPL_IF -->
  			</td>
***************
*** 93,97 ****
  	<table border=1 cellspacing=0 cellpadding=5 width="40%">
  		<tr valign=top bgcolor=#99cc33>
! 			<td background="/images/background-mem.gif" colspan=2><B>ACCOUNTING DETAILS</B></td>
  		</tr>
  		<TR VALIGN=TOP>
--- 93,97 ----
  	<table border=1 cellspacing=0 cellpadding=5 width="40%">
  		<tr valign=top bgcolor=#99cc33>
! 			<td background="<TMPL_VAR name="themelang">/images/background-mem.gif" colspan=2><B>ACCOUNTING DETAILS</B></td>
  		</tr>
  		<TR VALIGN=TOP>

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C2 -r1.7 -r1.7.2.1
*** basket.tmpl	9 Dec 2003 10:29:08 -0000	1.7
--- basket.tmpl	13 Jan 2004 17:29:30 -0000	1.7.2.1
***************
*** 8,22 ****
  	<tr valign=top bgcolor="#ffdf61">
  		<td width="5%"><b>Order</b></td>
  		<td width="10%"><b>Isbn</b></td>
  		<td width="30%"><b>Title</b></td>
  		<td width="20%"><b>Author</b></td>
! 		<td width="6%"><b>$ rrp</b></td>
! 		<td width="8%"><b>$est</b></td>
! 		<td width="8%"><b>Qty</b></td>
! 		<td width="8%"><b>Total</b></td>
  	</tr>
  	<!-- TMPL_LOOP name="books_loop" -->
  		<tr valign=top bgcolor="<!-- TMPL_VAR name="color" -->">
  			<td><!-- TMPL_VAR name="ordernumber" --></td>
  			<td><!-- TMPL_VAR name="isbn" --></td>
  			<td><a href="newbiblio.pl?ordnum=<!-- TMPL_VAR name="ordernumber" -->&id=<!-- TMPL_VAR name="booksellerid" -->&basket=<!-- TMPL_VAR name="basket" -->"><!-- TMPL_VAR name="title" --></a></td>
--- 8,24 ----
  	<tr valign=top bgcolor="#ffdf61">
  		<td width="5%"><b>Order</b></td>
+ 		<td width="10%"><b>Publisher</b></td>
  		<td width="10%"><b>Isbn</b></td>
  		<td width="30%"><b>Title</b></td>
  		<td width="20%"><b>Author</b></td>
! 		<td width="5%"><b>$ rrp</b></td>
! 		<td width="7%"><b>$est</b></td>
! 		<td width="7%"><b>Qty</b></td>
! 		<td width="7%"><b>Total</b></td>
  	</tr>
  	<!-- TMPL_LOOP name="books_loop" -->
  		<tr valign=top bgcolor="<!-- TMPL_VAR name="color" -->">
  			<td><!-- TMPL_VAR name="ordernumber" --></td>
+ 			<td><!-- TMPL_VAR name="publishercode" --></td>
  			<td><!-- TMPL_VAR name="isbn" --></td>
  			<td><a href="newbiblio.pl?ordnum=<!-- TMPL_VAR name="ordernumber" -->&id=<!-- TMPL_VAR name="booksellerid" -->&basket=<!-- TMPL_VAR name="basket" -->"><!-- TMPL_VAR name="title" --></a></td>

Index: newbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -r1.8 -r1.8.2.1
*** newbiblio.tmpl	9 Dec 2003 10:29:08 -0000	1.8
--- newbiblio.tmpl	13 Jan 2004 17:29:30 -0000	1.8.2.1
***************
*** 67,71 ****
  <!-- /TMPL_LOOP -->
  <!-- TMPL_IF name="orderexists" --><input type=hidden name=orderexists value=yes><!-- /TMPL_IF -->
! <a href="basket.pl?basket=<!-- TMPL_VAR name=basket -->"><img src="<!-- TMPL_VAR name=themelang -->/images/view-basket.gif" width=187 heigth=42 border=0 align=right alt="View Basket"></a>
  <h1><!-- TMPL_VAR name="ordnum" --> - Order Details </h1><br>
  Shopping Basket For: <!-- TMPL_VAR name="name" -->
--- 67,71 ----
  <!-- /TMPL_LOOP -->
  <!-- TMPL_IF name="orderexists" --><input type=hidden name=orderexists value=yes><!-- /TMPL_IF -->
! <a href="basket.pl?basket=<!-- TMPL_VAR name=basket -->" class="button">View Basket</a>
  <h1><!-- TMPL_VAR name="ordnum" --> - Order Details </h1><br>
  Shopping Basket For: <!-- TMPL_VAR name="name" -->
***************
*** 74,78 ****
  <TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left width="40%">
  	<tr valign=top bgcolor=#99cc33>
! 		<td background="/images/background-mem.gif" colspan=2><B>CATALOGUE DETAILS</B></td>
  	</tr>
  	<TR VALIGN=TOP>
--- 74,78 ----
  <TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left width="40%">
  	<tr valign=top bgcolor=#99cc33>
! 		<td background="<TMPL_VAR name="themelang">/images/background-mem.gif" colspan=2><B>CATALOGUE DETAILS</B></td>
  	</tr>
  	<TR VALIGN=TOP>
***************
*** 85,90 ****
  	</tr>
  	<TR VALIGN=TOP>
  	<TD>Copyright Date</td>
! 	<td><input type=text size=20 name=copyright value="<!-- TMPL_VAR name="copyrightdate" -->">
  	</td>
  	</tr>
--- 85,94 ----
  	</tr>
  	<TR VALIGN=TOP>
+ 		<TD>Publisher</td>
+ 		<td><input type=text size=30 name=publishercode value="<!-- TMPL_VAR name="publishercode" -->" ></td>
+ 	</tr>
+ 	<TR VALIGN=TOP>
  	<TD>Copyright Date</td>
! 	<td><input type=text size=20 name=copyrightdate value="<!-- TMPL_VAR name="copyrightdate" -->">
  	</td>
  	</tr>
***************
*** 108,112 ****
  <img src="<!-- TMPL_VAR name="themelang" -->/images/holder.gif" width=32 height=250 align=left>
  <table border=1 cellspacing=0 cellpadding=5 width="40%">
! 	<tr valign=top bgcolor=#99cc33><td background="/images/background-mem.gif" colspan=2><B>ACCOUNTING DETAILS</B></td></tr>
  	<TR VALIGN=TOP>
  		<TD>Quantity</td>
--- 112,116 ----
  <img src="<!-- TMPL_VAR name="themelang" -->/images/holder.gif" width=32 height=250 align=left>
  <table border=1 cellspacing=0 cellpadding=5 width="40%">
! 	<tr valign=top bgcolor=#99cc33><td background="<TMPL_VAR name="themelang">/images/background-mem.gif" colspan=2><B>ACCOUNTING DETAILS</B></td></tr>
  	<TR VALIGN=TOP>
  		<TD>Quantity</td>
***************
*** 155,159 ****
  </center>
  <table>
! <tr><td bgcolor=#cccc99  background="/images/background-mem.gif"><B>HELP</B><br>
  <UL>
  <LI><B>Bold</B> fields must be filled in to create a new bibilo and item.<p>
--- 159,163 ----
  </center>
  <table>
! <tr><td bgcolor=#cccc99  background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>HELP</B><br>
  <UL>
  <LI><B>Bold</B> fields must be filled in to create a new bibilo and item.<p>

Index: recieveorder.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/recieveorder.tmpl,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** recieveorder.tmpl	9 Dec 2003 10:29:08 -0000	1.6
--- recieveorder.tmpl	13 Jan 2004 17:29:30 -0000	1.6.2.1
***************
*** 25,29 ****
  </tr>
  <TR VALIGN=TOP>
! <td colspan=2 align="center"><input type=image  name=submit src="/<!-- TMPL_VAR name="theme" -->/images/2rightarrow.png" border=0 title="continue" alt="save" border=0>
  </td>
  </tr>
--- 25,29 ----
  </tr>
  <TR VALIGN=TOP>
! <td colspan=2 align="center"><input type="submit" class="button" value="save">
  </td>
  </tr>





More information about the Koha-cvs mailing list