From 80d59a7ca27b3232b5c99f48146f452a0bb03ae7 Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Tue, 10 Dec 2002 13:42:35 +0000
Subject: [PATCH] fugfixes from Dombes Abbey work

---
 .../default/en/acqui.simple/addbiblio.tmpl    | 53 ++++++++++---------
 .../default/en/acqui.simple/addbooks.tmpl     |  6 +++
 .../default/en/acqui.simple/additem.tmpl      | 18 ++++++-
 3 files changed, 51 insertions(+), 26 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 bb22ccd09f..26a32cdc08 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl
@@ -2,9 +2,9 @@
 
 <STYLE TYPE="text/css" MEDIA=screen>
 	table {	font-family:Arial;
-	font-weight:normal;	
+	font-weight:normal;
 	text-decoration:none;
-	font-size:12pt;}
+	font-size:10pt;}
 </STYLE>
 
 <form method="post" name="f">
@@ -28,7 +28,7 @@
 		<td width=9% align="center"><a href="javascript:active(9)"><div id="link9">9</div></a></td>
 		<td width=10% align="center"><input type="hidden" name="op" value="addbiblio">
 												<input type="hidden" name="oldbiblionumber" value="<TMPL_VAR name="oldbiblionumber">">
-												<input type="button" value=">>> items" onClick='Check(this.form)'>
+												<input type="button" value="items" onClick='Check(this.form)' accesskey="w">
 		</td>
 	</tr>
 	</table>
@@ -43,7 +43,7 @@
 	<tr>
 		<td width="3%">&nbsp;</td>
 		<td width="2%"><b><TMPL_VAR name="subfield"></b></td>
-		<td width="55%"><TMPL_IF name="mandatory"><b></TMPL_IF><TMPL_VAR name="marc_lib"><TMPL_IF name="mandatory"></b></TMPL_IF></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">">
@@ -57,14 +57,14 @@
 		</DIV>
 
 	<DIV name="1XX" id="1XX" style="position:absolute;left:40px;top:150px;visibility:hidden;width:90%">
-	<table width=100%  cellspacing=0 cellpadding=5 border=0>
+	<table width=100%  cellspacing=0 cellpadding=1 border=0>
 	<TMPL_LOOP name="1XX">
 	<tr background="/images/background-mem.gif"><td colspan=4><b><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"></td></tr>
 	<TMPL_LOOP name="subfield_loop">
 	<tr>
 		<td width="3%">&nbsp;</td>
 		<td width="2%"><b><TMPL_VAR name="subfield"></b></td>
-		<td width="55%"><TMPL_IF name="mandatory"><b></TMPL_IF><TMPL_VAR name="marc_lib"><TMPL_IF name="mandatory"></b></TMPL_IF></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">">
@@ -78,14 +78,14 @@
      </DIV>
 
 	<DIV name="2XX" id="2XX" style="position:absolute;left:40px;top:150px;visibility:hidden;width:90%">
-	<table width=100% cellspacing=0 cellpadding=5  border=0>
+	<table width=100% cellspacing=0 cellpadding=2  border=0>
 	<TMPL_LOOP name="2XX">
 	<tr background="/images/background-mem.gif"><td colspan=4><b><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"></td></tr>
 	<TMPL_LOOP name="subfield_loop">
 	<tr>
 		<td width="3%">&nbsp;</td>
 		<td width="2%"><b><TMPL_VAR name="subfield"></b></td>
-		<td width="55%"><TMPL_IF name="mandatory"><b></TMPL_IF><TMPL_VAR name="marc_lib"><TMPL_IF name="mandatory"></b></TMPL_IF></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">">
@@ -99,14 +99,14 @@
 	</DIV>
 
 	<DIV name="3XX" id="3XX" style="position:absolute;left:40px;top:150px;visibility:hidden;width:90%">
-	<table width=100% cellspacing=0 cellpadding=5  border=0>
+	<table width=100% cellspacing=0 cellpadding=2  border=0>
 	<TMPL_LOOP name="3XX">
 	<tr background="/images/background-mem.gif"><td colspan=4><b><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"></td></tr>
 	<TMPL_LOOP name="subfield_loop">
 	<tr>
 		<td width="3%">&nbsp;</td>
 		<td width="2%"><b><TMPL_VAR name="subfield"></b></td>
