From 88f7f51feb06da1077a62a39a50a3031c252e582 Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Thu, 24 Apr 2003 18:25:24 +0000
Subject: [PATCH] fix for #193

---
 .../opac-tmpl/default/en/opac-search.tmpl     | 157 ++++++++++--------
 .../opac-tmpl/default/fr/opac-search.tmpl     |  79 +++++----
 2 files changed, 138 insertions(+), 98 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/default/en/opac-search.tmpl b/koha-tmpl/opac-tmpl/default/en/opac-search.tmpl
index 751c7b4aca..0986394854 100644
--- a/koha-tmpl/opac-tmpl/default/en/opac-search.tmpl
+++ b/koha-tmpl/opac-tmpl/default/en/opac-search.tmpl
@@ -1,68 +1,89 @@
-<TMPL_INCLUDE NAME="opac-top.inc">
-
-<TMPL_IF NAME="loggedinuser">
-    <p align=left>Logged in as: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/opac-user.pl>Members Home</a>][<a href=/cgi-bin/koha/opac-main.pl?logout.x=1>Log Out</a>]</p>
-<TMPL_ELSE>
-    <p align=left><a href=/cgi-bin/koha/opac-user.pl>Log In</a> to Koha</p>
-</TMPL_IF>
-
-
-<CENTER>
-<FORM ACTION="/cgi-bin/koha/opac-searchresults.pl" method=get>
-<TABLE >
-
-<tr valign=top>
-<TD></td><td></td><td><INPUT TYPE="image"  src="<TMPL_VAR NAME='themelang'>/images/search-button.gif" alt="OK Start Search" width=164 height=44 border=0 >
-</td></tr>
-
-<TR VALIGN=TOP>
-<TD>Keywords</TD> <TD><INPUT TYPE="text"  SIZE="25"   NAME="keyword"></TD>
-</TD></TR>
-
-<TR VALIGN=TOP>
-<TD>Title</TD> <TD><INPUT TYPE="text"  SIZE="25"   NAME="title"></TD>
-<td><input type=radio name=ttype value=normal checked>Normal<input
-type=radio name=ttype value=exact>Exact</td>
-</TR>
-
-<TR VALIGN=TOP> 
-<TD>Author</TD> <TD><INPUT TYPE="text"  SIZE="25"   NAME="author"></TD></TR>
-
-<TR VALIGN=TOP> 
-<TD>Illustrator</TD> <TD><INPUT TYPE="text"  SIZE="25"   NAME="illustrator"></TD></TR>
-
-<TR VALIGN=TOP>
-<TD>Subject</TD> <TD><INPUT TYPE="text"  SIZE="25"   NAME="subject"></TD></TR>
-
-<td>Class</td>
-  <td>
-    <select size="1"  name="class">
-    <option value="">Any
-    <!-- fetch class list -->
-    <TMPL_VAR name="classlist">
-    <!--#include virtual="/includes/cat-class-list.inc" -->
-    </select>
- </td>
-</tr>
-
-<!-- <TD>Pub Date (before)</TD> <TD><INPUT TYPE="text"  SIZE="8"   NAME="date-before"> &nbsp; &nbsp; (after) <INPUT TYPE="text"  SIZE="8"   NAME="date-after"></TD></TR>
--->
-<TR VALIGN=TOP>
-<TD>Barcode</TD> <TD><INPUT TYPE="text"  SIZE="25"   NAME="itemnumber"></TD></TR>
-
-<!-- <TR VALIGN=TOP>
-<TD>ISBN</TD> <TD><INPUT TYPE="text"  SIZE="25"   NAME="isbn"></TD></TR>
--->
-</TR>
-
-<TR VALIGN=TOP>
-<td></td>
-<TD><font size=4 face="arial,helvetica">
-<INPUT TYPE="reset"  value="Clear All Fields"></font></td></tr>
-
-</TABLE>
-</FORM>
-</CENTER>
-
-
-<TMPL_INCLUDE NAME="opac-bottom.inc">
+<TMPL_INCLUDE NAME="opac-top.inc">
+
+<TMPL_IF NAME="loggedinuser">
+    <p align=left>Logged in as: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/opac-user.pl>Members Home</a>][<a href=/cgi-bin/koha/opac-main.pl?logout.x=1>Log Out</a>]</p>
+<TMPL_ELSE>
+    <p align=left><a href=/cgi-bin/koha/opac-user.pl>Log In</a> to Koha</p>
+</TMPL_IF>
+
+
+<CENTER>
+<FORM ACTION="/cgi-bin/koha/opac-searchresults.pl" method=get>
+<TABLE >
+
+<tr valign=top>
+	<TD></td>
+	<td></td>
+	<td><INPUT TYPE="image"  src="<TMPL_VAR NAME='themelang'>/images/search-button.gif" alt="OK Start Search" width=164 height=44 border=0 ></td>
+</tr>
+
+<TR VALIGN=TOP>
+	<TD>Keywords</TD>
+	<TD><INPUT TYPE="text"  SIZE="25"   NAME="keyword"></TD>
+	<td></TD>
+</TR>
+
+<TR VALIGN=TOP>
+	<TD colspan=3><B>OR one or more from :</B></TD>
+<td></TD></TR>
+
+<TR VALIGN=TOP>
+	<TD>Title</TD>
+	<TD><INPUT TYPE="text"  SIZE="25"   NAME="title"></TD>
+	<td><input type=radio name=ttype value=normal checked>Normal<input type=radio name=ttype value=exact>Exact</td>
+</TR>
+
+<TR VALIGN=TOP>
+	<TD>Author</TD>
+	<TD><INPUT TYPE="text"  SIZE="25"   NAME="author"></TD>
+	<td></td>
+</TR>
+
+<TR VALIGN=TOP>
+	<TD>Illustrator</TD>
+	<TD><INPUT TYPE="text"  SIZE="25"   NAME="illustrator"></TD>
+	<td></td>
+</TR>
+
+<TR VALIGN=TOP>
+	<TD>Subject</TD>
+	<TD><INPUT TYPE="text"  SIZE="25"   NAME="subject"></TD>
+	<td></td>
+</TR>
+
+<tr>
+<td>Class</td>
+	<td>
+	<select size="1"  name="class">
+	<option value="">Any
+	<!-- fetch class list -->
+	<TMPL_VAR name="classlist">
+	<!--#include virtual="/includes/cat-class-list.inc" -->
+	</select>
+	</td>
+	<td></td>
+</tr>
+
+<TR VALIGN=TOP>
+	<TD>Barcode</TD>
+	<TD><INPUT TYPE="text"  SIZE="25"   NAME="itemnumber"></TD>
+	<td></td>
+</TR>
+
+<TR VALIGN=TOP>
+	<td></td>
+	<TD><font size=4 face="arial,helvetica"><INPUT TYPE="reset"  value="Clear All Fields"></font></td>
+	<td></td>
+</tr>
+
+<TR VALIGN=TOP>
+	<TD colspan=3>Note that if you enter a value in Keyword and a value somewhere else, only keyword will be used</TD>
+</TD></TR>
+
+</TABLE>
+
+</FORM>
+</CENTER>
+
+
+<TMPL_INCLUDE NAME="opac-bottom.inc">
diff --git a/koha-tmpl/opac-tmpl/default/fr/opac-search.tmpl b/koha-tmpl/opac-tmpl/default/fr/opac-search.tmpl
index ad6cd4ab2e..45097d35b7 100755
--- a/koha-tmpl/opac-tmpl/default/fr/opac-search.tmpl
+++ b/koha-tmpl/opac-tmpl/default/fr/opac-search.tmpl
@@ -12,53 +12,72 @@
 <TABLE >
 
 <tr valign=top>
