[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en newmember.tmpl,1.10,1.10.2.1 request.tmpl,1.10,1.10.2.1 thesaurus_popup.tmpl,1.4,1.4.2.1

[Paul POULAIN]

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

Modified Files:
      Tag: rel_2_0
	newmember.tmpl request.tmpl thesaurus_popup.tmpl 
Log Message:
TEMPLATE fixes.
Many fixes :
* replacing "X  Y" by "X Y" (2 spaces between 2 words by 1 only)
* updating some strings to ease translation.

ONLY FOR TRANSLATION PURPOSES.

Index: newmember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/newmember.tmpl,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -C2 -r1.10 -r1.10.2.1
*** newmember.tmpl	9 Dec 2003 10:28:58 -0000	1.10
--- newmember.tmpl	26 Jan 2004 10:46:35 -0000	1.10.2.1
***************
*** 96,100 ****
  			</td>
  			<td>
! 				<!-- TMPL_VAR Name="sex" -->
  			</td>
  		</tr>
--- 96,104 ----
  			</td>
  			<td>
! 				<!-- TMPL_IF Name="sex" -->
! 					Male
! 				<!-- TMPL_ELSE -->
! 					Female
! 				<!-- /TMPL_IF -->
  			</td>
  		</tr>
***************
*** 127,131 ****
  		<tr valign=top bgcolor="white" >
  			<td>
! 				<B>Phone (Home)</B>
  			</td>
  			<td>
--- 131,135 ----
  		<tr valign=top bgcolor="white" >
  			<td>
! 				<B>Phone home</B>
  			</td>
  			<td>
***************
*** 135,139 ****
  		<tr valign=top bgcolor="white" >
  			<td>
! 				<B>Phone (Daytime)</B>
  			</td>
  			<td>
--- 139,143 ----
  		<tr valign=top bgcolor="white" >
  			<td>
! 				<B>Phone daytime</B>
  			</td>
  			<td>
***************
*** 224,228 ****
  <!-- TMPL_ELSE -->
  	<h1>ERROR</H1>
! 	<p>The following  fields have a forbidden value. Please push the back button and try again : </p>
  	<!-- TMPL_IF name="cardnumber" -->
  		Cardnumber<br/>
--- 228,232 ----
  <!-- TMPL_ELSE -->
  	<h1>ERROR</H1>
! 	<p>The following fields have a forbidden value. Please push the back button and try again : </p>
  	<!-- TMPL_IF name="cardnumber" -->
  		Cardnumber<br/>

Index: request.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/request.tmpl,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -C2 -r1.10 -r1.10.2.1
*** request.tmpl	9 Dec 2003 10:28:58 -0000	1.10
--- request.tmpl	26 Jan 2004 10:46:35 -0000	1.10.2.1
***************
*** 2,6 ****
  
  <form action="placerequest.pl" method=post>
- <INPUT TYPE="image" name="submit"  VALUE="request" height=42  WIDTH=187 BORDER=0 src="<!-- TMPL_VAR name="themelang" -->/images/place-request.gif" align=right >
  <input type=hidden name=biblio value="<!-- TMPL_VAR Name="bib" -->">
  <input type=hidden name=type value=str8>
--- 2,5 ----
***************
*** 37,45 ****
  		<td><!-- TMPL_VAR name="CGIbranch" --></td>
  		<td>
! 			<input type=checkbox name=request value=any>Next Available,<br>(or choose from list below)
  		</td>
  	</tr>
  </table>
! 
  
  <TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
--- 36,44 ----
  		<td><!-- TMPL_VAR name="CGIbranch" --></td>
  		<td>
! 			<input type=checkbox name=request value=any>Next Available, or choose from list below
  		</td>
  	</tr>
  </table>
! <INPUT type="submit" value="request" class="button">
  
  <TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >

Index: thesaurus_popup.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/thesaurus_popup.tmpl,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** thesaurus_popup.tmpl	9 Dec 2003 10:28:58 -0000	1.4
--- thesaurus_popup.tmpl	26 Jan 2004 10:46:35 -0000	1.4.2.1
***************
*** 10,13 ****
--- 10,14 ----
  			<input type="text" name="search_string" value="<!-- TMPL_VAR name="search_string" -->">
  			<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
+ 			<input type="hidden" name="nohierarchy" value="<!-- TMPL_VAR name="nohierarchy" -->">
  			<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
  			<input type="hidden" name="op" value="search">
***************
*** 19,22 ****
--- 20,24 ----
  	<!-- TMPL_VAR name="select_list" -->
  	<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
+ 	<input type="hidden" name="nohierarchy" value="<!-- TMPL_VAR name="nohierarchy" -->">
  	<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
  	<input type="hidden" name="op" value="select">
***************
*** 28,31 ****
--- 30,34 ----
  	<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
  	<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
+ 	<input type="hidden" name="nohierarchy" value="<!-- TMPL_VAR name="nohierarchy" -->">
  	<input type="hidden" name="op" value="add">
  	insert a new authority : <input type="text" name="insert">