-		<td width="55%"><TMPL_IF name="mandatory"><b></TMPL_IF><TMPL_VAR name="marc_lib"><<TMPL_IF name="mandatory"></b></TMPL_IF>/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">">
@@ -120,14 +120,14 @@
 	</DIV>
 
 	<DIV name="4XX" id="4XX" style="position:absolute;left:40px;top:150px;visibility:hidden;width:90%">
-	<table width=100%  cellspacing=0 cellpadding=5 border=0>
+	<table width=100%  cellspacing=0 cellpadding=2 border=0>
 	<TMPL_LOOP name="4XX">
 	<tr background="/images/background-mem.gif"><td colspan=4><b><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"></td></tr>
 	<TMPL_LOOP name="subfield_loop">
 	<tr>
 		<td width="3%">&nbsp;</td>
 		<td width="2%"><b><TMPL_VAR name="subfield"></b></td>
-		<td width="55%"><TMPL_IF name="mandatory"><b></TMPL_IF><TMPL_VAR name="marc_lib"><TMPL_IF name="mandatory"></b></TMPL_IF></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">">
@@ -141,14 +141,14 @@
 	</DIV>
 
 	<DIV name="5XX" id="5XX" style="position:absolute;left:40px;top:150px;visibility:hidden;width:90%">
-	<table width=100% cellspacing=0 cellpadding=5  border=0>
+	<table width=100% cellspacing=0 cellpadding=2  border=0>
 	<TMPL_LOOP name="5XX">
 	<tr background="/images/background-mem.gif"><td colspan=4><b><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"></td></tr>
 	<TMPL_LOOP name="subfield_loop">
 	<tr>
 		<td width="3%">&nbsp;</td>
 		<td width="2%"><b><TMPL_VAR name="subfield"></b></td>
-		<td width="55%"><TMPL_IF name="mandatory"><b></TMPL_IF><TMPL_VAR name="marc_lib"><TMPL_IF name="mandatory"></b></TMPL_IF></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">">
@@ -162,14 +162,14 @@
 	</DIV>
 
 	<DIV name="6XX" id="6XX" style="position:absolute;left:40px;top:150px;visibility:hidden;width:90%">
-	<table width=90% cellspacing=0 cellpadding=5  border=0>
+	<table width=90% cellspacing=0 cellpadding=2  border=0>
 	<TMPL_LOOP name="6XX">
 	<tr background="/images/background-mem.gif"><td colspan=4><b><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"></td></tr>
 	<TMPL_LOOP name="subfield_loop">
 	<tr>
 		<td width="3%">&nbsp;</td>
 		<td width="2%"><b><TMPL_VAR name="subfield"></b></td>
-		<td width="55%"><TMPL_IF name="mandatory"><b></TMPL_IF><TMPL_VAR name="marc_lib"><TMPL_IF name="mandatory"></b></TMPL_IF></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">">
@@ -183,14 +183,14 @@
 	</DIV>
 
 	<DIV name="7XX" id="7XX" style="position:absolute;left:40px;top:150px;visibility:hidden;width:90%">
-	<table width=100%  cellspacing=0 cellpadding=5 border=0>
+	<table width=100%  cellspacing=0 cellpadding=2 border=0>
 	<TMPL_LOOP name="7XX">
 	<tr background="/images/background-mem.gif"><td colspan=4><b><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"></td></tr>
 	<TMPL_LOOP name="subfield_loop">
 	<tr>
 		<td width="3%">&nbsp;</td>
 		<td width="2%"><b><TMPL_VAR name="subfield"></b></td>
-		<td width="55%"><TMPL_IF name="mandatory"><b></TMPL_IF><TMPL_VAR name="marc_lib"><TMPL_IF name="mandatory"></b></TMPL_IF></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">">
@@ -204,14 +204,14 @@
 	</DIV>
 
 	<DIV name="8XX" id="8XX" style="position:absolute;left:40px;top:150px;visibility:hidden;width:90%">
-	<table width=100% cellspacing=0 cellpadding=5  border=0>
+	<table width=100% cellspacing=0 cellpadding=2  border=0>
 	<TMPL_LOOP name="8XX">
 	<tr background="/images/background-mem.gif"><td colspan=4><b><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"></td></tr>
 	<TMPL_LOOP name="subfield_loop">
 	<tr>
 		<td width="3%">&nbsp;</td>
 		<td width="2%"><b><TMPL_VAR name="subfield"></b></td>
