From 7c7cbf1b13c06756d530ff4d6730e4d65317e5af Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Thu, 3 Jun 2004 10:09:42 +0000
Subject: [PATCH] * frameworks and itemtypes are independant * bugfixes in
 authority types & framework management (mainly deletion)

---
 .../default/en/acqui.simple/addbiblio.tmpl    | 522 +++++++++---------
 .../default/en/acqui.simple/addbooks.tmpl     |   6 +-
 2 files changed, 254 insertions(+), 274 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl
index 4a193ffab2..590e7e4f86 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl
@@ -7,7 +7,7 @@
 	<p>
 		<input type="hidden" name="op" value="addbiblio">
 		<input type="hidden" name="addfield_field">
-		<input type="hidden" name="itemtype" value="<!-- TMPL_VAR name="itemtype" -->">
+		<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">
@@ -52,343 +52,323 @@
 	</div>
 	
 	<div name="0XX" id="0XX" class="tab" style="visibility:visible">
-	<table class="noborder">
 		<!-- TMPL_LOOP name="0XX" -->
-				<!-- TMPL_IF name="tag" -->
-					<tr>
-						<td colspan="4" class="catalogue">
-						<!-- TMPL_VAR name="tag" -->
-						<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->">
-						<input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib">
-						<a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a>
-						</td>
-					</tr>
+			<!-- TMPL_IF name="tag" -->
+				<p class="MARCtag">
+				<!-- TMPL_VAR name="tag" -->
+				<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->">
+				<input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib">
+				<!-- TMPL_IF name="repeatable" -->
+					<a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a>
 				<!-- /TMPL_IF -->
-				<!-- TMPL_LOOP name="subfield_loop" -->
-					<tr>
-						<td width="3%">&nbsp;</td>
-						<td width="2%"><b><!-- TMPL_VAR name="subfield" --></b></td>
-						<td width="55%" align="right"><!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR name="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></td>
-						<td width="40%">
-							<!-- TMPL_VAR name="marc_value" -->
-							<input type="hidden" name="tag" value="<!-- TMPL_VAR name="tag" -->">
-							<input type="hidden" name="subfield" value="<!-- TMPL_VAR name="subfield" -->">
-							<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" -->">
-						</td>
-					</tr>
-				<!-- /tmpl_loop -->
+				</p>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP name="subfield_loop" -->
+				<p>
+					<label class="labelsubfield">
+						<b><!-- TMPL_VAR name="subfield" --></b>
+						<!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
+						<!-- TMPL_VAR name="marc_lib" -->
+						<!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
+					</label>
+					<!-- TMPL_VAR name="marc_value" -->
+					<input type="hidden" name="tag" value="<!-- TMPL_VAR name="tag" -->">
+					<input type="hidden" name="subfield" value="<!-- TMPL_VAR name="subfield" -->">
+					<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>
+			<!-- /tmpl_loop -->
 		<!-- /tmpl_loop -->
-		</table>
 	</div>
 	
 	<div name="1XX" id="1XX" class="tab">
-	<table class="noborder">
 		<!-- TMPL_LOOP name="1XX" -->
-				<!-- TMPL_IF name="tag" -->
-					<tr>
-						<td colspan="4" class="catalogue">
-						<!-- TMPL_VAR name="tag" -->
-						<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->">
-						<input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib">
-						<a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a>
-						</td>
-					</tr>
+			<!-- TMPL_IF name="tag" -->
+				<p class="MARCtag">
+				<!-- TMPL_VAR name="tag" -->
+				<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->">
+				<input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib">
+				<!-- TMPL_IF name="repeatable" -->
+					<a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a>
 				<!-- /TMPL_IF -->
-				<!-- TMPL_LOOP name="subfield_loop" -->
-					<tr>
-						<td width="3%">&nbsp;</td>
-						<td width="2%"><b><!-- TMPL_VAR name="subfield" --></b></td>
-						<td width="55%" align="right"><!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR name="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></td>
-						<td width="40%">
-							<!-- TMPL_VAR name="marc_value" -->
-							<input type="hidden" name="tag" value="<!-- TMPL_VAR name="tag" -->">
-							<input type="hidden" name="subfield" value="<!-- TMPL_VAR name="subfield" -->">
-							<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" -->">
-						</td>
-					</tr>
-				<!-- /tmpl_loop -->
+				</p>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP name="subfield_loop" -->
+				<p>
+					<label class="labelsubfield">
+						<b><!-- TMPL_VAR name="subfield" --></b>
+						<!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
+						<!-- TMPL_VAR name="marc_lib" -->
+						<!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
+					</label>
+					<!-- TMPL_VAR name="marc_value" -->
+					<input type="hidden" name="tag" value="<!-- TMPL_VAR name="tag" -->">
+					<input type="hidden" name="subfield" value="<!-- TMPL_VAR name="subfield" -->">
+					<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>
+			<!-- /tmpl_loop -->
 		<!-- /tmpl_loop -->
