[Koha-cvs] koha/koha-tmpl/intranet-tmpl/default/en overdue... [dev_week]

Joshua Ferraro jmf at kados.org
Tue Jul 11 16:22:13 CEST 2006


CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	Joshua Ferraro <kados>	06/07/11 14:22:13

Modified files:
	koha-tmpl/intranet-tmpl/default/en: overdue.tmpl 
	koha-tmpl/intranet-tmpl/default/en/acqui: suggestion-select.tmpl 
	                                          supplier.tmpl 
	koha-tmpl/intranet-tmpl/default/en/acqui.simple: addbiblio.tmpl 
	koha-tmpl/intranet-tmpl/default/en/authorities: 
	                                                blinddetail-biblio-search.tmpl 
	koha-tmpl/intranet-tmpl/default/en/bull: statecollection.tmpl 
	koha-tmpl/intranet-tmpl/default/en/help: bull-home.tmpl 
	koha-tmpl/intranet-tmpl/default/en/help/admin: 
	                                               biblio_framework.tmpl 
	                                               marc_subfields_structure.tmpl 
	koha-tmpl/intranet-tmpl/default/en/help/bull: bull-home.tmpl 
	koha-tmpl/intranet-tmpl/default/en/includes: marc-editor.css 
	koha-tmpl/intranet-tmpl/default/en/members: memberentry.tmpl 
	koha-tmpl/intranet-tmpl/default/en/parameters: 
	                                               systempreferences.tmpl 
	koha-tmpl/intranet-tmpl/default/en/search.marc: result.tmpl 
	koha-tmpl/intranet-tmpl/default/en/value_builder: 
	                                                  unimarc_field_4XX.tmpl 
	koha-tmpl/intranet-tmpl/default/en/z3950: searchresult.tmpl 

Log message:
	sync with rel_2_2

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/overdue.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.6.2.3&r2=1.6.2.3.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.4.2.2&r2=1.4.2.2.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.12.2.3&r2=1.12.2.3.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.33.2.19&r2=1.33.2.19.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/authorities/blinddetail-biblio-search.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.6.2.2&r2=1.6.2.2.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.4.2.8&r2=1.4.2.8.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/help/bull-home.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1&r2=1.1.4.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/help/admin/biblio_framework.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1&r2=1.1.4.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/help/admin/marc_subfields_structure.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/default/en/help/bull/bull-home.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1&r2=1.1.4.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/includes/marc-editor.css?cvsroot=koha&only_with_tag=dev_week&r1=1.5.2.2&r2=1.5.2.2.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.33.2.7&r2=1.33.2.7.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.29.2.4&r2=1.29.2.4.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.21.2.6&r2=1.21.2.6.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_4XX.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.3.2.3&r2=1.3.2.3.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.4.2.2&r2=1.4.2.2.2.1

Patches:
Index: overdue.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/en/overdue.tmpl,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.3.2.1
diff -u -b -r1.6.2.3 -r1.6.2.3.2.1
--- overdue.tmpl	4 Jan 2006 09:29:34 -0000	1.6.2.3
+++ overdue.tmpl	11 Jul 2006 14:22:12 -0000	1.6.2.3.2.1
@@ -36,21 +36,21 @@
 		<th class="reports">Due Date </th>
 		<th class="reports">Patron </th>
 		<th class="reports">Phone</th>
-		<th class="reports">Title</th>
-		<th class="reports">Author</th>
+		<th class="reports">Title / Author</th>
 	</tr>
 	
 	<!-- TMPL_LOOP NAME="overdueloop" -->
 		<tr>
 			<td><!-- TMPL_VAR NAME="duedate" --></td>
 			<!-- TMPL_IF NAME="email" -->
-			<td><a href="mailto:<!-- TMPL_VAR NAME="email" -->?subject=Overdue: <!-- TMPL_VAR NAME="title" -->"><!-- TMPL_VAR NAME="name" --></a></td>
+			<td><a href="members/moremember.pl?bornum=<!-- TMPL_VAR name="bornum" -->"><!-- TMPL_VAR NAME="name" --></a>
+			<a href="mailto:<!-- TMPL_VAR NAME="email" -->?subject=Overdue: <!-- TMPL_VAR NAME="title" -->"><i>(email)</i></a>
+			</td>
 			<!-- TMPL_ELSE -->
 			<td><!-- TMPL_VAR NAME="name" --></td>
 			<!-- /TMPL_IF -->
 			<td><!-- TMPL_VAR NAME="phone" --></td>
-			<td><!-- TMPL_VAR NAME="title" --></td>
-			<td><!-- TMPL_VAR NAME="author" --></td>
+			<td><p><b><!-- TMPL_VAR NAME="title" --></b>, <!-- TMPL_VAR NAME="author" --></p></td>
 		</tr>
 	<!-- /TMPL_LOOP -->
 	</table>

Index: acqui/suggestion-select.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.2.2.1
diff -u -b -r1.4.2.2 -r1.4.2.2.2.1
--- acqui/suggestion-select.tmpl	22 Aug 2005 19:30:04 -0000	1.4.2.2
+++ acqui/suggestion-select.tmpl	11 Jul 2006 14:22:12 -0000	1.4.2.2.2.1
@@ -6,6 +6,7 @@
 			<th class="acquisition">Suggestion</th>
 			<th class="acquisition">Suggested by</th>
 			<th class="acquisition">Accepted by</th>
+			<th class="acquisition">Duplicate</th>
 			<th class="acquisition">&nbsp;</th>
 		</tr>
 		<tr>
@@ -23,6 +24,9 @@
 					&nbsp;
 				</th>
 				<th class="acquisition">
+					&nbsp;
+				</th>
+				<th class="acquisition">
 					<input type="submit" class="button acquisition" value="Set Filter">
 				</th>
 			</form>
@@ -46,6 +50,12 @@
 				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
 					<!-- TMPL_VAR NAME="surnamemanagedby" --><!-- TMPL_IF name="firstnamemanagedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR NAME="firstnamemanagedby" -->
 				</td>
+				<td>
+					<!-- TMPL_IF name="duplicateBiblionumber" -->
+						<a href=# onClick="javascript:window.open('/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR name="duplicateBiblionumber" -->')" class="button acquisition">Duplicate suspected</a>
+						<a href="/cgi-bin/koha/acqui/suggestion-select.pl?booksellerid=<!-- TMPL_VAR name="supplierid" -->&basketno=<!-- TMPL_VAR name="basketno"-->&op=connectDuplicate&duplicateNumber=<!-- TMPL_VAR name="duplicateBiblionumber" -->&suggestionid=<!-- TMPL_VAR name="suggestionid" -->" class="button acquisition">Connect</a>
+					<!-- /TMPL_IF -->
+				</td>
 				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
 					<!-- TMPL_IF name="biblionumber" -->
 						<a href="newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="supplierid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;suggestionid=<!-- TMPL_VAR NAME="suggestionid" -->&biblio=<!-- TMPL_VAR name="biblionumber" -->" class="button acquisition">Order</a>

Index: acqui/supplier.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl,v
retrieving revision 1.12.2.3
retrieving revision 1.12.2.3.2.1
diff -u -b -r1.12.2.3 -r1.12.2.3.2.1
--- acqui/supplier.tmpl	4 Apr 2006 13:56:45 -0000	1.12.2.3
+++ acqui/supplier.tmpl	11 Jul 2006 14:22:12 -0000	1.12.2.3.2.1
@@ -64,7 +64,7 @@
 		</p>
 		<p>
 			<label>Notes</label>
-			<textarea name="notes" cols="40" rows="4"><!-- TMPL_VAR NAME="contnotes" --></textarea>
+			<textarea name="contact_notes" cols="40" rows="4"><!-- TMPL_VAR NAME="contnotes" --></textarea>
 		</p>
 	</div>
 	<div id="bloc25">
@@ -120,6 +120,10 @@
 			<label class="label100">Discount</label>
 			<input type="text" size="3" name="discount" value="<!-- TMPL_VAR NAME="discount" -->"> %
 		</p>
+		<p>
+			<label class="label100">Notes</label>
+			<textarea cols="40" rows="4" name="notes" ><!-- TMPL_VAR NAME="notes" --></textarea>
+		</p>
 	<br/>
 	<br/><input type="image"  name="submit" src="/<!-- TMPL_VAR NAME="theme" -->/images/filesave.png" border="0" title="save" alt="save" class="button acquisition">
 	</form>
@@ -231,6 +235,10 @@
 			<label class="label100">Discount</label>
 			<!-- TMPL_VAR NAME="discount" --> %
 		</p>
+		<p>
+			<label class="label100">Notes</label>
+			<!-- TMPL_VAR NAME="notes" -->
+		</p>
 	<br/>
 	<br/>
 	</div>

Index: acqui.simple/addbiblio.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl,v
retrieving revision 1.33.2.19
retrieving revision 1.33.2.19.2.1
diff -u -b -r1.33.2.19 -r1.33.2.19.2.1
--- acqui.simple/addbiblio.tmpl	7 Apr 2006 11:39:43 -0000	1.33.2.19
+++ acqui.simple/addbiblio.tmpl	11 Jul 2006 14:22:12 -0000	1.33.2.19.2.1
@@ -1,632 +1,85 @@
 <!-- TMPL_INCLUDE NAME="marc-top.inc" -->
+	<form method="post" name="f" id="f" action="addbiblio.pl">
+<h1 class="catalogue"><!-- TMPL_IF NAME="oldbiblionumtagfield" -->Edit MARC Record Number <!-- TMPL_VAR name="oldbiblionumber" --><!-- TMPL_ELSE -->Add MARC Record<!-- /TMPL_IF --> With Framework : <!--TMPL_VAR Name="framework" --></h1>
+
 <div class="tabbed">
-	<form method="post" name="f">
-	<h1 class="catalogue">Biblionumber : <!-- TMPL_VAR NAME="oldbiblionumber" -->     With Framework :<!--TMPL_VAR Name="framework" --></b></h1>
-	<p>
-		<input type="hidden" name="op" value="addbiblio">
-		<input type="hidden" name="addfield_field">
-		<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
-		<input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="oldbiblionumber" -->">
+		<input type="hidden" name="op" value="addbiblio" />
+		<input type="hidden" name="addfield_field" />
+		<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
+		<input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="oldbiblionumber" -->" />
 		<!-- TMPL_IF name="bibid" -->
