[Castore-commits] rechercheSimple.jsp 1.4 1.5 rechercheAvancee.jsp
1.6 1.7
Céline BENOIT
cbenoit at adullact1.hosting.cri74.org
Ven 1 Déc 16:01:17 CET 2006
Update of /cvsroot/castore/castore-struts-webapp/src/webapp/recherche
In directory adullact1:/tmp/cvs-serv14884/src/webapp/recherche
Modified Files:
rechercheSimple.jsp rechercheAvancee.jsp
Log Message:
Ajout de la gestion multifond tout en gardant la possibité de rester en recherche monofond
Index: rechercheAvancee.jsp
===================================================================
RCS file: /cvsroot/castore/castore-struts-webapp/src/webapp/recherche/rechercheAvancee.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** rechercheAvancee.jsp 16 Aug 2006 14:16:27 -0000 1.6
--- rechercheAvancee.jsp 1 Dec 2006 15:01:15 -0000 1.7
***************
*** 7,39 ****
<%session.setAttribute("pageEnCours", "rechercheAvanceePage");%>
! <div align="left"><nested:form action="/rechercherAvancee.do">
- <table width="650" border="0" cellpadding="0" cellspacing="0">
<tr>
! <td width="1">
! <div id="PuceListe"></div>
! </td>
! <td width="265"><font
! class="TextBase"><bean:message key="message.recherche.requette"/></font></td>
! <td width="216"><html:text name="rechercheAvanceeForm" property="requette" size="16" /></td>
! <td><IMG
! SRC="../images/GifTrans.gif" WIDTH="50" HEIGHT="20" ALT=""></td>
! </tr>
! <tr>
! <TD WIDTH="100%" COLSPAN="3" align="center"><html:submit property="choixRecherche">
! <bean:message key="message.rechercheAll.submit" />
! </html:submit></TD>
</tr>
- </table>
-
- <table width="713" border="0" cellpadding="0" cellspacing="0">
- <tr>
- <TD WIDTH="1" HEIGHT="20" COLSPAN="3"><IMG
- SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="20" ALT=""></TD>
- </tr>
<tr>
-
<td width="65%">
<table width="100%" border="0" cellpadding="0" cellspacing="0">
--- 7,21 ----
<%session.setAttribute("pageEnCours", "rechercheAvanceePage");%>
+ <div align="center"><nested:form action="/rechercherAvancee.do">
! <%-- tableau de champs sur la recherche avancée --%>
! <table width="713" border="0" cellpadding="0" cellspacing="0">
<tr>
! <td colspan="3" width="100%" height="20"><IMG
! SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="10" ALT=""></td>
</tr>
<tr>
<td width="65%">
<table width="100%" border="0" cellpadding="0" cellspacing="0">
***************
*** 41,44 ****
--- 23,27 ----
<TD WIDTH="1" HEIGHT="15" class="Couleur11"><IMG
SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="15" ALT=""></TD>
+ <%-- Titre Recherche Avancee + Lien vers le mode en recherche simple --%>
<TD WIDTH="100%" HEIGHT="15" class="Couleur10"><font
class="TitreBase"> <bean:message
***************
*** 46,50 ****
action="/rechercheSimple.do">
<bean:message key="message.recherche.lienModeSimple" />
! </html:link>
<TD WIDTH="1" HEIGHT="15" class="Couleur11"><IMG
SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="15" ALT=""></TD>
--- 29,33 ----
action="/rechercheSimple.do">
<bean:message key="message.recherche.lienModeSimple" />
! </html:link></TD>
<TD WIDTH="1" HEIGHT="15" class="Couleur11"><IMG
SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="15" ALT=""></TD>
***************
*** 85,95 ****
SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
</TR>
!
!
<logic:iterate id="element" name="rechercheAvanceeForm"
property="searchMap">
<bean:define id="mdKey" name="element" property="key" />
<bean:define id="mdValue" name="element" property="value" />
-
<TR>
<TD WIDTH="1" HEIGHT="1" class="Couleur11"><IMG
--- 68,77 ----
SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
</TR>
! <%-- ------------------------------------------------------------------------------------------ --%>
! <%-- Champs recherche avancees (puces + nom du champs + champs + aide) --%>
<logic:iterate id="element" name="rechercheAvanceeForm"
property="searchMap">
<bean:define id="mdKey" name="element" property="key" />
<bean:define id="mdValue" name="element" property="value" />
<TR>
<TD WIDTH="1" HEIGHT="1" class="Couleur11"><IMG
***************
*** 117,120 ****
--- 99,103 ----
</div>
</logic:notEmpty></div>
+
<div id="<%=mdKey.toString() + "CalqueSelect"%>"
style="position: absolute; margin-left: 0px; margin-top: -23px; visibility: hidden"><logic:notEmpty
***************
*** 154,158 ****
</logic:equal>
</logic:notEqual></td>
! <%--l 'aide--%>
<div class="bulle" id='<%=mdKey%>'><bean:write
name="rechercheAvanceeForm"
--- 137,142 ----
</logic:equal>
</logic:notEqual></td>
!
! <%-- Aide --%>
<div class="bulle" id='<%=mdKey%>'><bean:write
name="rechercheAvanceeForm"
***************
*** 176,187 ****
SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
</TR>
!
! </logic:iterate>
!
<TR>
<TD WIDTH="1" HEIGHT="1" class="Couleur11"><IMG
SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
! <TD WIDTH="100%" HEIGHT="5" class="FondTableau"><IMG
! SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="5" ALT=""></TD>
<TD WIDTH="1" HEIGHT="1" class="Couleur11"><IMG
SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
--- 160,169 ----
SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
</TR>
! </logic:iterate>
<TR>
<TD WIDTH="1" HEIGHT="1" class="Couleur11"><IMG
SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
! <TD WIDTH="100%" HEIGHT="1" class="Couleur1"><IMG
! SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
<TD WIDTH="1" HEIGHT="1" class="Couleur11"><IMG
SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
***************
*** 190,194 ****
--- 172,237 ----
</TR>
+ <TR>
+ <TD WIDTH="1" HEIGHT="1" class="Couleur11"><IMG
+ SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
+ <TD WIDTH="100%" HEIGHT="1" class="Couleur11"><IMG
+ SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
+ <TD WIDTH="1" HEIGHT="1" class="Couleur11"><IMG
+ SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
+ <TD WIDTH="1" HEIGHT="1" class="Couleur4"><IMG
+ SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
+ </TR>
+ <TR>
+ <TD WIDTH="1" HEIGHT="1"><IMG SRC="../images/GifTrans.gif"
+ WIDTH="1" HEIGHT="1" ALT=""></TD>
+ <TD WIDTH="100%" HEIGHT="1" COLSPAN="3" class="Couleur4"><IMG
+ SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
+ </TR>
+
+ <%-- ------------------------------------------------------------------------------------------ --%>
+ <%-- Liste à cocher des fonds de recherche possibles --%>
+ <nested:notEmpty property="listeRechercheMultifonds">
+ <%-- Saut de ligne --%>
+ <tr>
+ <TD WIDTH="1" HEIGHT="1" class="Couleur11"><IMG
+ SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
+ <TD WIDTH="100%" HEIGHT="5" class="FondTableau"><IMG
+ SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="5" ALT=""></TD>
+ <TD WIDTH="1" HEIGHT="1" class="Couleur11"><IMG
+ SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
+ <TD WIDTH="1" HEIGHT="1" class="Couleur4"><IMG
+ SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
+ </tr>
+ <%-- CheckBox --%>
+ <nested:iterate property="listeRechercheMultifonds"
+ type="org.apache.struts.util.LabelValueBean" id="labelValueBean">
+ <bean:define name="labelValueBean" property="value" id="idRequete" />
+ <TR>
+ <TD WIDTH="1" HEIGHT="1" class="Couleur11"><IMG
+ SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
+ <TD WIDTH="100%" class="FondTableau">
+ <TABLE WIDTH="100%" BORDER="0" CELLPADDING="0" CELLSPACING="0">
+ <tr>
+ <td width="40%"><IMG SRC="../images/GifTrans.gif" WIDTH="24"
+ HEIGHT="1" ALT=""></td>
+ <td width="100%" align="left">
+ <font class="TextBase">
+ <nested:define property="value" id="value" />
+ <html:checkbox property="listeRechercheFondsChoisis" value="<%=value.toString()%>" >
+ </html:checkbox>
+ <bean:message key="message.recherche.multifonds" />
+ <bean:write name="labelValueBean" property="label" />
+ </font>
+ </td>
+ </tr>
+ </TABLE>
+ </TD>
+ <TD WIDTH="1" HEIGHT="1" class="Couleur11"><IMG
+ SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
+ <TD WIDTH="1" HEIGHT="1" class="Couleur4"><IMG
+ SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
+ </TR>
+ </nested:iterate>
<TR>
<TD WIDTH="1" HEIGHT="1" class="Couleur11"><IMG
***************
*** 201,205 ****
SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
</TR>
-
<TR>
<TD WIDTH="1" HEIGHT="1" class="Couleur11"><IMG
--- 244,247 ----
***************
*** 218,221 ****
--- 260,265 ----
SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
</TR>
+ </nested:notEmpty>
+ <%-- ------------------------------------------------------------------------------------------ --%>
</table>
</td>
***************
*** 274,284 ****
SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
</TR>
!
!
!
!
!
!
!
<nested:notEmpty property="liensAnciennesRequetes">
<nested:iterate property="liensAnciennesRequetes"
--- 318,323 ----
SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
</TR>
! <%-- ------------------------------------------------------------------------------------------ --%>
! <%-- liens Anciennes Requetes --%>
<nested:notEmpty property="liensAnciennesRequetes">
<nested:iterate property="liensAnciennesRequetes"
***************
*** 304,307 ****
--- 343,347 ----
</nested:iterate>
</nested:notEmpty>
+
<nested:empty property="liensAnciennesRequetes">
<TR>
***************
*** 355,369 ****
<TD WIDTH="100%" HEIGHT="1" COLSPAN="4" class="Couleur4"><IMG
SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
! </TR>
</TABLE>
-
-
</td>
-
</tr>
<tr>
<TD WIDTH="1" HEIGHT="20" COLSPAN="3"><IMG
SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="20" ALT=""></TD>
! </tr>
<tr>
<TD WIDTH="100%" COLSPAN="3" align="center"><html:submit property="choixRecherche">
--- 395,408 ----
<TD WIDTH="100%" HEIGHT="1" COLSPAN="4" class="Couleur4"><IMG
SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
! </TR>
</TABLE>
</td>
</tr>
<tr>
<TD WIDTH="1" HEIGHT="20" COLSPAN="3"><IMG
SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="20" ALT=""></TD>
! </tr>
! <%-- ------------------------------------------------------------------------------------------ --%>
! <%-- Bouton Rechercher --%>
<tr>
<TD WIDTH="100%" COLSPAN="3" align="center"><html:submit property="choixRecherche">
***************
*** 371,375 ****
</html:submit></TD>
</tr>
!
<nested:equal property="showResult" value="true">
<tr>
--- 410,488 ----
</html:submit></TD>
</tr>
! <%-- ------------------------------------------------------------------------------------------ --%>
! <tr>
! <td colspan="3" width="100%" height="20"><IMG
! SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="10" ALT=""></td>
! </tr>
! <%-- ligne séparatrice blanche --%>
! <tr>
! <td width="80%" align="center" height="2" colspan="3" class="Couleur1"><IMG
! SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="2" ALT=""></td>
! </tr>
! <tr>
! <td colspan="3">
! <%-- tableau sur la recherche sur tous les champs --%>
! <table width="100%" border="0" cellpadding="0" cellspacing="0">
! <tr>
! <TD colspan="4" WIDTH="1" HEIGHT="20" COLSPAN="3"><IMG
! SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="20" ALT=""></TD>
! </tr>
! <tr>
! <td width="1">
! <div id="PuceListe"></div>
! </td>
! <td width="55%"><font class="TextBase"><bean:message key="message.recherche.requete"/></font></td>
! <td width="30%" align="center"><html:text name="rechercheAvanceeForm" property="requete" size="20" /></td>
!
! <td width="10%" align="center"><html:submit property="choixRecherche">
! <bean:message key="message.rechercheAll.submit" />
! </html:submit></td>
! </tr>
! <%-- ------------------------------------------------------------------------------------------ --%>
! <%-- Liste à cocher des fonds de recherche possibles --%>
! <nested:notEmpty property="listeRechercheMultifonds">
! <%-- Saut de ligne --%>
! <tr>
! <TD WIDTH="1" HEIGHT="1"><IMG
! SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
! <TD WIDTH="100%" HEIGHT="5"><IMG
! SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="5" ALT=""></TD>
! <TD WIDTH="1" HEIGHT="1"><IMG
! SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
! <TD WIDTH="1" HEIGHT="1"><IMG
! SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
! </tr>
! <%-- CheckBox --%>
! <nested:iterate property="listeRechercheMultifonds"
! type="org.apache.struts.util.LabelValueBean" id="labelValueBean">
! <bean:define name="labelValueBean" property="value" id="idRequete" />
! <TR>
! <TD WIDTH="1" HEIGHT="1"><IMG
! SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
! <TD WIDTH="1" HEIGHT="1"><IMG
! SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
! <TD WIDTH="100%" colspan="2">
! <TABLE WIDTH="100%" BORDER="0" CELLPADDING="0" CELLSPACING="0">
! <tr>
! <td width="100%" align="left">
! <font class="TextBase">
! <nested:define property="value" id="value" />
! <html:checkbox property="listeRechercheFondsChoisis" value="<%=value.toString()%>" >
! </html:checkbox>
! <bean:message key="message.recherche.multifonds" />
! <bean:write name="labelValueBean" property="label" />
! </font>
! </td>
! </tr>
! </TABLE>
! </TD>
! </TR>
! </nested:iterate>
! </nested:notEmpty>
! </table>
! </td>
! <tr>
! <%-- ------------------------------------------------------------------------------------------ --%>
! <%-- Resultats --%>
<nested:equal property="showResult" value="true">
<tr>
***************
*** 377,383 ****
SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="20" ALT=""></TD>
</tr>
<tr>
! <TD WIDTH="100%" HEIGHT="1" COLSPAN="3" class="Couleur1"><IMG
! SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
</tr>
<tr>
--- 490,497 ----
SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="20" ALT=""></TD>
</tr>
+ <%-- ligne séparatrice blanche --%>
<tr>
! <td width="80%" align="center" height="2" colspan="3" class="Couleur1"><IMG
! SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="2" ALT=""></td>
</tr>
<tr>
***************
*** 392,395 ****
--- 506,510 ----
</TR>
</nested:empty>
+
<nested:notEmpty property="resultat">
<TR>
***************
*** 500,503 ****
--- 615,619 ----
</TR>
</nested:notEmpty>
+
</nested:equal>
</table>
Index: rechercheSimple.jsp
===================================================================
RCS file: /cvsroot/castore/castore-struts-webapp/src/webapp/recherche/rechercheSimple.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** rechercheSimple.jsp 13 Jun 2006 16:26:10 -0000 1.4
--- rechercheSimple.jsp 1 Dec 2006 15:01:15 -0000 1.5
***************
*** 123,130 ****
SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
</TR>
<TR>
<TD WIDTH="1" HEIGHT="1" class="Couleur11"><IMG
SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
! <TD WIDTH="100%" class="FondTableau">
<TABLE WIDTH="100%" BORDER="0" CELLPADDING="0" CELLSPACING="0">
<tr>
--- 123,167 ----
SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
</TR>
+
+ <%-- Saut de ligne --%>
+ <tr>
+ <TD WIDTH="1" HEIGHT="1" class="Couleur11"><IMG
+ SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
+ <TD WIDTH="100%" HEIGHT="20" class="FondTableau"><IMG
+ SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="5" ALT=""></TD>
+ <TD WIDTH="1" HEIGHT="1" class="Couleur11"><IMG
+ SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
+ <TD WIDTH="1" HEIGHT="1" class="Couleur4"><IMG
+ SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
+ </tr>
+ <%-- ligne séparatrice blanche --%>
+ <tr>
+ <td width="1" align="center" height="1" class="Couleur11"><IMG
+ SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="2" ALT=""></td>
+ <td colspan="1" width="100%" align="center" height="2" class="Couleur1"><IMG
+ SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="2" ALT=""></td>
+ <td width="1" align="center" height="1" class="Couleur11"><IMG
+ SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="2" ALT=""></td>
+ <TD WIDTH="1" HEIGHT="1" class="Couleur4"><IMG
+ SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
+ </tr>
+ <%-- Saut de ligne --%>
+ <tr>
+ <TD WIDTH="1" HEIGHT="1" class="Couleur11"><IMG
+ SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
+ <TD WIDTH="100%" HEIGHT="5" class="FondTableau"><IMG
+ SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="5" ALT=""></TD>
+ <TD WIDTH="1" HEIGHT="1" class="Couleur11"><IMG
+ SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
+ <TD WIDTH="1" HEIGHT="1" class="Couleur4"><IMG
+ SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
+ </tr>
+
+
+ <%-- Recherche en plein texte --%>
<TR>
<TD WIDTH="1" HEIGHT="1" class="Couleur11"><IMG
SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
! <TD WIDTH="100%" class="FondTableau">
<TABLE WIDTH="100%" BORDER="0" CELLPADDING="0" CELLSPACING="0">
<tr>
***************
*** 144,149 ****
SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
</TR>
!
!
<TR>
<TD WIDTH="1" HEIGHT="1" class="Couleur11"><IMG
--- 181,251 ----
SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
</TR>
! <%-- ------------------------------------------------------------------------------------------ --%>
! <%-- Liste à cocher des fonds de recherche possibles --%>
! <nested:notEmpty property="listeRechercheMultifonds">
! <%-- Saut de ligne --%>
! <tr>
! <TD WIDTH="1" HEIGHT="1" class="Couleur11"><IMG
! SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
! <TD WIDTH="100%" HEIGHT="5" class="FondTableau"><IMG
! SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="5" ALT=""></TD>
! <TD WIDTH="1" HEIGHT="1" class="Couleur11"><IMG
! SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
! <TD WIDTH="1" HEIGHT="1" class="Couleur4"><IMG
! SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
! </tr>
! <%-- ligne séparatrice blanche --%>
! <tr>
! <td width="1" align="center" height="1" class="Couleur11"><IMG
! SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="2" ALT=""></td>
! <td colspan="1" width="100%" align="center" height="2" class="Couleur1"><IMG
! SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="2" ALT=""></td>
! <td width="1" align="center" height="1" class="Couleur11"><IMG
! SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="2" ALT=""></td>
! <TD WIDTH="1" HEIGHT="1" class="Couleur4"><IMG
! SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
! </tr>
! <%-- Saut de ligne --%>
! <tr>
! <TD WIDTH="1" HEIGHT="1" class="Couleur11"><IMG
! SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
! <TD WIDTH="100%" HEIGHT="5" class="FondTableau"><IMG
! SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="5" ALT=""></TD>
! <TD WIDTH="1" HEIGHT="1" class="Couleur11"><IMG
! SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
! <TD WIDTH="1" HEIGHT="1" class="Couleur4"><IMG
! SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
! </tr>
! <%-- CheckBox --%>
! <nested:iterate property="listeRechercheMultifonds"
! type="org.apache.struts.util.LabelValueBean" id="labelValueBean">
! <bean:define name="labelValueBean" property="value" id="idRequete" />
! <TR>
! <TD WIDTH="1" HEIGHT="1" class="Couleur11"><IMG
! SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
! <TD WIDTH="100%" class="FondTableau">
! <TABLE WIDTH="100%" BORDER="0" CELLPADDING="0" CELLSPACING="0">
! <tr>
! <td width="24"><IMG SRC="../images/GifTrans.gif" WIDTH="24"
! HEIGHT="1" ALT=""></td>
! <td width="100%" align="left">
! <font class="TextBase">
! <nested:define property="value" id="value" />
! <html:checkbox property="listeRechercheFondsChoisis" value="<%=value.toString()%>" >
! </html:checkbox>
! <bean:message key="message.recherche.multifonds" />
! <bean:write name="labelValueBean" property="label" />
! </font>
! </td>
! </tr>
! </TABLE>
! </TD>
! <TD WIDTH="1" HEIGHT="1" class="Couleur11"><IMG
! SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
! <TD WIDTH="1" HEIGHT="1" class="Couleur4"><IMG
! SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
! </TR>
! </nested:iterate>
! </nested:notEmpty>
<TR>
<TD WIDTH="1" HEIGHT="1" class="Couleur11"><IMG
***************
*** 156,161 ****
SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
</TR>
-
-
<TR>
<TD WIDTH="1" HEIGHT="1" class="Couleur11"><IMG
--- 258,261 ----
***************
*** 168,172 ****
SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
</TR>
-
<TR>
<TD WIDTH="1" HEIGHT="1" class="Couleur11"><IMG
--- 268,271 ----
***************
*** 189,193 ****
<td width="15"><IMG SRC="../images/GifTrans.gif" WIDTH="15"
HEIGHT="1" ALT=""></td>
! <td width="35%" valign="top">
<TABLE WIDTH="100%" BORDER="0" CELLPADDING="0" CELLSPACING="0">
<TR>
--- 288,294 ----
<td width="15"><IMG SRC="../images/GifTrans.gif" WIDTH="15"
HEIGHT="1" ALT=""></td>
! <td width="35%" valign="top">
! <%-- ------------------------------------------------------------------------------------------ --%>
! <%-- liens Anciennes Requetes --%>
<TABLE WIDTH="100%" BORDER="0" CELLPADDING="0" CELLSPACING="0">
<TR>
***************
*** 242,251 ****
</TR>
-
-
-
-
-
-
<nested:notEmpty property="liensAnciennesRequetes">
<nested:iterate property="liensAnciennesRequetes"
--- 343,346 ----
***************
*** 271,274 ****
--- 366,370 ----
</nested:iterate>
</nested:notEmpty>
+
<nested:empty property="liensAnciennesRequetes">
<TR>
***************
*** 295,299 ****
SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
</TR>
-
<TR>
<TD WIDTH="1" HEIGHT="1" class="Couleur11"><IMG
--- 391,394 ----
***************
*** 306,310 ****
SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="1" ALT=""></TD>
</TR>
-
<TR>
<TD WIDTH="1" HEIGHT="1" class="Couleur11"><IMG
--- 401,404 ----
***************
*** 324,329 ****
</TR>
</TABLE>
-
-
</td>
</tr>
--- 418,421 ----
***************
*** 332,335 ****
--- 424,429 ----
SRC="../images/GifTrans.gif" WIDTH="1" HEIGHT="20" ALT=""></TD>
</tr>
+ <%-- ------------------------------------------------------------------------------------------ --%>
+ <%-- Bouton Rechercher --%>
<tr>
<TD WIDTH="100%" COLSPAN="3" align="center"><html:submit>
***************
*** 337,341 ****
</html:submit></TD>
</tr>
!
<nested:equal property="showResult" value="true">
<tr>
--- 431,436 ----
</html:submit></TD>
</tr>
! <%-- ------------------------------------------------------------------------------------------ --%>
! <%-- Resultats --%>
<nested:equal property="showResult" value="true">
<tr>
***************
*** 353,368 ****
<nested:empty property="resultat">
! <TR>
! <TD WIDTH="100%" HEIGHT="1" COLSPAN="3" align="center"><font
! class="TextBase"><bean:message key="message.recherche.noResults" /></font></TD>
! </TR>
</nested:empty>
<nested:notEmpty property="resultat">
! <TR>
! <TD WIDTH="100%" HEIGHT="1" COLSPAN="3" align="center"><nested:size
id="nbOfResults" property="resultat" /><font class="TextBase"><bean:message
key="message.recherche.resultats"
! arg0="<%=nbOfResults.toString()%>" /></font></TD>
! </TR>
<tr>
<TD WIDTH="1" HEIGHT="20" COLSPAN="3"><IMG
--- 448,463 ----
<nested:empty property="resultat">
! <tr>
! <td WIDTH="100%" HEIGHT="1" COLSPAN="3" align="center"><font
! class="TextBase"><bean:message key="message.recherche.noResults" /></font></td>
! </tr>
</nested:empty>
<nested:notEmpty property="resultat">
! <tr>
! <td WIDTH="100%" HEIGHT="1" COLSPAN="3" align="center"><nested:size
id="nbOfResults" property="resultat" /><font class="TextBase"><bean:message
key="message.recherche.resultats"
! arg0="<%=nbOfResults.toString()%>" /></font></td>
! </tr>
<tr>
<TD WIDTH="1" HEIGHT="20" COLSPAN="3"><IMG
Plus d'informations sur la liste de diffusion Castore-commits