-	</table>
 	</div>
 	
 	<div name="2XX" id="2XX" class="tab">
-	<table class="noborder">
 		<!-- TMPL_LOOP name="2XX" -->
-				<!-- TMPL_IF name="tag" -->
-					<tr>
-						<td colspan="4" class="catalogue">
-						<!-- TMPL_VAR name="tag" -->
-						<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->">
-						<input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib">
-						<a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a>
-						</td>
-					</tr>
+			<!-- TMPL_IF name="tag" -->
+				<p class="MARCtag">
+				<!-- TMPL_VAR name="tag" -->
+				<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->">
+				<input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib">
+				<!-- TMPL_IF name="repeatable" -->
+					<a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a>
 				<!-- /TMPL_IF -->
-				<!-- TMPL_LOOP name="subfield_loop" -->
-					<tr>
-						<td width="3%">&nbsp;</td>
-						<td width="2%"><b><!-- TMPL_VAR name="subfield" --></b></td>
-						<td width="55%" align="right"><!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR name="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></td>
-						<td width="40%">
-							<!-- TMPL_VAR name="marc_value" -->
-							<input type="hidden" name="tag" value="<!-- TMPL_VAR name="tag" -->">
-							<input type="hidden" name="subfield" value="<!-- TMPL_VAR name="subfield" -->">
-							<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" -->">
-						</td>
-					</tr>
-				<!-- /tmpl_loop -->
+				</p>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP name="subfield_loop" -->
+				<p>
+					<label class="labelsubfield">
+						<b><!-- TMPL_VAR name="subfield" --></b>
+						<!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
+						<!-- TMPL_VAR name="marc_lib" -->
+						<!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
+					</label>
+					<!-- TMPL_VAR name="marc_value" -->
+					<input type="hidden" name="tag" value="<!-- TMPL_VAR name="tag" -->">
+					<input type="hidden" name="subfield" value="<!-- TMPL_VAR name="subfield" -->">
+					<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>
+			<!-- /tmpl_loop -->
 		<!-- /tmpl_loop -->
-	</table>
 	</div>
 	
 	<div name="3XX" id="3XX" class="tab">
-	<table class="noborder">
 		<!-- TMPL_LOOP name="3XX" -->
-				<!-- TMPL_IF name="tag" -->
-					<tr>
-						<td colspan="4" class="catalogue">
-						<!-- TMPL_VAR name="tag" -->
-						<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->">
-						<input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib">
-						<a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a>
-						</td>
-					</tr>
+			<!-- TMPL_IF name="tag" -->
+				<p class="MARCtag">
+				<!-- TMPL_VAR name="tag" -->
+				<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->">
+				<input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib">
+				<!-- TMPL_IF name="repeatable" -->
+					<a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a>
 				<!-- /TMPL_IF -->
-				<!-- TMPL_LOOP name="subfield_loop" -->
-					<tr>
-						<td width="3%">&nbsp;</td>
-						<td width="2%"><b><!-- TMPL_VAR name="subfield" --></b></td>
-						<td width="55%" align="right"><!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR name="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></td>
-						<td width="40%">
-							<!-- TMPL_VAR name="marc_value" -->
-							<input type="hidden" name="tag" value="<!-- TMPL_VAR name="tag" -->">
-							<input type="hidden" name="subfield" value="<!-- TMPL_VAR name="subfield" -->">
-							<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" -->">
-						</td>
-					</tr>
-				<!-- /tmpl_loop -->
+				</p>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP name="subfield_loop" -->
+				<p>
+					<label class="labelsubfield">
+						<b><!-- TMPL_VAR name="subfield" --></b>
+						<!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
+						<!-- TMPL_VAR name="marc_lib" -->
+						<!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
+					</label>
+					<!-- TMPL_VAR name="marc_value" -->
+					<input type="hidden" name="tag" value="<!-- TMPL_VAR name="tag" -->">
+					<input type="hidden" name="subfield" value="<!-- TMPL_VAR name="subfield" -->">
+					<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>
+			<!-- /tmpl_loop -->
 		<!-- /tmpl_loop -->
-	</table>
 	</div>
 	
 	<div name="4XX" id="4XX" class="tab">
-	<table class="noborder">
 		<!-- TMPL_LOOP name="4XX" -->