-<TD></td><td></td><td><INPUT TYPE="image"  src="<TMPL_VAR NAME='themelang'>/images/search-button.gif" alt="OK Start Search" width=164 height=44 border=0 >
-</td></tr>
+	<TD></td>
+	<td></td>
+	<td><INPUT TYPE="image"  src="<TMPL_VAR NAME='themelang'>/images/search-button.gif" alt="Lancer recherche" width=164 height=44 border=0 ></td>
+</tr>
 
 <TR VALIGN=TOP>
-<TD>Mots clefs</TD> <TD><INPUT TYPE="text"  SIZE="25"   NAME="keyword"></TD>
-</TD></TR>
+	<TD>Mots clefs</TD>
+	<TD><INPUT TYPE="text"  SIZE="25"   NAME="keyword"></TD>
+	<td></td>
+</TR>
+<TR VALIGN=TOP>
+	<TD colspan=3><B>OU autres critères (plusieurs possibles) :</B></TD>
+<td></TD></TR>
 
 <TR VALIGN=TOP>
-<TD>Titre</TD> <TD><INPUT TYPE="text"  SIZE="25"   NAME="title"></TD>
-<td><input type=radio name=ttype value=normal checked>Normal<input
-type=radio name=ttype value=exact>Exact</td>
+	<TD>Titre</TD>
+	<TD><INPUT TYPE="text"  SIZE="25"   NAME="title"></TD>
+	<td><input type=radio name=ttype value=normal checked>Normal<input type=radio name=ttype value=exact>Exact</td>
 </TR>
 
 <TR VALIGN=TOP>
