[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/authorities authorities.tmpl,1.9,1.10 detail.tmpl,1.4,1.5

[Paul POULAIN]

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

Modified Files:
	authorities.tmpl detail.tmpl 
Log Message:
synch'ing 2.2 and head

Index: authorities.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** authorities.tmpl	4 May 2005 08:52:51 -0000	1.9
--- authorities.tmpl	20 Jun 2005 14:17:04 -0000	1.10
***************
*** 4,8 ****
  <div class="tabbed">
  	<form method="post" name="f">
! 	<h1 class="authority">Authority number <!-- TMPL_VAR NAME="authid" --></h1>
  	<p>
  		<input type="hidden" name="op" value="add">
--- 4,12 ----
  <div class="tabbed">
  	<form method="post" name="f">
! 	<!-- TMPL_IF name="authid" -->
! 		<h1 class="authority">Modify authority #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)</h1>
! 	<!-- TMPL_ELSE -->
! 		<h1 class="authority">Adding authority (<!-- TMPL_VAR name="authtypetext" -->)</h1>
! 	<!-- /TMPL_IF -->
  	<p>
  		<input type="hidden" name="op" value="add">
***************
*** 21,28 ****
  <!-- TMPL_IF name="duplicateauthid" -->
  	<div class="problem">
! 		<p>Duplicate suspected with <a href='javascript:openWindow("detail.pl?authid=<!-- TMPL_VAR name="duplicateauthnumber" -->&popup=1", "Duplicate Authority")' class="button authority"><!-- TMPL_VAR name="duplicateauthvalue" --></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 Auth again)</p>
  			<p>Go to <a href="authorities.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->" >original authority</a></p>
  		</ul>
--- 25,32 ----
  <!-- TMPL_IF name="duplicateauthid" -->
  	<div class="problem">
! 		<p>Duplicate suspected with <a href='javascript:openWindow("detail.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->&popup=1", "Duplicate Authority")' class="button authority"><!-- TMPL_VAR name="duplicateauthvalue" --></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 <input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="button authority"> again)</p>
  			<p>Go to <a href="authorities.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->" >original authority</a></p>
  		</ul>
***************
*** 30,43 ****
  <!-- /TMPL_IF -->
  
- <!-- TMPL_IF name="duplicateauthnumber" -->
- 	<div class="problem">
- 		<p>Duplicate suspected with <a href='javascript:openWindow("detail.pl?authid=<!-- TMPL_VAR name="duplicateauthnumber" -->&popup=1", "Duplicate Authority")' class="button authority"><!-- TMPL_VAR name="duplicateauthvalue" --></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 Auth again)</p>
- 			<p>Go to <a href="authorities.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->" >edit items</a> from this duplicate Authority</p>
- 		</ul>
- 	</div>
- <!-- /TMPL_IF -->
  <!-- TMPL_LOOP NAME="0XX" -->
  	<!-- TMPL_IF name="tag" -->
--- 34,37 ----
***************
*** 185,190 ****
  
  function AddField(field) {
! 	document.forms[0].op.value = "addfield";
! 	document.forms[0].addfield_field.value=field;
  	document.f.submit();
  }
--- 179,184 ----
  
  function AddField(field) {
! 	document.forms[1].op.value = "addfield";
! 	document.forms[1].addfield_field.value=field;
  	document.f.submit();
  }

Index: detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/authorities/detail.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** detail.tmpl	4 May 2005 08:52:51 -0000	1.4
--- detail.tmpl	20 Jun 2005 14:17:04 -0000	1.5
***************
*** 2,6 ****
  <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
  <div class="tabbed">
! 	<h1 class="authority">Authority number : <!-- TMPL_VAR NAME="authid" --></h1>
  	<a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
  		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png">
--- 2,6 ----
  <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
  <div class="tabbed">
! 	<h1 class="authority">Authority #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)</h1>
  	<a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
  		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png">