[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/authorities auth_finder.tmpl,1.7,1.8 authorities.tmpl,1.8,1.9 detail.tmpl,1.3,1.4 searchresultlist-auth.tmpl,1.6,1.7

[Paul POULAIN]

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

Modified Files:
	auth_finder.tmpl authorities.tmpl detail.tmpl 
	searchresultlist-auth.tmpl 
Log Message:
synch'ing 2.2 and head

Index: auth_finder.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/authorities/auth_finder.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** auth_finder.tmpl	1 Mar 2005 13:40:52 -0000	1.7
--- auth_finder.tmpl	4 May 2005 08:52:51 -0000	1.8
***************
*** 21,26 ****
  			<input type="hidden" name="excluding" value="">
  			<select name="operator">
- 				<option value="contains">contains</option>
  				<option value="start">start by</option>
  			</select>
  			<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
--- 21,26 ----
  			<input type="hidden" name="excluding" value="">
  			<select name="operator">
  				<option value="start">start by</option>
+ 				<option value="contains">contains</option>
  			</select>
  			<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">

Index: authorities.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** authorities.tmpl	5 Apr 2005 15:23:40 -0000	1.8
--- authorities.tmpl	4 May 2005 08:52:51 -0000	1.9
***************
*** 19,22 ****
--- 19,32 ----
  
  <br><br><br><br><br><br><br><br><br><br><br>
+ <!-- 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>
+ 	</div>
+ <!-- /TMPL_IF -->
  
  <!-- TMPL_IF name="duplicateauthnumber" -->

Index: detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/authorities/detail.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** detail.tmpl	4 Nov 2004 17:10:36 -0000	1.3
--- detail.tmpl	4 May 2005 08:52:51 -0000	1.4
***************
*** 37,43 ****
  
  function confirm_deletion() {
! 	var is_confirmed = confirm('Are you sure you want to delete this biblio?');
  	if (is_confirmed) {
! 		window.location="acqui.simple/addbiblio.pl?op=delete&amp;bibid=<!-- TMPL_VAR NAME="bibid" -->";
  	}
  }
--- 37,43 ----
  
  function confirm_deletion() {
! 	var is_confirmed = confirm('Are you sure you want to delete this authority?');
  	if (is_confirmed) {
! 		window.location="authorities-home.pl?op=delete&amp;authid=<!-- TMPL_VAR NAME="authid" -->";
  	}
  }

Index: searchresultlist-auth.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** searchresultlist-auth.tmpl	1 Mar 2005 13:40:52 -0000	1.6
--- searchresultlist-auth.tmpl	4 May 2005 08:52:51 -0000	1.7
***************
*** 20,25 ****
  					<input type="hidden" name="excluding" value="">
  					<select name="operator">
- 						<option value="contains">contains</option>
  						<option value="start">start by</option>
  					</select>
  					<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
--- 20,25 ----
  					<input type="hidden" name="excluding" value="">
  					<select name="operator">
  						<option value="start">start by</option>
+ 						<option value="contains">contains</option>
  					</select>
  					<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">