-			<input type="button" value="Save" onclick="Check(this.form)" accesskey="w" class="button catalogue">
+			<input type="button" value="Save Bibliographic Record and go to Items" onclick="Check(this.form);" accesskey="w" class="button catalogue" />
 		<!-- TMPL_ELSE -->
-			<input type="button" value="Add biblio" onclick="Check(this.form)" accesskey="w" class="button catalogue">
+			<input type="button" value="Add Bibliographic Record and go to Items" onclick="Check(this.form);" accesskey="w" class="button catalogue" />
 		<!-- /TMPL_IF -->
-		<a href="javascript:PopupZ3950()" class="button catalogue">z3950 search</a>
-	</p>
-</div>
+	<input type="button" value="z39.50 Search" class="button catalogue" onclick="PopupZ3950(); return false;" / ></div>
+
 
 	<div class="tabs">
-		<!-- TMPL_IF name="0XX" -->
-		<a href="javascript:active(0)" id="link0">0</a>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="1XX" -->
-		<a href="javascript:active(1)" id="link1">1</a>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="2XX" -->
-		<a href="javascript:active(2)" id="link2">2</a>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="3XX" -->
-		<a href="javascript:active(3)" id="link3">3</a>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="4XX" -->
-		<a href="javascript:active(4)" id="link4">4</a>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="5XX" -->
-		<a href="javascript:active(5)" id="link5">5</a>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="6XX" -->
-		<a href="javascript:active(6)" id="link6">6</a>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="7XX" -->
-		<a href="javascript:active(7)" id="link7">7</a>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="8XX" -->
-		<a href="javascript:active(8)" id="link8">8</a>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="9XX" -->
-			<a href="javascript:active(9)" id="link9">9</a>
-		<!-- /TMPL_IF -->
+        <!-- TMPL_LOOP name="BIG_LOOP" -->
+            <a href="#" onclick="active(<!-- TMPL_VAR name="number"-->); return false;" id="link<!-- TMPL_VAR name="number"-->"><!-- TMPL_VAR name="number"--></a>
+        <!--  /TMPL_LOOP -->
 	</div>
 	
-	<div name="0XX" id="0XX" class="tab" style="visibility:visible">
+<! -- RESET PAGINATION -->
+<!-- TMPL_LOOP name="BIG_LOOP" -->
+<!-- hide every tab except the 1st -->
+<!-- TMPL_IF name="number" -->
+    <div name="<!-- TMPL_VAR name="number" -->XX" id="<!-- TMPL_VAR name="number" -->XX" class="tab" style="visibility:hidden">
+<!-- TMPL_ELSE -->
+    <div name="<!-- TMPL_VAR name="number" -->XX" id="<!-- TMPL_VAR name="number" -->XX" class="tab" style="visibility:visible">
+<!-- /TMPL_IF -->
+<!-- TMPL_UNLESS name="number" -->
+    <!-- show duplicate warning on tab 0 only -->
 		<!-- TMPL_IF name="duplicatebiblionumber" -->
-			<div class="problem">
-				<p>Duplicate suspected with <a href='javascript:openWindow("../MARCdetail.pl?bib=<!-- TMPL_VAR name="duplicatebiblionumber" -->&popup=1", "Duplicate biblio")' class="button catalogue"><!-- TMPL_VAR name="duplicatetitle" --></a></p>
+                    <div class="error">
+                        <p>Is this a duplicate of <a href="../MARCdetail.pl?bib=<!-- TMPL_VAR name="duplicatebiblionumber" -->" onclick="openWindow('../MARCdetail.pl?bib=<!-- TMPL_VAR name="duplicatebiblionumber" -->&popup=1', 'Duplicate biblio'; return false;)"><!-- TMPL_VAR name="duplicatetitle" --></a>?</p>
 				<p>You must either :</p>
 				<ul>
-					<p><input type="checkbox" value=1 name="confirm_not_duplicate">confirm it's not a duplicate (and click on Add biblio again)</p>
-					<p>Go to <a href="additem.pl?biblionumber=<!-- TMPL_VAR name="duplicatebibid" -->" class="button catalogue">edit items</a> from this duplicate biblio</p>
+                            <li>If it <em>is</em> a duplicate, <a href="additem.pl?biblionumber=<!-- TMPL_VAR name="duplicatebibid" -->">Edit Items</a> of the existing record.</li>
+                            <li>If not, click to <input type="hidden" value="0" id="confirm_not_duplicate" name="confirm_not_duplicate" /> <a href="#" onclick="confirmnotdup(); return false;">Confirm it's not a duplicate</a></li>
 				</ul>
 			</div>
 		<!-- /TMPL_IF -->