-				<!-- TMPL_IF name="tag" -->
-					<tr>
-						<td colspan="4" class="catalogue">
-						<!-- TMPL_VAR name="tag" -->
-						<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->">
-						<input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib">
-						<a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a>
-						</td>
-					</tr>
+			<!-- TMPL_IF name="tag" -->
+				<p class="MARCtag">
+				<!-- TMPL_VAR name="tag" -->
+				<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->">
+				<input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib">
+				<!-- TMPL_IF name="repeatable" -->
+					<a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a>
 				<!-- /TMPL_IF -->
-				<!-- TMPL_LOOP name="subfield_loop" -->
-					<tr>
-						<td width="3%">&nbsp;</td>
-						<td width="2%"><b><!-- TMPL_VAR name="subfield" --></b></td>
-						<td width="55%" align="right"><!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR name="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></td>
-						<td width="40%">
-							<!-- TMPL_VAR name="marc_value" -->
-							<input type="hidden" name="tag" value="<!-- TMPL_VAR name="tag" -->">
-							<input type="hidden" name="subfield" value="<!-- TMPL_VAR name="subfield" -->">
-							<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" -->">
-						</td>
-					</tr>
-				<!-- /tmpl_loop -->
+				</p>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP name="subfield_loop" -->
+				<p>
+					<label class="labelsubfield">
+						<b><!-- TMPL_VAR name="subfield" --></b>
+						<!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
+						<!-- TMPL_VAR name="marc_lib" -->
+						<!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
+					</label>
+					<!-- TMPL_VAR name="marc_value" -->
+					<input type="hidden" name="tag" value="<!-- TMPL_VAR name="tag" -->">
+					<input type="hidden" name="subfield" value="<!-- TMPL_VAR name="subfield" -->">
+					<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>
+			<!-- /tmpl_loop -->
 		<!-- /tmpl_loop -->
-	</table>
 	</div>
 	
 	<div name="5XX" id="5XX" class="tab">
-	<table class="noborder">
 		<!-- TMPL_LOOP name="5XX" -->
-				<!-- TMPL_IF name="tag" -->
-					<tr>
-						<td colspan="4" class="catalogue">
-						<!-- TMPL_VAR name="tag" -->
-						<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->">
-						<input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib">
-						<a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a>
-						</td>
-					</tr>
+			<!-- TMPL_IF name="tag" -->
+				<p class="MARCtag">
+				<!-- TMPL_VAR name="tag" -->
+				<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->">
+				<input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib">
+				<!-- TMPL_IF name="repeatable" -->
+					<a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a>
 				<!-- /TMPL_IF -->
-				<!-- TMPL_LOOP name="subfield_loop" -->
-					<tr>
-						<td width="3%">&nbsp;</td>
-						<td width="2%"><b><!-- TMPL_VAR name="subfield" --></b></td>
-						<td width="55%" align="right"><!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR name="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></td>
-						<td width="40%">
-							<!-- TMPL_VAR name="marc_value" -->
-							<input type="hidden" name="tag" value="<!-- TMPL_VAR name="tag" -->">
-							<input type="hidden" name="subfield" value="<!-- TMPL_VAR name="subfield" -->">
-							<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" -->">
-						</td>
-					</tr>
-				<!-- /tmpl_loop -->
+				</p>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP name="subfield_loop" -->
+				<p>
+					<label class="labelsubfield">
+						<b><!-- TMPL_VAR name="subfield" --></b>
+						<!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
+						<!-- TMPL_VAR name="marc_lib" -->
+						<!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
+					</label>
+					<!-- TMPL_VAR name="marc_value" -->
+					<input type="hidden" name="tag" value="<!-- TMPL_VAR name="tag" -->">
+					<input type="hidden" name="subfield" value="<!-- TMPL_VAR name="subfield" -->">
+					<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>
+			<!-- /tmpl_loop -->
 		<!-- /tmpl_loop -->
-	</table>
 	</div>
 	
 	<div name="6XX" id="6XX" class="tab">
-	<table class="noborder">
 		<!-- TMPL_LOOP name="6XX" -->
-				<!-- TMPL_IF name="tag" -->
-					<tr>
-						<td colspan="4" class="catalogue">
-						<!-- TMPL_VAR name="tag" -->
-						<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->">
-						<input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib">
-						<a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a>
-						</td>
-					</tr>
+			<!-- TMPL_IF name="tag" -->
+				<p class="MARCtag">
+				<!-- TMPL_VAR name="tag" -->
+				<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->">
+				<input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib">
+				<!-- TMPL_IF name="repeatable" -->
+					<a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a>
 				<!-- /TMPL_IF -->