-<TD>Auteur</TD> <TD><INPUT TYPE="text"  SIZE="25"   NAME="author"></TD></TR>
+	<TD>Auteur</TD>
+	<TD><INPUT TYPE="text"  SIZE="25"   NAME="author"></TD>
+	<td></td>
+</TR>
 
 <TR VALIGN=TOP>
-<TD>Illustrateur</TD> <TD><INPUT TYPE="text"  SIZE="25"   NAME="illustrator"></TD></TR>
+	<TD>Illustrateur</TD>
+	<TD><INPUT TYPE="text"  SIZE="25"   NAME="illustrator"></TD>
+	<td></td>
+</TR>
 
 <TR VALIGN=TOP>
-<TD>Sujet</TD> <TD><INPUT TYPE="text"  SIZE="25"   NAME="subject"></TD></TR>
-
-<td>Classe</td>
-  <td>
-    <select size="1"  name="class">
-    <option value="">Toutes
-    <!-- fetch class list -->
-    <TMPL_INCLUDE NAME="cat-class-list.inc">
-    <!--#include virtual="/includes/cat-class-list.inc" -->
-    </select>
- </td>
+	<TD>Sujet</TD>
+	<TD><INPUT TYPE="text"  SIZE="25"   NAME="subject"></TD>
+	<td></td>
+</TR>
+
+<tr>
+	<td>Classe</td>
+	<td>
+		<select size="1"  name="class">
+		<option value="">Toutes
+		<!-- fetch class list -->
+		<TMPL_INCLUDE NAME="cat-class-list.inc">
+		<!--#include virtual="/includes/cat-class-list.inc" -->
+		</select>
+	</td>
+	<td></td>
 </tr>
 
-<!-- <TD>Pub Date (before)</TD> <TD><INPUT TYPE="text"  SIZE="8"   NAME="date-before"> &nbsp; &nbsp; (after) <INPUT TYPE="text"  SIZE="8"   NAME="date-after"></TD></TR>
--->
 <TR VALIGN=TOP>
-<TD>Numéro d'exemplaire</TD> <TD><INPUT TYPE="text"  SIZE="25"   NAME="itemnumber"></TD></TR>
-
-<!-- <TR VALIGN=TOP>
-<TD>ISBN</TD> <TD><INPUT TYPE="text"  SIZE="25"   NAME="isbn"></TD></TR>
--->
+	<TD>Numéro d'exemplaire</TD>
+	<TD><INPUT TYPE="text"  SIZE="25"   NAME="itemnumber"></TD>
+	<td></td>
 </TR>
 
 <TR VALIGN=TOP>
-<td></td>
-<TD><font size=4 face="arial,helvetica">
-<INPUT TYPE="reset"  value="Clear All Fields"></font></td></tr>
+	<td></td>
+	<TD><font size=4 face="arial,helvetica"><INPUT TYPE="reset"  value="Clear All Fields"></font></td>
+	<td></td>
+</tr>
+
+<TR VALIGN=TOP>
+	<TD colspan=3>Notez que si vous entrez un mot clef et une valeur dans une autre zone, seul le mot clef sera utilisé.</TD>
+</TD></TR>
 
 </TABLE>
 </FORM>
-- 
2.39.5