-	<!-- TMPL_LOOP NAME="0XX" -->
-		<div style=";" id="tag<!-- TMPL_VAR name="tag"-->">
-		<!-- TMPL_IF name="tag" -->
-		<p class="MARCtag">
-			<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR NAME="tag" -->">
-			<!-- TMPL_UNLESS name="hide_marc" -->
-				<a title="<!-- TMPL_VAR NAME="tag_lib" -->"><!-- TMPL_VAR NAME="tag" --></a>
-				<input tabindex="1" onblur="this.style.backgroundColor='#ffffff';" onfocus="this.style.backgroundColor='#ffff00;'" type="text" name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->"> -
-			<!-- TMPL_ELSE -->
-				<input tabindex="1" type="hidden" name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->">
-			<!-- /TMPL_UNLESS -->
-			<!-- TMPL_UNLESS NAME="advancedMARCEditor" --><!-- TMPL_VAR NAME="tag_lib" --><!-- /TMPL_UNLESS -->
-			<!-- TMPL_IF name="repeatable" --><a href="javascript:cloneTag('tag<!-- TMPL_VAR NAME="tag" -->')">+</a><!-- /TMPL_IF -->
-		</p>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_LOOP NAME="subfield_loop" -->
-			<!-- TMPL_IF NAME="visibility" -->
-				<a tabindex="1" style="color: grey; font-size: 80%; cursor: crosshair;" id="label<!-- TMPL_VAR name="index" -->" onclick="unHideSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->','label<!-- TMPL_VAR name="index" -->')">
-					<!-- TMPL_VAR NAME="subfield" -->
-				</a>
-			<!-- /TMPL_IF -->
-			<div style="<!-- TMPL_VAR NAME='visibility' -->;" id="subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='index' -->" name="subfield"><p>
-				<!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
-					<label class="labelsubfield">
-				<!-- /TMPL_UNLESS -->
-				<!-- TMPL_UNLESS name="hide_marc" -->
-					<img src="<!-- TMPL_VAR NAME="themelang" -->/images/up.png" style="cursor:crosshair" onclick="upSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')"/>
-					<input title="<!-- TMPL_VAR NAME="marc_lib_plain" -->" style=" border:0;" type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1" class="flat" DISABLE READONLY tabindex=-1 />
-				<!-- TMPL_ELSE -->
-					<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->"/>
-				<!-- /TMPL_UNLESS -->
-				<!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
-					<!-- TMPL_IF name="mandatory" -->
-						<b>
-					<!-- /TMPL_IF -->
-					<!-- TMPL_VAR NAME="marc_lib" -->
-					<!-- TMPL_IF name="mandatory" -->
-						*</b>
-					<!-- /TMPL_IF -->
-					</label>
-				<!-- /TMPL_UNLESS -->
-				<!-- TMPL_VAR NAME="marc_value" -->
-				<!-- TMPL_IF NAME="repeatable" -->
-					<a style="cursor: crosshair; color: grey; font-size: 80%;" onclick="cloneSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')">+</a>
-				<!-- /TMPL_IF -->
-				<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->"/>
-				<input type="hidden" name="subfieldYYY" value="<!-- TMPL_VAR NAME="subfield" -->" size="2" maxlength="1"/>
-				<input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->"/>
-				<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->"/>
-				<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->"/>
-				</p>
-			</div>
-		<!-- /TMPL_LOOP -->
-		</div>
-	<!-- /TMPL_LOOP -->
-	</div>
-	
-	<div name="1XX" id="1XX" class="tab">
-		<!-- TMPL_LOOP NAME="1XX" -->
-		<div style=";" id="tag<!-- TMPL_VAR name="tag"-->">
-		<!-- TMPL_IF name="tag" -->
-		<p class="MARCtag">
-			<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR NAME="tag" -->">
-			<!-- TMPL_UNLESS name="hide_marc" -->
-				<a title="<!-- TMPL_VAR NAME="tag_lib" -->"><!-- TMPL_VAR NAME="tag" --></a>
-				<input tabindex="1" onblur="this.style.backgroundColor='#ffffff';" onfocus="this.style.backgroundColor='#ffff00;'" type="text" name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->"> -
-			<!-- TMPL_ELSE -->
-				<input tabindex="1" type="hidden" name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->">
-			<!-- /TMPL_UNLESS -->
-			<!-- TMPL_UNLESS NAME="advancedMARCEditor" --><!-- TMPL_VAR NAME="tag_lib" --><!-- /TMPL_UNLESS -->
-			<!-- TMPL_IF name="repeatable" --><a href="javascript:cloneTag('tag<!-- TMPL_VAR NAME="tag" -->')">+</a><!-- /TMPL_IF -->
-		</p>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_LOOP NAME="subfield_loop" -->
-			<!-- TMPL_IF NAME="visibility" -->
-				<a tabindex="1" style="color: grey; font-size: 80%; cursor: crosshair;" id="label<!-- TMPL_VAR name="index" -->" onclick="unHideSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->','label<!-- TMPL_VAR name="index" -->')">
-					<!-- TMPL_VAR NAME="subfield" -->
-				</a>
-			<!-- /TMPL_IF -->
-			<div style="<!-- TMPL_VAR NAME='visibility' -->;" id="subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='index' -->" name="subfield"><p>
-				<!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
-					<label class="labelsubfield">
-				<!-- /TMPL_UNLESS -->
-				<!-- TMPL_UNLESS name="hide_marc" -->
-					<img src="<!-- TMPL_VAR NAME="themelang" -->/images/up.png" style="cursor:crosshair" onclick="upSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')"/>
-					<input title="<!-- TMPL_VAR NAME="marc_lib_plain" -->" style=" border:0;" type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1" class="flat" DISABLE READONLY tabindex=-1 />
-				<!-- TMPL_ELSE -->
-					<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->"/>
-				<!-- /TMPL_UNLESS -->
-				<!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
-					<!-- TMPL_IF name="mandatory" -->
-						<b>
-					<!-- /TMPL_IF -->
-					<!-- TMPL_VAR NAME="marc_lib" -->
-					<!-- TMPL_IF name="mandatory" -->
-						*</b>
-					<!-- /TMPL_IF -->
-					</label>
-				<!-- /TMPL_UNLESS -->
-				<!-- TMPL_VAR NAME="marc_value" -->
-				<!-- TMPL_IF NAME="repeatable" -->
-					<a style="cursor: crosshair; color: grey; font-size: 80%;" onclick="cloneSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')">+</a>
-				<!-- /TMPL_IF -->
-				<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->"/>
-				<input type="hidden" name="subfieldYYY" value="<!-- TMPL_VAR NAME="subfield" -->" size="2" maxlength="1"/>
-				<input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->"/>
-				<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->"/>
-				<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->"/>
-				</p>
-			</div>
-		<!-- /TMPL_LOOP -->
-		</div>
-	<!-- /TMPL_LOOP -->
-	</div>
-	
-	<div name="2XX" id="2XX" class="tab">
-		<!-- TMPL_LOOP NAME="2XX" -->
-		<div style=";" id="tag<!-- TMPL_VAR name="tag"-->">
-		<!-- TMPL_IF name="tag" -->
-		<p class="MARCtag">
-			<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR NAME="tag" -->">
-			<!-- TMPL_UNLESS name="hide_marc" -->
-				<a title="<!-- TMPL_VAR NAME="tag_lib" -->"><!-- TMPL_VAR NAME="tag" --></a>
-				<input tabindex="1" onblur="this.style.backgroundColor='#ffffff';" onfocus="this.style.backgroundColor='#ffff00;'" type="text" name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->"> -
-			<!-- TMPL_ELSE -->
-				<input tabindex="1" type="hidden" name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->">
-			<!-- /TMPL_UNLESS -->
-			<!-- TMPL_UNLESS NAME="advancedMARCEditor" --><!-- TMPL_VAR NAME="tag_lib" --><!-- /TMPL_UNLESS -->
-			<!-- TMPL_IF name="repeatable" --><a href="javascript:cloneTag('tag<!-- TMPL_VAR NAME="tag" -->')">+</a><!-- /TMPL_IF -->
-		</p>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_LOOP NAME="subfield_loop" -->
-			<!-- TMPL_IF NAME="visibility" -->
-				<a tabindex="1" style="color: grey; font-size: 80%; cursor: crosshair;" id="label<!-- TMPL_VAR name="index" -->" onclick="unHideSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->','label<!-- TMPL_VAR name="index" -->')">
-					<!-- TMPL_VAR NAME="subfield" -->
-				</a>
-			<!-- /TMPL_IF -->
-			<div style="<!-- TMPL_VAR NAME='visibility' -->;" id="subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='index' -->" name="subfield"><p>
-				<!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
-					<label class="labelsubfield">
-				<!-- /TMPL_UNLESS -->
-				<!-- TMPL_UNLESS name="hide_marc" -->
-					<img src="<!-- TMPL_VAR NAME="themelang" -->/images/up.png" style="cursor:crosshair" onclick="upSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')"/>
-					<input title="<!-- TMPL_VAR NAME="marc_lib_plain" -->" style=" border:0;" type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1" class="flat" DISABLE READONLY tabindex=-1 />
-				<!-- TMPL_ELSE -->
-					<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->"/>
-				<!-- /TMPL_UNLESS -->
-				<!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
-					<!-- TMPL_IF name="mandatory" -->
-						<b>
-					<!-- /TMPL_IF -->
-					<!-- TMPL_VAR NAME="marc_lib" -->
-					<!-- TMPL_IF name="mandatory" -->
-						*</b>
-					<!-- /TMPL_IF -->
-					</label>
-				<!-- /TMPL_UNLESS -->
-				<!-- TMPL_VAR NAME="marc_value" -->
-				<!-- TMPL_IF NAME="repeatable" -->
-					<a style="cursor: crosshair; color: grey; font-size: 80%;" onclick="cloneSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')">+</a>
-				<!-- /TMPL_IF -->
-				<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->"/>
-				<input type="hidden" name="subfieldYYY" value="<!-- TMPL_VAR NAME="subfield" -->" size="2" maxlength="1"/>
-				<input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->"/>
-				<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->"/>
-				<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->"/>
-				</p>
-			</div>
-		<!-- /TMPL_LOOP -->
-		</div>
-	<!-- /TMPL_LOOP -->
-	</div>
-	
-	<div name="3XX" id="3XX" class="tab">
-		<!-- TMPL_LOOP NAME="3XX" -->
-		<div style=";" id="tag<!-- TMPL_VAR name="tag"-->">
-		<!-- TMPL_IF name="tag" -->
-		<p class="MARCtag">
-			<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR NAME="tag" -->">
-			<!-- TMPL_UNLESS name="hide_marc" -->
-				<a title="<!-- TMPL_VAR NAME="tag_lib" -->"><!-- TMPL_VAR NAME="tag" --></a>
-				<input tabindex="1" onblur="this.style.backgroundColor='#ffffff';" onfocus="this.style.backgroundColor='#ffff00;'" type="text" name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->"> -
-			<!-- TMPL_ELSE -->
-				<input tabindex="1" type="hidden" name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->">
-			<!-- /TMPL_UNLESS -->
-			<!-- TMPL_UNLESS NAME="advancedMARCEditor" --><!-- TMPL_VAR NAME="tag_lib" --><!-- /TMPL_UNLESS -->
-			<!-- TMPL_IF name="repeatable" --><a href="javascript:cloneTag('tag<!-- TMPL_VAR NAME="tag" -->')">+</a><!-- /TMPL_IF -->
-		</p>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_LOOP NAME="subfield_loop" -->
-			<!-- TMPL_IF NAME="visibility" -->
-				<a tabindex="1" style="color: grey; font-size: 80%; cursor: crosshair;" id="label<!-- TMPL_VAR name="index" -->" onclick="unHideSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->','label<!-- TMPL_VAR name="index" -->')">
-					<!-- TMPL_VAR NAME="subfield" -->
-				</a>
-			<!-- /TMPL_IF -->
-			<div style="<!-- TMPL_VAR NAME='visibility' -->;" id="subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='index' -->" name="subfield"><p>
-				<!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
-					<label class="labelsubfield">
-				<!-- /TMPL_UNLESS -->
-				<!-- TMPL_UNLESS name="hide_marc" -->
-					<img src="<!-- TMPL_VAR NAME="themelang" -->/images/up.png" style="cursor:crosshair" onclick="upSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')"/>
-					<input title="<!-- TMPL_VAR NAME="marc_lib_plain" -->" style=" border:0;" type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1" class="flat" DISABLE READONLY tabindex=-1 />
-				<!-- TMPL_ELSE -->
-					<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->"/>
-				<!-- /TMPL_UNLESS -->
-				<!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
-					<!-- TMPL_IF name="mandatory" -->
-						<b>
-					<!-- /TMPL_IF -->
-					<!-- TMPL_VAR NAME="marc_lib" -->
-					<!-- TMPL_IF name="mandatory" -->
-						*</b>
-					<!-- /TMPL_IF -->
-					</label>
-				<!-- /TMPL_UNLESS -->
-				<!-- TMPL_VAR NAME="marc_value" -->
-				<!-- TMPL_IF NAME="repeatable" -->
-					<a style="cursor: crosshair; color: grey; font-size: 80%;" onclick="cloneSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')">+</a>
-				<!-- /TMPL_IF -->
-				<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->"/>
-				<input type="hidden" name="subfieldYYY" value="<!-- TMPL_VAR NAME="subfield" -->" size="2" maxlength="1"/>
-				<input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->"/>
-				<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->"/>
-				<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->"/>
-				</p>
-			</div>
-		<!-- /TMPL_LOOP -->
-		</div>
-	<!-- /TMPL_LOOP -->
-
-	</div>
-	
-	<div name="4XX" id="4XX" class="tab">
-		<!-- TMPL_LOOP NAME="4XX" -->
-		<div style=";" id="tag<!-- TMPL_VAR name="tag"-->">
-		<!-- TMPL_IF name="tag" -->
-		<p class="MARCtag">
-			<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR NAME="tag" -->">
-			<!-- TMPL_UNLESS name="hide_marc" -->
-				<a title="<!-- TMPL_VAR NAME="tag_lib" -->"><!-- TMPL_VAR NAME="tag" --></a>
-				<input tabindex="1" onblur="this.style.backgroundColor='#ffffff';" onfocus="this.style.backgroundColor='#ffff00;'" type="text" name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->"> -
-			<!-- TMPL_ELSE -->
-				<input tabindex="1" type="hidden" name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->">
-			<!-- /TMPL_UNLESS -->
-			<!-- TMPL_UNLESS NAME="advancedMARCEditor" --><!-- TMPL_VAR NAME="tag_lib" --><!-- /TMPL_UNLESS -->
-			<!-- TMPL_IF name="repeatable" --><a href="javascript:cloneTag('tag<!-- TMPL_VAR NAME="tag" -->')">+</a><!-- /TMPL_IF -->
-		</p>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_LOOP NAME="subfield_loop" -->
-			<!-- TMPL_IF NAME="visibility" -->
-				<a tabindex="1" style="color: grey; font-size: 80%; cursor: crosshair;" id="label<!-- TMPL_VAR name="index" -->" onclick="unHideSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->','label<!-- TMPL_VAR name="index" -->')">
-					<!-- TMPL_VAR NAME="subfield" -->
-				</a>
-			<!-- /TMPL_IF -->
-			<div style="<!-- TMPL_VAR NAME='visibility' -->;" id="subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='index' -->" name="subfield"><p>
-				<!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
-					<label class="labelsubfield">
-				<!-- /TMPL_UNLESS -->
-				<!-- TMPL_UNLESS name="hide_marc" -->
-					<img src="<!-- TMPL_VAR NAME="themelang" -->/images/up.png" style="cursor:crosshair" onclick="upSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')"/>
-					<input title="<!-- TMPL_VAR NAME="marc_lib_plain" -->" style=" border:0;" type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1" class="flat" DISABLE READONLY tabindex=-1 />
-				<!-- TMPL_ELSE -->
-					<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->"/>
-				<!-- /TMPL_UNLESS -->
-				<!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
-					<!-- TMPL_IF name="mandatory" -->
-						<b>
-					<!-- /TMPL_IF -->
-					<!-- TMPL_VAR NAME="marc_lib" -->
-					<!-- TMPL_IF name="mandatory" -->
-						*</b>
-					<!-- /TMPL_IF -->
-					</label>
-				<!-- /TMPL_UNLESS -->
-				<!-- TMPL_VAR NAME="marc_value" -->
-				<!-- TMPL_IF NAME="repeatable" -->
-					<a style="cursor: crosshair; color: grey; font-size: 80%;" onclick="cloneSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')">+</a>
-				<!-- /TMPL_IF -->
-				<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->"/>
-				<input type="hidden" name="subfieldYYY" value="<!-- TMPL_VAR NAME="subfield" -->" size="2" maxlength="1"/>
-				<input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->"/>
-				<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->"/>
-				<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->"/>
-				</p>
-			</div>
-		<!-- /TMPL_LOOP -->
-		</div>
-	<!-- /TMPL_LOOP -->
-
-	</div>
-	
-	<div name="5XX" id="5XX" class="tab">
-		<!-- TMPL_LOOP NAME="5XX" -->
-		<div style=";" id="tag<!-- TMPL_VAR name="tag"-->">
-		<!-- TMPL_IF name="tag" -->
-		<p class="MARCtag">
-			<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR NAME="tag" -->">
-			<!-- TMPL_UNLESS name="hide_marc" -->
-				<a title="<!-- TMPL_VAR NAME="tag_lib" -->"><!-- TMPL_VAR NAME="tag" --></a>
-				<input tabindex="1" onblur="this.style.backgroundColor='#ffffff';" onfocus="this.style.backgroundColor='#ffff00;'" type="text" name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->"> -
-			<!-- TMPL_ELSE -->
-				<input tabindex="1" type="hidden" name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->">
-			<!-- /TMPL_UNLESS -->
-			<!-- TMPL_UNLESS NAME="advancedMARCEditor" --><!-- TMPL_VAR NAME="tag_lib" --><!-- /TMPL_UNLESS -->
-			<!-- TMPL_IF name="repeatable" --><a href="javascript:cloneTag('tag<!-- TMPL_VAR NAME="tag" -->')">+</a><!-- /TMPL_IF -->
-		</p>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_LOOP NAME="subfield_loop" -->
-			<!-- TMPL_IF NAME="visibility" -->
-				<a tabindex="1" style="color: grey; font-size: 80%; cursor: crosshair;" id="label<!-- TMPL_VAR name="index" -->" onclick="unHideSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->','label<!-- TMPL_VAR name="index" -->')">
-					<!-- TMPL_VAR NAME="subfield" -->
-				</a>
-			<!-- /TMPL_IF -->
-			<div style="<!-- TMPL_VAR NAME='visibility' -->;" id="subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='index' -->" name="subfield"><p>
-				<!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
-					<label class="labelsubfield">
-				<!-- /TMPL_UNLESS -->
-				<!-- TMPL_UNLESS name="hide_marc" -->
-					<img src="<!-- TMPL_VAR NAME="themelang" -->/images/up.png" style="cursor:crosshair" onclick="upSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')"/>
-					<input title="<!-- TMPL_VAR NAME="marc_lib_plain" -->" style=" border:0;" type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1" class="flat" DISABLE READONLY tabindex=-1 />
-				<!-- TMPL_ELSE -->
-					<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->"/>
-				<!-- /TMPL_UNLESS -->
-				<!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
-					<!-- TMPL_IF name="mandatory" -->
-						<b>
-					<!-- /TMPL_IF -->
-					<!-- TMPL_VAR NAME="marc_lib" -->
-					<!-- TMPL_IF name="mandatory" -->
-						*</b>
-					<!-- /TMPL_IF -->
-					</label>
-				<!-- /TMPL_UNLESS -->
-				<!-- TMPL_VAR NAME="marc_value" -->
-				<!-- TMPL_IF NAME="repeatable" -->
-					<a style="cursor: crosshair; color: grey; font-size: 80%;" onclick="cloneSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')">+</a>
-				<!-- /TMPL_IF -->
-				<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->"/>
-				<input type="hidden" name="subfieldYYY" value="<!-- TMPL_VAR NAME="subfield" -->" size="2" maxlength="1"/>
-				<input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->"/>
-				<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->"/>
-				<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->"/>
-				</p>
-			</div>
-		<!-- /TMPL_LOOP -->
-		</div>
-	<!-- /TMPL_LOOP -->
-
-	</div>
-	
-	<div name="6XX" id="6XX" class="tab">
-		<!-- TMPL_LOOP NAME="6XX" -->
-		<div style=";" id="tag<!-- TMPL_VAR name="tag"-->">
-		<!-- TMPL_IF name="tag" -->
-		<p class="MARCtag">
-			<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR NAME="tag" -->">
-			<!-- TMPL_UNLESS name="hide_marc" -->
-				<a title="<!-- TMPL_VAR NAME="tag_lib" -->"><!-- TMPL_VAR NAME="tag" --></a>
-				<input tabindex="1" onblur="this.style.backgroundColor='#ffffff';" onfocus="this.style.backgroundColor='#ffff00;'" type="text" name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->"> -
-			<!-- TMPL_ELSE -->
-				<input tabindex="1" type="hidden" name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->">
-			<!-- /TMPL_UNLESS -->
-			<!-- TMPL_UNLESS NAME="advancedMARCEditor" --><!-- TMPL_VAR NAME="tag_lib" --><!-- /TMPL_UNLESS -->
-			<!-- TMPL_IF name="repeatable" --><a href="javascript:cloneTag('tag<!-- TMPL_VAR NAME="tag" -->')">+</a><!-- /TMPL_IF -->
-		</p>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_LOOP NAME="subfield_loop" -->
-			<!-- TMPL_IF NAME="visibility" -->
-				<a tabindex="1" style="color: grey; font-size: 80%; cursor: crosshair;" id="label<!-- TMPL_VAR name="index" -->" onclick="unHideSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->','label<!-- TMPL_VAR name="index" -->')">
-					<!-- TMPL_VAR NAME="subfield" -->
-				</a>
-			<!-- /TMPL_IF -->
-			<div style="<!-- TMPL_VAR NAME='visibility' -->;" id="subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='index' -->" name="subfield"><p>
-				<!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
-					<label class="labelsubfield">
-				<!-- /TMPL_UNLESS -->
-				<!-- TMPL_UNLESS name="hide_marc" -->
-					<img src="<!-- TMPL_VAR NAME="themelang" -->/images/up.png" style="cursor:crosshair" onclick="upSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')"/>
-					<input title="<!-- TMPL_VAR NAME="marc_lib_plain" -->" style=" border:0;" type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1" class="flat" DISABLE READONLY tabindex=-1 />
-				<!-- TMPL_ELSE -->
-					<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->"/>
-				<!-- /TMPL_UNLESS -->
-				<!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
-					<!-- TMPL_IF name="mandatory" -->
-						<b>
-					<!-- /TMPL_IF -->
-					<!-- TMPL_VAR NAME="marc_lib" -->
-					<!-- TMPL_IF name="mandatory" -->
-						*</b>
-					<!-- /TMPL_IF -->
-					</label>
-				<!-- /TMPL_UNLESS -->
-				<!-- TMPL_VAR NAME="marc_value" -->
-				<!-- TMPL_IF NAME="repeatable" -->
-					<a style="cursor: crosshair; color: grey; font-size: 80%;" onclick="cloneSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')">+</a>
-				<!-- /TMPL_IF -->
-				<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->"/>
-				<input type="hidden" name="subfieldYYY" value="<!-- TMPL_VAR NAME="subfield" -->" size="2" maxlength="1"/>
-				<input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->"/>
-				<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->"/>
-				<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->"/>
-				</p>
-			</div>
-		<!-- /TMPL_LOOP -->
-		</div>
-	<!-- /TMPL_LOOP -->
-
-	</div>
-	
-	<div name="7XX" id="7XX" class="tab">
-		<!-- TMPL_LOOP NAME="7XX" -->
-		<div style=";" id="tag<!-- TMPL_VAR name="tag"-->">
-		<!-- TMPL_IF name="tag" -->
-		<p class="MARCtag">
-			<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR NAME="tag" -->">
-			<!-- TMPL_UNLESS name="hide_marc" -->
-				<a title="<!-- TMPL_VAR NAME="tag_lib" -->"><!-- TMPL_VAR NAME="tag" --></a>
-				<input tabindex="1" onblur="this.style.backgroundColor='#ffffff';" onfocus="this.style.backgroundColor='#ffff00;'" type="text" name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->"> -
-			<!-- TMPL_ELSE -->
-				<input tabindex="1" type="hidden" name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->">
-			<!-- /TMPL_UNLESS -->
-			<!-- TMPL_UNLESS NAME="advancedMARCEditor" --><!-- TMPL_VAR NAME="tag_lib" --><!-- /TMPL_UNLESS -->
-			<!-- TMPL_IF name="repeatable" --><a href="javascript:cloneTag('tag<!-- TMPL_VAR NAME="tag" -->')">+</a><!-- /TMPL_IF -->
-		</p>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_LOOP NAME="subfield_loop" -->
-			<!-- TMPL_IF NAME="visibility" -->
-				<a tabindex="1" style="color: grey; font-size: 80%; cursor: crosshair;" id="label<!-- TMPL_VAR name="index" -->" onclick="unHideSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->','label<!-- TMPL_VAR name="index" -->')">
-					<!-- TMPL_VAR NAME="subfield" -->
-				</a>
-			<!-- /TMPL_IF -->
-			<div style="<!-- TMPL_VAR NAME='visibility' -->;" id="subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='index' -->" name="subfield"><p>
-				<!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
-					<label class="labelsubfield">
-				<!-- /TMPL_UNLESS -->
-				<!-- TMPL_UNLESS name="hide_marc" -->
-					<img src="<!-- TMPL_VAR NAME="themelang" -->/images/up.png" style="cursor:crosshair" onclick="upSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')"/>
-					<input title="<!-- TMPL_VAR NAME="marc_lib_plain" -->" style=" border:0;" type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1" class="flat" DISABLE READONLY tabindex=-1 />
-				<!-- TMPL_ELSE -->
-					<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->"/>
-				<!-- /TMPL_UNLESS -->
-				<!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
-					<!-- TMPL_IF name="mandatory" -->
-						<b>
-					<!-- /TMPL_IF -->
-					<!-- TMPL_VAR NAME="marc_lib" -->
-					<!-- TMPL_IF name="mandatory" -->
-						*</b>
-					<!-- /TMPL_IF -->
-					</label>
 				<!-- /TMPL_UNLESS -->