-				<!-- TMPL_LOOP name="subfield_loop" -->
-					<tr>
-						<td width="3%">&nbsp;</td>
-						<td width="2%"><b><!-- TMPL_VAR name="subfield" --></b></td>
-						<td width="55%" align="right"><!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR name="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></td>
-						<td width="40%">
-							<!-- TMPL_VAR name="marc_value" -->
-							<input type="hidden" name="tag" value="<!-- TMPL_VAR name="tag" -->">
-							<input type="hidden" name="subfield" value="<!-- TMPL_VAR name="subfield" -->">
-							<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" -->">
-						</td>
-					</tr>
-				<!-- /tmpl_loop -->
+				</p>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP name="subfield_loop" -->
+				<p>
+					<label class="labelsubfield">
+						<b><!-- TMPL_VAR name="subfield" --></b>
+						<!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
+						<!-- TMPL_VAR name="marc_lib" -->
+						<!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
+					</label>
+					<!-- TMPL_VAR name="marc_value" -->
+					<input type="hidden" name="tag" value="<!-- TMPL_VAR name="tag" -->">
+					<input type="hidden" name="subfield" value="<!-- TMPL_VAR name="subfield" -->">
+					<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>
+			<!-- /tmpl_loop -->
 		<!-- /tmpl_loop -->
-	</table>
 	</div>
 	
 	<div name="7XX" id="7XX" class="tab">
-	<table class="noborder">
 		<!-- TMPL_LOOP name="7XX" -->
-				<!-- TMPL_IF name="tag" -->
-					<tr>
-						<td colspan="4" class="catalogue">
-						<!-- TMPL_VAR name="tag" -->
-						<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->">
-						<input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib">
-						<a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a>
-						</td>
-					</tr>
+			<!-- TMPL_IF name="tag" -->
+				<p class="MARCtag">
+				<!-- TMPL_VAR name="tag" -->
+				<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->">
+				<input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib">
+				<!-- TMPL_IF name="repeatable" -->
+					<a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a>
 				<!-- /TMPL_IF -->
-				<!-- TMPL_LOOP name="subfield_loop" -->
-					<tr>
-						<td width="3%">&nbsp;</td>
-						<td width="2%"><b><!-- TMPL_VAR name="subfield" --></b></td>
-						<td width="55%" align="right"><!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR name="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></td>
-						<td width="40%">
-							<!-- TMPL_VAR name="marc_value" -->
-							<input type="hidden" name="tag" value="<!-- TMPL_VAR name="tag" -->">
-							<input type="hidden" name="subfield" value="<!-- TMPL_VAR name="subfield" -->">
-							<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" -->">
-						</td>
-					</tr>
-				<!-- /tmpl_loop -->
+				</p>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP name="subfield_loop" -->
+				<p>
+					<label class="labelsubfield">
+						<b><!-- TMPL_VAR name="subfield" --></b>
+						<!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
+						<!-- TMPL_VAR name="marc_lib" -->
+						<!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
+					</label>
+					<!-- TMPL_VAR name="marc_value" -->
+					<input type="hidden" name="tag" value="<!-- TMPL_VAR name="tag" -->">
+					<input type="hidden" name="subfield" value="<!-- TMPL_VAR name="subfield" -->">
+					<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>
+			<!-- /tmpl_loop -->
 		<!-- /tmpl_loop -->
-	</table>
 	</div>
 	
 	<div name="8XX" id="8XX" class="tab">
-	<table class="noborder">
 		<!-- TMPL_LOOP name="8XX" -->
-				<!-- TMPL_IF name="tag" -->
-					<tr>
-						<td colspan="4" class="catalogue">
-						<!-- TMPL_VAR name="tag" -->
-						<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->">
-						<input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib">
-						<a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a>
-						</td>
-					</tr>
+			<!-- TMPL_IF name="tag" -->
+				<p class="MARCtag">
+				<!-- TMPL_VAR name="tag" -->
+				<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->">
+				<input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib">
+				<!-- TMPL_IF name="repeatable" -->
+					<a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a>
 				<!-- /TMPL_IF -->