-		<td width="55%"><TMPL_IF name="mandatory"><b></TMPL_IF><TMPL_VAR name="marc_lib"><TMPL_IF name="mandatory"></b></TMPL_IF></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">">
@@ -225,14 +225,14 @@
 	</DIV>
 
 	<DIV name="9XX" id="9XX" style="position:absolute;left:40px;top:150px;visibility:hidden;width:90%">
-	<table width=90% cellspacing=0 cellpadding=5  border=0>
+	<table width=90% cellspacing=0 cellpadding=2  border=0>
 	<TMPL_LOOP name="9XX">
 	<tr background="/images/background-mem.gif"><td colspan=4><b><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"></td></tr>
 	<TMPL_LOOP name="subfield_loop">
 	<tr>
 		<td width="3%">&nbsp;</td>
 		<td width="2%"><b><TMPL_VAR name="subfield"></b></td>
-		<td width="55%"><TMPL_IF name="mandatory"><b></TMPL_IF><TMPL_VAR name="marc_lib"><TMPL_IF name="mandatory"></b></TMPL_IF></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">">
@@ -246,12 +246,12 @@
 	</DIV>
 
 	<DIV name="hidden" id="hidden" style="position:absolute;left:40px;top:150px;visibility:hidden;width:90%">
-	<table width=90% cellspacing=0 cellpadding=5  border=0>
+	<table width=90% cellspacing=0 cellpadding=2  border=0>
 	<TMPL_LOOP name="hidden_loop">
 	<tr>
 		<td width="3%">&nbsp;</td>
 		<td width="2%"><b><TMPL_VAR name="subfield"></b></td>
-		<td width="55%"><TMPL_IF name="mandatory"><b></TMPL_IF><TMPL_VAR name="marc_lib"><TMPL_IF name="mandatory"></b></TMPL_IF></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">">
@@ -262,6 +262,11 @@
 	</TMPL_LOOP>
 	</table>
 	</DIV>
+	<TMPL_IF name="oldbiblionumtagfield">
+		<input type="hidden" name="tag" value="<TMPL_VAR name="oldbiblionumtagfield">">
+		<input type="hidden" name="subfield" value="<TMPL_VAR name="oldbiblionumtagsubfield">">
+		<input type="hidden" name="field_value" value="<TMPL_VAR name="oldbiblionumber">">
+	</TMPL_IF>
 </form>
 
 
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 001c387437..acb15a2a94 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbooks.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbooks.tmpl
@@ -1,5 +1,11 @@
 <TMPL_INCLUDE NAME="acquisitions-top.inc">
 
+<TMPL_IF NAME="loggedinuser">
+	<p align=left>Logged in as: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>
+<TMPL_ELSE>
+    <p align=left><a href=/cgi-bin/koha/userpage.pl>Log In</a> to Koha</p>
+</TMPL_IF>
+
 <font size="5"><em>MARC import and BIBLIO management</em></font>
 <TMPL_IF name="noitemsfound">
 	<p />
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl
index d5067421e8..44d14efdf2 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl
@@ -1,4 +1,11 @@
 <TMPL_INCLUDE NAME="acquisitions-top.inc">
+<STYLE TYPE="text/css" MEDIA=screen>
+	table {	font-family:Arial;
+	font-weight:normal;
+	text-decoration:none;
+	font-size:10pt;}
+</STYLE>
+
 <form method="post" action="additem.pl">
 <table width=100% cellspacing=0 cellpadding=5 border=1>
 <tr background="/images/background-mem.gif">
@@ -52,7 +59,7 @@
 	<tr  background="/images/background-mem.gif">
 		<th>New Item</th>
 	</tr>
-</table><table width=100%  cellspacing=0 cellpadding=5 border=0>
+</table><table width=100%  cellspacing=0 cellpadding=1 border=0>
 	<TMPL_LOOP name="item">
 	<tr>
 		<td width="3%">&nbsp;</td>
@@ -66,8 +73,15 @@
 	</tr>
 	</tmpl_loop>
 </table>
+<input type="hidden" name="tag" value="<TMPL_VAR name="itemtagfield">">
+<input type="hidden" name="subfield" value="<TMPL_VAR name="itemtagsubfield">">
+<input type="hidden" name="field_value" value="<TMPL_VAR name="itemnum">">
 <input type="hidden" name="itemnum" value="<TMPL_VAR name="itemnum">">
-<input type="submit" value=">>> Enter item">
+<TMPL_IF name="opisadd">
+<input type="submit" value="Add item">
+<TMPL_ELSE>
+<input type="submit" value="Modify item">
+</TMPL_IF>
 </center>
 </form>
 
-- 
2.39.5