-				<!-- TMPL_VAR NAME="marc_value" -->
-				<!-- TMPL_IF NAME="repeatable" -->
-					<a style="cursor: crosshair; color: grey; font-size: 80%;" onclick="cloneSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')">+</a>
-				<!-- /TMPL_IF -->
-				<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->"/>
-				<input type="hidden" name="subfieldYYY" value="<!-- TMPL_VAR NAME="subfield" -->" size="2" maxlength="1"/>
-				<input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->"/>
-				<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->"/>
-				<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->"/>
-				</p>
-			</div>
-		<!-- /TMPL_LOOP -->
-		</div>
-	<!-- /TMPL_LOOP -->
-
-	</div>
-	
-	<div name="8XX" id="8XX" class="tab">
-		<!-- TMPL_LOOP NAME="8XX" -->
+    <!-- TMPL_LOOP NAME="innerloop" -->
 		<div style=";" id="tag<!-- TMPL_VAR name="tag"-->">
 		<!-- TMPL_IF name="tag" -->
 		<p class="MARCtag">
 			<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR NAME="tag" -->">
 			<!-- TMPL_UNLESS name="hide_marc" -->
 				<a title="<!-- TMPL_VAR NAME="tag_lib" -->"><!-- TMPL_VAR NAME="tag" --></a>