-				<!-- TMPL_LOOP name="subfield_loop" -->
-					<tr>
-						<td width="3%">&nbsp;</td>
-						<td width="2%"><b><!-- TMPL_VAR name="subfield" --></b></td>
-						<td width="55%" align="right"><!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR name="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></td>
-						<td width="40%">
-							<!-- TMPL_VAR name="marc_value" -->
-							<input type="hidden" name="tag" value="<!-- TMPL_VAR name="tag" -->">
-							<input type="hidden" name="subfield" value="<!-- TMPL_VAR name="subfield" -->">
-							<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" -->">
-						</td>
-					</tr>
-				<!-- /tmpl_loop -->
+				</p>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP name="subfield_loop" -->
+				<p>
+					<label class="labelsubfield">
+						<b><!-- TMPL_VAR name="subfield" --></b>
+						<!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
+						<!-- TMPL_VAR name="marc_lib" -->
+						<!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
+					</label>
+					<!-- TMPL_VAR name="marc_value" -->
+					<input type="hidden" name="tag" value="<!-- TMPL_VAR name="tag" -->">
+					<input type="hidden" name="subfield" value="<!-- TMPL_VAR name="subfield" -->">
+					<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>
+			<!-- /tmpl_loop -->
 		<!-- /tmpl_loop -->
-	</table>
 	</div>
 	
 	<div name="9XX" id="9XX" class="tab">
-	<table class="noborder">
 		<!-- TMPL_LOOP name="9XX" -->
-				<!-- TMPL_IF name="tag" -->
-					<tr>
-						<td colspan="4" class="catalogue">
-						<!-- TMPL_VAR name="tag" -->
-						<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->">
-						<input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib">
-						<a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a>
-						</td>
-					</tr>
+			<!-- TMPL_IF name="tag" -->
+				<p class="MARCtag">
+				<!-- TMPL_VAR name="tag" -->
+				<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->">
+				<input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib">
+				<!-- TMPL_IF name="repeatable" -->
+					<a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a>
 				<!-- /TMPL_IF -->
-				<!-- TMPL_LOOP name="subfield_loop" -->
-					<tr>
-						<td width="3%">&nbsp;</td>
-						<td width="2%"><b><!-- TMPL_VAR name="subfield" --></b></td>
-						<td width="55%" align="right"><!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR name="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></td>
-						<td width="40%">
-							<!-- TMPL_VAR name="marc_value" -->
-							<input type="hidden" name="tag" value="<!-- TMPL_VAR name="tag" -->">
-							<input type="hidden" name="subfield" value="<!-- TMPL_VAR name="subfield" -->">
-							<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" -->">
-						</td>
-					</tr>
-				<!-- /tmpl_loop -->
+				</p>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP name="subfield_loop" -->
+				<p>
+					<label class="labelsubfield">
+						<b><!-- TMPL_VAR name="subfield" --></b>
+						<!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
+						<!-- TMPL_VAR name="marc_lib" -->
+						<!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
+					</label>
+					<!-- TMPL_VAR name="marc_value" -->
+					<input type="hidden" name="tag" value="<!-- TMPL_VAR name="tag" -->">
+					<input type="hidden" name="subfield" value="<!-- TMPL_VAR name="subfield" -->">
+					<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>
+			<!-- /tmpl_loop -->
 		<!-- /tmpl_loop -->
-	</table>
 	</div>
 	
 		<div name="hidden" id="hidden" class="tab">
-		<table class="noborder">
 		<!-- TMPL_LOOP name="hidden_loop" -->
-		<tr>
-			<td width="3%">&nbsp;</td>
-			<td width="2%"><b><!-- TMPL_VAR name="subfield" --></b></td>
-			<td width="55%" align="right"><!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR name="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></td>
-			<td width="40%">
-				<!-- TMPL_VAR name="marc_value" -->
 				<input type="hidden" name="tag" value="<!-- TMPL_VAR name="tag" -->">
 				<input type="hidden" name="subfield" value="<!-- TMPL_VAR name="subfield" -->">
 				<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" -->">
-			</td>
-		</tr>
 		<!-- /TMPL_LOOP -->
-		</table>
 		</div>
 		<!-- TMPL_IF name="oldbiblionumtagfield" -->
 			<input type="hidden" name="tag" value="<!-- TMPL_VAR name="oldbiblionumtagfield" -->">
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbooks.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbooks.tmpl
index efba53edb3..392be5114b 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbooks.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbooks.tmpl
@@ -20,10 +20,10 @@
 		<!-- TMPL_ELSE -->
 			<p>
 				<form action="addbiblio.pl" method="post">
-					<select name="itemtype">
+					<select name="frameworkcode">
 						<option value="">Default</option>
-						<!-- TMPL_LOOP name="itemtypeloop" -->
-							<option value="<!-- TMPL_VAR name="value" -->"><!-- TMPL_VAR name="description" --></option>
+						<!-- TMPL_LOOP name="frameworkcodeloop" -->
+							<option value="<!-- TMPL_VAR name="value" -->"><!-- TMPL_VAR name="frameworktext" --></option>
 						<!-- /TMPL_LOOP -->
 					</select>
 					<input type="submit" value="Create Empty biblio" class="button acquisition">
-- 
2.39.2