[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/marcimport AcceptItemCopy.tmpl,1.3,1.4 marcimportdetail.tmpl,1.3,1.4

[Paul POULAIN]

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/marcimport
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28092/koha-tmpl/intranet-tmpl/default/en/marcimport

Modified Files:
	AcceptItemCopy.tmpl marcimportdetail.tmpl 
Log Message:
synch'ing 2.0.0 branch (RC4 tag) and head

Index: AcceptItemCopy.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/marcimport/AcceptItemCopy.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** AcceptItemCopy.tmpl	9 Dec 2003 10:29:03 -0000	1.3
--- AcceptItemCopy.tmpl	11 Feb 2004 09:02:55 -0000	1.4
***************
*** 2,6 ****
  <center>
  <!-- TMPL_IF name="BARCODE_EXISTS" -->
! 	<font color=red>Barcode '<!-- TMPL_VAR name="barcode" -->' has already been assigned.</font><p>
  <!-- /TMPL_IF -->
  <!-- TMPL_IF name="ITEM_ERROR" -->
--- 2,6 ----
  <center>
  <!-- TMPL_IF name="BARCODE_EXISTS" -->
! 	<font color=red>Barcode <b><!-- TMPL_VAR name="barcode" --></b> has already been assigned.</font><p>
  <!-- /TMPL_IF -->
  <!-- TMPL_IF name="ITEM_ERROR" -->

Index: marcimportdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** marcimportdetail.tmpl	9 Dec 2003 10:29:03 -0000	1.3
--- marcimportdetail.tmpl	11 Feb 2004 09:02:56 -0000	1.4
***************
*** 25,29 ****
  	<tr bgcolor="#ddaaaa"><td>Subject</td><td><input type="text" name="subject" value="<!-- TMPL_VAR NAME="subject" -->" size=40 maxlenght=255></td></tr>
  	<tr bgcolor="#dddddd"><td>Notes</td><td><input type="text" name="notes" value="<!-- TMPL_VAR NAME="notes" -->" size=40 maxlenght=255></td></tr>
! 	<tr bgcolor="#ddaaaa"><td>Item Type</td><td><select name=itemtype>$itemtypeselect</select></td></tr>
  	<tr bgcolor="#dddddd"><td>ISBN</td><td><input type="text" name="isbn" value="<!-- TMPL_VAR NAME="isbn" -->" size=40 maxlenght=40></td></tr>
  	<tr bgcolor="#ddaaaa"><td>ISSN</td><td><input type="text" name="issn" value="<!-- TMPL_VAR NAME="issn" -->" size=40 maxlenght=40></td></tr>
--- 25,29 ----
  	<tr bgcolor="#ddaaaa"><td>Subject</td><td><input type="text" name="subject" value="<!-- TMPL_VAR NAME="subject" -->" size=40 maxlenght=255></td></tr>
  	<tr bgcolor="#dddddd"><td>Notes</td><td><input type="text" name="notes" value="<!-- TMPL_VAR NAME="notes" -->" size=40 maxlenght=255></td></tr>
! 	<tr bgcolor="#ddaaaa"><td>Item type</td><td><select name=itemtype>$itemtypeselect</select></td></tr>
  	<tr bgcolor="#dddddd"><td>ISBN</td><td><input type="text" name="isbn" value="<!-- TMPL_VAR NAME="isbn" -->" size=40 maxlenght=40></td></tr>
  	<tr bgcolor="#ddaaaa"><td>ISSN</td><td><input type="text" name="issn" value="<!-- TMPL_VAR NAME="issn" -->" size=40 maxlenght=40></td></tr>