-				<input tabindex="1" onblur="this.style.backgroundColor='#ffffff';" onfocus="this.style.backgroundColor='#ffff00;'" type="text" name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->"> -
+                <input tabindex="1" onblur="this.style.backgroundColor='#ffffff';" onfocus="this.style.backgroundColor='#ffff00;'" type="text" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->" class="flat"> -
 			<!-- TMPL_ELSE -->
-				<input tabindex="1" type="hidden" name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->">
+                <input tabindex="1" type="hidden" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->">
 			<!-- /TMPL_UNLESS -->
-			<!-- TMPL_UNLESS NAME="advancedMARCEditor" --><!-- TMPL_VAR NAME="tag_lib" --><!-- /TMPL_UNLESS -->
-			<!-- TMPL_IF name="repeatable" --><a href="javascript:cloneTag('tag<!-- TMPL_VAR NAME="tag" -->')">+</a><!-- /TMPL_IF -->
-		</p>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_LOOP NAME="subfield_loop" -->
-			<!-- TMPL_IF NAME="visibility" -->
-				<a tabindex="1" style="color: grey; font-size: 80%; cursor: crosshair;" id="label<!-- TMPL_VAR name="index" -->" onclick="unHideSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->','label<!-- TMPL_VAR name="index" -->')">
-					<!-- TMPL_VAR NAME="subfield" -->
-				</a>
-			<!-- /TMPL_IF -->
-			<div style="<!-- TMPL_VAR NAME='visibility' -->;" id="subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='index' -->" name="subfield"><p>
 				<!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
-					<label class="labelsubfield">
-				<!-- /TMPL_UNLESS -->
-				<!-- TMPL_UNLESS name="hide_marc" -->
-					<img src="<!-- TMPL_VAR NAME="themelang" -->/images/up.png" style="cursor:crosshair" onclick="upSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')"/>
-					<input title="<!-- TMPL_VAR NAME="marc_lib_plain" -->" style=" border:0;" type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1" class="flat" DISABLE READONLY tabindex=-1 />
-				<!-- TMPL_ELSE -->
-					<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->"/>
-				<!-- /TMPL_UNLESS -->
-				<!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
-					<!-- TMPL_IF name="mandatory" -->
-						<b>
-					<!-- /TMPL_IF -->
-					<!-- TMPL_VAR NAME="marc_lib" -->
-					<!-- TMPL_IF name="mandatory" -->
-						*</b>
-					<!-- /TMPL_IF -->
-					</label>
-				<!-- /TMPL_UNLESS -->
-				<!-- TMPL_VAR NAME="marc_value" -->
-				<!-- TMPL_IF NAME="repeatable" -->
-					<a style="cursor: crosshair; color: grey; font-size: 80%;" onclick="cloneSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')">+</a>
-				<!-- /TMPL_IF -->
-				<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->"/>
-				<input type="hidden" name="subfieldYYY" value="<!-- TMPL_VAR NAME="subfield" -->" size="2" maxlength="1"/>
-				<input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->"/>
-				<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->"/>
-				<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->"/>
-				</p>
-			</div>
-		<!-- /TMPL_LOOP -->
-		</div>
-	<!-- /TMPL_LOOP -->
-
-	</div>
-	
-	<div name="9XX" id="9XX" class="tab">
-		<!-- TMPL_LOOP NAME="9XX" -->
-		<div style=";" id="tag<!-- TMPL_VAR name="tag"-->">
-		<!-- TMPL_IF name="tag" -->
-		<p class="MARCtag">
-			<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR NAME="tag" -->">
-			<!-- TMPL_UNLESS name="hide_marc" -->
-				<a title="<!-- TMPL_VAR NAME="tag_lib" -->"><!-- TMPL_VAR NAME="tag" --></a>
-				<input tabindex="1" onblur="this.style.backgroundColor='#ffffff';" onfocus="this.style.backgroundColor='#ffff00;'" type="text" name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->"> -
-			<!-- TMPL_ELSE -->
-				<input tabindex="1" type="hidden" name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->">
+            <!-- TMPL_VAR NAME="tag_lib" -->
 			<!-- /TMPL_UNLESS -->
-			<!-- TMPL_UNLESS NAME="advancedMARCEditor" --><!-- TMPL_VAR NAME="tag_lib" --><!-- /TMPL_UNLESS -->
-			<!-- TMPL_IF name="repeatable" --><a href="javascript:cloneTag('tag<!-- TMPL_VAR NAME="tag" -->')">+</a><!-- /TMPL_IF -->
+            <!-- TMPL_IF name="repeatable" --><a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a><!-- /TMPL_IF -->
 		</p>
 		<!-- /TMPL_IF -->
 		<!-- TMPL_LOOP NAME="subfield_loop" -->
 			<!-- TMPL_IF NAME="visibility" -->
-				<a tabindex="1" style="color: grey; font-size: 80%; cursor: crosshair;" id="label<!-- TMPL_VAR name="index" -->" onclick="unHideSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->','label<!-- TMPL_VAR name="index" -->')">
+                <a tabindex="1" style="color: grey; font-size: 80%; cursor: se-resize;" id="label<!-- TMPL_VAR name="index" -->" onclick="unHideSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->','label<!-- TMPL_VAR name="index" -->')">
 					<!-- TMPL_VAR NAME="subfield" -->
 				</a>
 			<!-- /TMPL_IF -->
-			<div style="<!-- TMPL_VAR NAME='visibility' -->;" id="subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='index' -->" name="subfield"><p>
+            <div style="<!-- TMPL_VAR NAME='visibility' -->;" id="subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='index' -->">
+                <p>
 				<!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
-					<label class="labelsubfield">
+                    <label <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> class="labelsubfield">
 				<!-- /TMPL_UNLESS -->
 				<!-- TMPL_UNLESS name="hide_marc" -->
-					<img src="<!-- TMPL_VAR NAME="themelang" -->/images/up.png" style="cursor:crosshair" onclick="upSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')"/>
-					<input title="<!-- TMPL_VAR NAME="marc_lib_plain" -->" style=" border:0;" type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1" class="flat" DISABLE READONLY tabindex=-1 />
+                    <img <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> src="<!-- TMPL_VAR NAME="themelang" -->/images/up.png" onclick="upSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')"/>
+                        <input title="<!-- TMPL_VAR NAME="marc_lib_plain" -->" style=" <!-- TMPL_IF NAME="fixedfield" -->display:none; <!-- /TMPL_IF -->border:0;" type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1" class="flat" DISABLE READONLY tabindex=-1 />
 				<!-- TMPL_ELSE -->
 					<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->"/>
 				<!-- /TMPL_UNLESS -->
 				<!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
-					<!-- TMPL_IF name="mandatory" -->
-						<b>
-					<!-- /TMPL_IF -->
+                    <!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
 					<!-- TMPL_VAR NAME="marc_lib" -->
-					<!-- TMPL_IF name="mandatory" -->
-						*</b>
-					<!-- /TMPL_IF -->
+                    <!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
 					</label>
 				<!-- /TMPL_UNLESS -->
 				<!-- TMPL_VAR NAME="marc_value" -->
@@ -643,9 +96,8 @@
 		<!-- /TMPL_LOOP -->
 		</div>
 	<!-- /TMPL_LOOP -->
-
 	</div>
-	
+<!-- /TMPL_LOOP -->
 		<div name="hidden" id="hidden" class="tab">
 		<!-- TMPL_LOOP NAME="hidden_loop" -->
 				<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->">
@@ -670,33 +122,46 @@
 		<!-- /TMPL_IF -->
 	</form>
 <script language="JavaScript" type="text/javascript">
+function loading(){
+	document.getElementById("loading").style.display = "none";
+}
 function _(s) { return s } // dummy function for gettext
-
-function openAuth(tagid,authtype,subfieldid) {
-alert("SI"+subfieldid);
-	defaultid=document.getElementById(subfieldid);
-	newin=window.open("../authorities/auth_finder.pl?authtypecode="+  authtype+ "&index="+ subfieldid+ "&tagid="+tagid+"&result=", "value builder",'width=550,height=550,toolbar=false,scrollbars=yes');
+function confirmnotdup(){
+	document.getElementById("confirm_not_duplicate").value = 1;
+	var checkform =	document.getElementById("f");
+	Check(checkform);
 }
-
 function active(numlayer)
 {
-	for (i=0; i < 10 ; i++ ) {
+	for (i=0; i <= 9 ; i++ ) {
 		ong = i+"XX";
 		link = "link"+i;
 		if (numlayer==i) {
+			with(document){
+			if (document.getElementById(ong)){
 			document.getElementById(ong).style.visibility="visible";
-			document.getElementById(link).style.color="#FFFFFF";
+			}
+			if(document.getElementById(link)){
+				document.getElementById(link).style.color="#000066";
+				document.getElementById(link).style.backgroundColor="#FFFFCC";
+			}
+			}
 		} else {
+			with(document){
+			if (document.getElementById(ong)){
 			document.getElementById(ong).style.visibility="hidden";
-			if (document.getElementById(link))
-				{
-					document.getElementById(link).style.color="#000000";
+			}
+			if (document.getElementById(link)) {
+				document.getElementById(link).style.color="#669999";
+				document.getElementById(link).style.backgroundColor="#D8DEB8";
+			}
 				}
 		}
 	}
 }
 active(0);
 function Check(f) {
+	document.body.style.cursor ="wait";
 	// Scan for nonempty fields
 	var field_is_nonempty_p = new Array();
 	for (i=0 ; i<f.field_value.length ; i++) {
@@ -717,21 +182,20 @@
 		    // mandatory, or if something else in the tag is entered
 
 		    if (f.tag_mandatory[i].value == 1 || field_is_nonempty_p[f.tag[i].value]) {
-			document.getElementById("error"+i).style.backgroundColor="#FF0000";
+				f.field_value[i].style.backgroundColor="#FF0000";
 			total_missing_mandatory_subfields++;
-			if (document.getElementById("error"+i).parentNode.tagName == "B")
+			if (f.field_value[i].parentNode.tagName == "B")
 			{
-				missing_mandatory_subfields.push(document.getElementById("error"+i).innerHTML + " (tab " +  document.getElementById("error"+i).parentNode.parentNode.parentNode.parentNode.id.substr(0,1) + ")");
+				missing_mandatory_subfields.push(f.field_value[i].innerHTML + " (tab " +  f.field_value[i].parentNode.parentNode.parentNode.parentNode.id.substr(0,1) + ")");
 			}
 			else
 			{
-				missing_mandatory_subfields.push(document.getElementById("error"+i).innerHTML + " (tab " +  document.getElementById("error"+i).parentNode.parentNode.parentNode.id.substr(0,1) + ")");
+				missing_mandatory_subfields.push(f.field_value[i].innerHTML + " (tab " +  f.field_value[i].parentNode.parentNode.parentNode.id.substr(0,1) + ")");
 			}
 
 			}
 		} else {
-// 			alert("I = "+i);
-			document.getElementById("error"+i).style.backgroundColor="#FFFFFF";
+			f.field_value[i].style.backgroundColor="#FFFFFF";
 		}
 	}
 
@@ -745,16 +209,16 @@
 		if (seen_mandatory_tag_p[j] != 1) {
 		    seen_mandatory_tag_p[j] = 1;
 		    total_missing_mandatory_tags++;
- 		    if (document.getElementById("error"+i).parentNode.tagName == "B")
+ 		    if (f.field_value[i].parentNode.tagName == "B")
 		    {
-				missing_mandatory_tags.push(document.getElementById("error"+i).innerHTML + " (tab " +  document.getElementById("error"+i).parentNode.parentNode.parentNode.parentNode.id.substr(0,1) + ")");
+				missing_mandatory_tags.push(f.field_value[i].innerHTML + " (tab " +  f.field_value[i].parentNode.parentNode.parentNode.parentNode.id.substr(0,1) + ")");
 		    }
 		    else
 		    {
-				missing_mandatory_tags.push(document.getElementById("error"+i).innerHTML + " (tab " +  document.getElementById("error"+i).parentNode.parentNode.parentNode.id.substr(0,1) + ")");
+				missing_mandatory_tags.push(f.field_value[i].innerHTML + " (tab " +  f.field_value[i].parentNode.parentNode.parentNode.id.substr(0,1) + ")");
 			}
 		}
-		document.getElementById("error"+i).style.backgroundColor="#ffff00";
+		f.field_value[i].style.backgroundColor="#FFFF00";
 	    }
 	}
 
@@ -778,37 +242,65 @@
 		document.forms['f'].submit();
 	}
 }
-function Dopop(link,subfieldid) {
-	defaultid=document.getElementById(subfieldid);
-	alert("DEF"+defaultid);
-	subfield_value=defaultid.getElementsByTagName("subfield_value");;
-	alert("DEF"+subfield_value);
-	newin=window.open(link+"&result="+subfield_value.value,"value builder",'width=550,height=550,toolbar=false,scrollbars=yes');
+function Dopop(link,i) {
+	defaultvalue=document.forms['f'].field_value[i].value;
+	newin=window.open(link+"&result="+defaultvalue,"value builder",'width=550,height=550,toolbar=false,scrollbars=yes');
 }
 
 function PopupZ3950() {
     var strQuery="";
+	var error = 0;
 	for (i=0 ; i<document.forms['f'].field_value.length ; i++) {
-		if (document.forms['f'].kohafield[i].value == "biblioitems.isbn" && document.forms['f'].field_value[i].value.length>0) {
+		if (document.forms['f'].kohafield[i].value == "biblioitems.isbn"){
+			if(document.forms['f'].field_value[i].value.length>0) {
 		    strQuery += "&isbn="+document.forms['f'].field_value[i].value;
+		} else {
+			error++;
 		}
-		if (document.forms['f'].kohafield[i].value == "biblio.title" && document.forms['f'].field_value[i].value.length>0) {
+		}
+		if (document.forms['f'].kohafield[i].value == "biblio.title"){
+			if(document.forms['f'].field_value[i].value.length>0) {
 		    strQuery += "&title="+document.forms['f'].field_value[i].value;
+		} else {
+			error++;
 		}
-		if (document.forms['f'].kohafield[i].value == "biblio.author" &&document.forms['f'].field_value[i].value.length>0) {
+		}
+		if (document.forms['f'].kohafield[i].value == "biblio.author"){
+			if(document.forms['f'].field_value[i].value.length>0) {
 		    strQuery += "&author="+document.forms['f'].field_value[i].value;
+		} else { 
+			error++;
 		}
-		if (document.forms['f'].kohafield[i].value == "biblioitems.issn" && document.forms['f'].field_value[i].value.length>0) {
+		}
+		if (document.forms['f'].kohafield[i].value == "biblioitems.issn"){
+			if(document.forms['f'].field_value[i].value.length>0) {
 		    strQuery += "&issn="+document.forms['f'].field_value[i].value;
+		} else {
+			error++;
+		}
 		}
 	}
-	newin=window.open("../z3950/search.pl?bibid=<!-- TMPL_VAR NAME="bibid" -->"+strQuery,"z3950search",'width=800,height=400,toolbar=false,scrollbars=yes');
+	if(error < 4){
+	newin=window.open("../z3950/search.pl?bibid=<!-- TMPL_VAR NAME="bibid" -->"+strQuery,"z3950search",'width=640,height=400,location=yes,toolbar=no,scrollbars=yes');
+	} else {
+		alert("To perform a z39.50 search, you must enter at least one of the following: \n\n ISBN\n ISSN\n Title\n Author\n");
+	}
 }
+
 function Changefwk(FwkList) {
   var fwk = FwkList.options[FwkList.selectedIndex].value;
   window.location = "addbiblio.pl?oldbiblionumber=<!--TMPL_VAR Name="oldbiblionumber"-->&frameworkcode="+fwk;
 }
 
+function openAuth(tagid,authtype,X) {
+// 	defaultid=document.getElementById(subfieldid);
+//     alert("X"+X);
+    Y=X.parentNode.getAttribute("id");
+//     alert("tagid"+Y);
+	newin=window.open("../authorities/auth_finder.pl?authtypecode="+  authtype+ "&tagid="+Y, "value builder",'width=550,height=550,toolbar=false,scrollbars=yes');
+}
+
+
 function AddField(field) {
 	document.forms['f'].op.value = "addfield";
 	document.forms['f'].addfield_field.value=field;
@@ -839,15 +331,6 @@
  original.parentNode.insertBefore( clone, original.nextSibling); 
 }
 
-function cloneTag(index) {
- var original = document.getElementById(index);
- var clone = original.cloneNode(true);
- clone.setAttribute("id", index + index);
- // OK, now rename the id of the 
- original.parentNode.insertBefore( clone, original.nextSibling);
-
-}
-
 function upSubfield(index) {
 var original = document.getElementById(index);
 var previous = original.previousSibling;

Index: authorities/blinddetail-biblio-search.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/en/authorities/blinddetail-biblio-search.tmpl,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.2.2.1
diff -u -b -r1.6.2.2 -r1.6.2.2.2.1
--- authorities/blinddetail-biblio-search.tmpl	7 Apr 2006 11:39:43 -0000	1.6.2.2
+++ authorities/blinddetail-biblio-search.tmpl	11 Jul 2006 14:22:13 -0000	1.6.2.2.2.1
@@ -3,45 +3,48 @@
 <body>
 <script language="JavaScript" type="text/javascript">
 
-function go() {
-	var tagid = '<!-- TMPL_VAR NAME="tagid" -->';
-//	alert("I"+tagid);
-	var whichtag = opener.opener.document.getElementById(tagid);
-	// parses all the fields of this tag (every id)
-	whichsubfields=whichtag.getElementsByTagName("div");
-	subfieldcode='';
-	for(var i=0; i<whichsubfields.length;i++) {
-		// get every <input>
-		change_value=whichsubfields[i].getElementsByTagName("input");
-		for(j=0;j<change_value.length;j++) {
-			// if this <input> if the subfield code, store if for future use !
-			if (change_value[j].getAttribute("name") == 'subfield') {
-				subfieldcode=subfield_value=change_value[j].value;
-//				alert("subfieldcode ="+subfieldcode);
-			}
-			// if this <input> is for field_value => replace it by the correct value
-			if (change_value[j].getAttribute("name") == 'field_value') {
-				// empty any previous value, except if we are facing a $4 (UNIMARC specific, does not exist in MARC21)
-				if (subfieldcode !=4) {
-					change_value[j].value ='';
-				}
-				// if we are on the $9 replace by authid
-				if (subfieldcode=='9') {
-// 						alert("subfield 9 valeur <!-- TMPL_VAR NAME="authid" -->");
-					change_value[j].value = "<!-- TMPL_VAR NAME="authid" -->";
+function go()
+{
+var index_start = <!-- TMPL_VAR NAME="index" -->;
+var whichfield = opener.opener.document.f.tag[index_start].value;
+i=index_start
+// go forward, until reaching the end of the field.
+while (i<opener.opener.document.f.field_value.length) {
+	if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == '9') {
+		opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="authid" -->";
 				}
-				// otherwise, build the loop for all subfields to replace
 				<!-- TMPL_LOOP NAME="0XX" -->
 					<!-- TMPL_LOOP NAME="subfield" -->
-						if (subfieldcode == '<!-- TMPL_VAR NAME="marc_subfield" -->') {
-// 						alert("subfield"+subfieldcode+" valeur <!-- TMPL_VAR NAME="marc_value" -->");
-							change_value[j].value = "<!-- TMPL_VAR NAME="marc_value" -->";
+			if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == '<!-- TMPL_VAR NAME="marc_subfield" -->') 
+			{
+				opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="marc_value" -->";
 						}
 					<!-- /TMPL_LOOP -->
 				<!-- /TMPL_LOOP -->
+	if (opener.opener.document.f.tag[i].value != whichfield) {
+		i=opener.opener.document.f.field_value.length;
 			}
+	i++;
+}
+// go backward until the beginning of the field
+i=index_start
+while (i>=0) {
+	if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == '9') {
+		opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="authid">";
 		}
+	<!-- TMPL_LOOP NAME="0XX" -->
+		<!-- TMPL_LOOP NAME="subfield" -->
+			if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == '<!-- TMPL_VAR NAME="marc_subfield" -->') 
+			{
+				opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="marc_value" -->";
 	}
+		<!-- /TMPL_LOOP -->
+	<!-- /TMPL_LOOP -->
+	if (opener.opener.document.f.tag[i].value != whichfield) {
+		i=0;
+	}
+	i--;
+}
 	opener.close();
 	self.close();
 	return false;

Index: bull/statecollection.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl,v
retrieving revision 1.4.2.8
retrieving revision 1.4.2.8.2.1
diff -u -b -r1.4.2.8 -r1.4.2.8.2.1
--- bull/statecollection.tmpl	8 Feb 2006 09:20:11 -0000	1.4.2.8
+++ bull/statecollection.tmpl	11 Jul 2006 14:22:13 -0000	1.4.2.8.2.1
@@ -20,6 +20,9 @@
 			Numbered
 		</th>
 		<th class="bull">
+			Published on
+		</th>
+		<th class="bull">
 			planned for
 		</th>
 		<th class="bull">
@@ -35,6 +38,9 @@
 				Issue <input type="text" name="serialseq" value="<!-- TMPL_VAR name="serialseq" -->" size=50 maxlength=100>
 			</td>
 			<td>
+				<input type="text" name="publisheddate" value="<!-- TMPL_VAR name="publisheddate" -->" size=10 maxlength=15>
+			</td>
+			<td>
 				<input type="text" name="planneddate" value="<!-- TMPL_VAR name="planneddate" -->" size=10 maxlength=15>
 			</td>
 			<td>
@@ -77,9 +83,12 @@
 		<!--TMPL_IF Name="serialadditems" -->
 		<tr>
 			<td>
-				Callnumber <input type="text" name="itemcallnumber" value="" size=10 maxlength=15>
 				Barcode <input type="text" name="barcode" value="" size=20 maxlength=20>
+				Callnumber <input type="text" name="itemcallnumber" value="" size=10 maxlength=15>
 			</td>
+			</td>
+            &nbsp;
+			<td>
 			<td>
 				<select name="branch" size="1">
 						<option value="">Branch</option>
@@ -121,6 +130,9 @@
 				Manual issue <input type="text" name="serialseq" size=30 maxlength=100>
 			</td>
 			<td>
+				<input type="text" name="publisheddate" size=10 maxlength=15>
+			</td>
+			<td>
 				<input type="text" name="planneddate" size=10 maxlength=15>
 			</td>
 			<td>
@@ -135,8 +147,11 @@
 		<!--TMPL_IF Name="serialadditems" -->
 		<tr>
 			<td>
-				Callnumber <input type="text" name="itemcallnumber" value="" size=10 maxlength=15>
 				Barcode <input type="text" name="barcode" value="" size=20 maxlength=20>
+				Callnumber <input type="text" name="itemcallnumber" value="" size=10 maxlength=15>
+			</td>
+			<td>
+				&nbsp;
 			</td>
 			<td>
 				<select name="branch" size="1">

Index: help/bull-home.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/en/help/bull-home.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -b -r1.1 -r1.1.4.1
--- help/bull-home.tmpl	5 Aug 2004 19:33:36 -0000	1.1
+++ help/bull-home.tmpl	11 Jul 2006 14:22:13 -0000	1.1.4.1
@@ -2,7 +2,7 @@
 	<h1>Serials subscription help</h1>
 	<ul>
 		<li>Search for a subscription by using the filter button (with a ISSN or a title). If you enter a title, you can use the wildcard % : entering <b>%Times%</b> returns every subscription containing Times in the title. Entering <b>New York%</b> returns every subscription with title starting with New York</li>
-		<li>If you want to create a new subscription, clic on <span class="button">Add subscription</span></li>
+		<li>If you want to create a new subscription, click on <span class="button">Add subscription</span></li>
 		<li>Once you have found the subscription you need, you can: </li>
 			<ul>
 				<li>View subscription details</li>

Index: help/admin/biblio_framework.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/en/help/admin/biblio_framework.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -b -r1.1 -r1.1.4.1
--- help/admin/biblio_framework.tmpl	18 Aug 2004 15:56:00 -0000	1.1
+++ help/admin/biblio_framework.tmpl	11 Jul 2006 14:22:13 -0000	1.1.4.1
@@ -2,5 +2,5 @@
 	<h1>Biblio framework</h1>
 	<p>biblio frameworks are used to catalogue your biblios.</p>
 	<p>Unlike Koha 2.0, in this version you can have more than 1 framework to catalogate differently various materials. You can, for example, define 1 framework for monographies, 1 framework for serials, 1 framework for URL...</p>
-	<p>Once a framework type is created, you can clic on "MARC structure" to define the exact MARC structure. The first time, Koha will ask you to select an existing framework to copy into the new one. Thus, you don't have to define all the MARC structure</p>
+	<p>Once a framework type is created, you can click on "MARC structure" to define the exact MARC structure. The first time, Koha will ask you to select an existing framework to copy into the new one. Thus, you don't have to define all the MARC structure</p>
 <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file

Index: help/admin/marc_subfields_structure.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/en/help/admin/marc_subfields_structure.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
--- help/admin/marc_subfields_structure.tmpl	4 Apr 2006 14:03:44 -0000	1.1.2.2
+++ help/admin/marc_subfields_structure.tmpl	11 Jul 2006 14:22:13 -0000	1.1.2.2.2.1
@@ -44,7 +44,7 @@
 <li>Auth value : means the value is not free, but in the authorised value list of the selected type</li>
 <li>thesaurus : means that the value is not free, but can be searched in authority/thesaurus of the selected category</li>
 <li>plugin : means the value is calculated or managed by a plugin. Plugins can do almost anything. For example, in UNIMARC there are plugins for every 1xx fields that are coded fields. The plugin is a huge help for cataloger ! There are also two plugins (unimarc_plugin_210c and unimarc_plugin_225a that can "magically" find the editor from an ISBN, and the collection list for the editor)</li>
-<li>link : If you enter a field/subfield here (200b), a little glass appears after the subfield. If the user clic on the glass, a search is done on the DB for the field/subfield with the same value. Can be used for 2 main topic : 
+<li>link : If you enter a field/subfield here (200b), a little glass appears after the subfield. If the user click on the glass, a search is done on the DB for the field/subfield with the same value. Can be used for 2 main topic : 
 	<ul>
 		<li>on a field like author (200f in UNIMARC), put 200f here, you will be able to see all biblios with the same author</li>
 		<li>on a field that is a link (4xx) to reach another biblio. For example, put 011a in 464$x, will find the serial that was previously with this issn. With the 4xx pligin, you get a powerful tool to manage biblios connected to biblios</li>

Index: help/bull/bull-home.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/en/help/bull/bull-home.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -b -r1.1 -r1.1.4.1
--- help/bull/bull-home.tmpl	12 Aug 2004 14:38:12 -0000	1.1
+++ help/bull/bull-home.tmpl	11 Jul 2006 14:22:13 -0000	1.1.4.1
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="help-top.inc" -->
 	<h1>Serials subscription help</h1>
 	<li>Search for a subscription by using the filter button (with a ISSN or a title). If you enter a title, you can use the wildcard % : entering <b>%Times%</b> returns every subscription containing Times in the title. Entering <b>New York%</b> returns every subscription with title starting with New York</li>
-	<li>If you want to create a new subscription, clic on <span class="button">Add subscription</span>
+	<li>If you want to create a new subscription, click on <span class="button">Add subscription</span>
 <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file

Index: includes/marc-editor.css
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/marc-editor.css,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.2.2.1
diff -u -b -r1.5.2.2 -r1.5.2.2.2.1
--- includes/marc-editor.css	14 Dec 2005 15:01:36 -0000	1.5.2.2
+++ includes/marc-editor.css	11 Jul 2006 14:22:13 -0000	1.5.2.2.2.1
@@ -58,3 +58,11 @@
 	display:inline;
 	color:#000000;
 }
+
+input.addbiblioInput {
+	background-color: #FFFFFF;
+}
+
+input.addbiblioInputFocus {
+	background-color: #DDDDDD;
+}
\ No newline at end of file

Index: members/memberentry.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl,v
retrieving revision 1.33.2.7
retrieving revision 1.33.2.7.2.1
diff -u -b -r1.33.2.7 -r1.33.2.7.2.1
--- members/memberentry.tmpl	9 Jan 2006 10:31:36 -0000	1.33.2.7
+++ members/memberentry.tmpl	11 Jul 2006 14:22:13 -0000	1.33.2.7.2.1
@@ -67,7 +67,7 @@
 				<td><!-- TMPL_UNLESS name="institution" -->Initials<!-- /TMPL_UNLESS --></td>
 				<td><!-- TMPL_UNLESS name="institution" --><b> Given Names*</b><!-- /TMPL_UNLESS --></td>
 				<td><!-- TMPL_IF NAME="institution" --><b>Institution name*</b><!-- TMPL_ELSE --><b> Surname*</b><!-- /TMPL_IF --></td>
-				<td><!-- TMPL_UNLESS name="institution" -->Prefered Name<!-- /TMPL_UNLESS --></td>
+				<td><!-- TMPL_UNLESS name="institution" -->Preferred Name<!-- /TMPL_UNLESS --></td>
 			</tr>
 			<tr>
 				<td>

Index: parameters/systempreferences.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl,v
retrieving revision 1.29.2.4
retrieving revision 1.29.2.4.2.1
diff -u -b -r1.29.2.4 -r1.29.2.4.2.1
--- parameters/systempreferences.tmpl	8 Mar 2006 16:18:05 -0000	1.29.2.4
+++ parameters/systempreferences.tmpl	11 Jul 2006 14:22:13 -0000	1.29.2.4.2.1
@@ -166,6 +166,15 @@
 				<!--/TMPL_IF-->
 			</td>
 			<td>
+				<!--TMPL_IF Name="Librarian"-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Intranet" class="button">Intranet
+					</a>
+				<!--TMPL_ELSE-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Intranet">Intranet
+					</a>
+				<!--/TMPL_IF-->
+			</td>
+			<td>
 				<!--TMPL_IF Name="Catalogue"-->
 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Catalogue" class="button">Catalogue
 					</a>

Index: search.marc/result.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl,v
retrieving revision 1.21.2.6
retrieving revision 1.21.2.6.2.1
diff -u -b -r1.21.2.6 -r1.21.2.6.2.1
--- search.marc/result.tmpl	7 Mar 2006 12:14:26 -0000	1.21.2.6
+++ search.marc/result.tmpl	11 Jul 2006 14:22:13 -0000	1.21.2.6.2.1
@@ -56,6 +56,9 @@
 							<!-- TMPL_ELSE -->
 								<!-- TMPL_IF NAME="itemcallnumber" -->
 									(<!-- TMPL_VAR NAME="itemcallnumber" -->)
+                                <!-- TMPL_IF name="cnt" -->
+                                  x <!-- TMPL_VAR name="cnt" -->
+                                <!--/TMPL_IF-->
 								<!-- /TMPL_IF -->
 							<!-- /TMPL_IF -->
 							<!-- TMPL_IF name="notforloan" -->

Index: value_builder/unimarc_field_4XX.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_4XX.tmpl,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.3.2.1
diff -u -b -r1.3.2.3 -r1.3.2.3.2.1
--- value_builder/unimarc_field_4XX.tmpl	19 Apr 2006 18:22:04 -0000	1.3.2.3
+++ value_builder/unimarc_field_4XX.tmpl	11 Jul 2006 14:22:13 -0000	1.3.2.3.2.1
@@ -7,129 +7,83 @@
 			function go() {
 			var index_start = <!-- TMPL_VAR NAME="index" -->;
 			var whichfield = opener.opener.document.f.tag[index_start].value;
-			i=index_start
+                var parentField = opener.opener.document.f.tag[index_start].parentNode.parentNode.parentNode;
+//                 alert("PARENT "+parentField);
 			// go forward, until reaching the end of the field.
-			while (i<opener.opener.document.f.field_value.length) {
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == '9') {
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_9" -->";
+                var subfieldcode='';
+                var whichsubfields=parentField.getElementsByTagName("div");
+                for(var i=0; i<whichsubfields.length;i++) {
+                    // get every <input>
+                    change_value=whichsubfields[i].getElementsByTagName("input");
+                    for(j=0;j<change_value.length;j++) {
+//                         change_value=whichsubfields[j].getElementsByTagName("input");
+                        // if this <input> if the subfield code, store if for future use !
+                        if (change_value[j].getAttribute("name") == 'subfield') {
+                            subfieldcode=subfield_value=change_value[j].value;
+            //				alert("subfieldcode ="+subfieldcode);
 				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == '0') {
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_0" -->";
+                        // if this <input> is for field_value => replace it by the correct value
+                        if (change_value[j].getAttribute("name") == 'field_value') {
+/*alert("subfieldcode="+subfieldcode);*/
+                            if (subfieldcode == '9') {
+                                change_value[j].value = "<!-- TMPL_VAR NAME="subfield_value_9" -->";
 				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'a') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_a" -->";
+                            if (subfieldcode == '9') {
+                                change_value[j].value = "<!-- TMPL_VAR NAME="subfield_value_9" -->";
 				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'c') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_c" -->";
+                            if (subfieldcode == '0') {
+                                change_value[j].value = "<!-- TMPL_VAR NAME="subfield_value_0" -->";
 				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'd') 
+                            if (subfieldcode == 'a') 
 				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_d" -->";
+                                change_value[j].value = "<!-- TMPL_VAR NAME="subfield_value_a" -->";
 				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'e') 
+                            if (subfieldcode == 'c') 
 				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_e" -->";
+                                change_value[j].value = "<!-- TMPL_VAR NAME="subfield_value_c" -->";
 				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'h') 
+                            if (subfieldcode == 'd') 
 				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_h" -->";
+                                change_value[j].value = "<!-- TMPL_VAR NAME="subfield_value_d" -->";
 				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'i') 
+                            if (subfieldcode == 'e') 
 				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_i" -->";
+                                change_value[j].value = "<!-- TMPL_VAR NAME="subfield_value_e" -->";
 				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'p') 
+                            if (subfieldcode == 'h') 
 				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_p" -->";
+                                change_value[j].value = "<!-- TMPL_VAR NAME="subfield_value_h" -->";
 				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 't') 
+                            if (subfieldcode == 'i') 
 				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_t" -->";
+                                change_value[j].value = "<!-- TMPL_VAR NAME="subfield_value_i" -->";
 				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'u') 
+                            if (subfieldcode == 'p') 
 				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_u" -->";
+                                change_value[j].value = "<!-- TMPL_VAR NAME="subfield_value_p" -->";
 				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'v') 
+                            if (subfieldcode == 't') 
 				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_v" -->";
+                                change_value[j].value = "<!-- TMPL_VAR NAME="subfield_value_t" -->";
 				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'x') 
+                            if (subfieldcode == 'u') 
 				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_x" -->";
+                                change_value[j].value = "<!-- TMPL_VAR NAME="subfield_value_u" -->";
 				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'y') 
+                            if (subfieldcode == 'v') 
 				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_y" -->";
-				}
-				if (opener.opener.document.f.tag[i].value != whichfield) {
-					i=opener.opener.document.f.field_value.length;
-				}
-				i++;
+                                change_value[j].value = "<!-- TMPL_VAR NAME="subfield_value_v" -->";
 			}
-			// go backward until the beginning of the field
-			i=index_start
-			while (i>=0) {
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == '0') {
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_0">";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == '9') {
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_9">";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'a') 
+                            if (subfieldcode == 'x') 
 				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_a" -->";
+                                change_value[j].value = "<!-- TMPL_VAR NAME="subfield_value_x" -->";
 				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'c') 
+                            if (subfieldcode == 'y') 
 				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_c" -->";
+                                change_value[j].value = "<!-- TMPL_VAR NAME="subfield_value_y" -->";
 				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'd') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_d" -->";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'e') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_e" -->";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'h') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_h" -->";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'i') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_i" -->";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'p') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_p" -->";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 't') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_t" -->";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'u') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_u" -->";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'v') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_v" -->";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'x') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_x" -->";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'y') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_y" -->";
 				}
-				if (opener.opener.document.f.tag[i].value != whichfield) {
-					i=0;
 				}
-				i--;
 			}
 				return false;
 			}

Index: z3950/searchresult.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.2.2.1
diff -u -b -r1.4.2.2 -r1.4.2.2.2.1
--- z3950/searchresult.tmpl	19 Apr 2006 18:22:04 -0000	1.4.2.2
+++ z3950/searchresult.tmpl	11 Jul 2006 14:22:13 -0000	1.4.2.2.2.1
@@ -34,7 +34,7 @@
 				<th class="catalogue">&nbsp;</th>
 			</tr>
 				<!-- TMPL_LOOP NAME="breeding_loop" -->
-					<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
+					<!-- TMPL_IF NAME="toggle" --><tr class="hilighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
 						<td><!-- TMPL_VAR NAME="title" --></td>
 						<td><!-- TMPL_VAR NAME="author" --></td>
 						<td><!-- TMPL_VAR NAME="isbn" --></td>





More information about the Koha-cvs mailing list