[Castore-commits] choixDocument.jsp 1.6 1.7
Céline BENOIT
cbenoit at adullact1.hosting.cri74.org
Jeu 17 Aou 10:35:13 CEST 2006
Update of /cvsroot/castore/castore-struts-webapp/src/webapp/validation
In directory adullact1:/tmp/cvs-serv9929/src/webapp/validation
Modified Files:
choixDocument.jsp
Log Message:
modification de la mise en page du choix des doc en attente/en cours de validation pour les admin.
Index: choixDocument.jsp
===================================================================
RCS file: /cvsroot/castore/castore-struts-webapp/src/webapp/validation/choixDocument.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** choixDocument.jsp 4 Aug 2006 17:33:07 -0000 1.6
--- choixDocument.jsp 17 Aug 2006 08:35:11 -0000 1.7
***************
*** 67,73 ****
<td width="5%"><img src="../images/GifTrans.gif" width="1" height="1"
alt=""></td>
-
<td width="90%">
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
<td width="100%">
--- 67,305 ----
<td width="5%"><img src="../images/GifTrans.gif" width="1" height="1"
alt=""></td>
<td width="90%">
<table width="100%" border="0" cellpadding="0" cellspacing="0">
+ <!-- presentation des infos ci dessous si c'est un admin de connecté -->
+ <logic:equal value="administrator" name="userProfil">
+ <tr>
+ <td width="100%"><!-- Les documents qui nécessitent l'intervention de l'admin -->
+ <table width="100%" border="0" cellpadding="0" cellspacing="0">
+ <tr>
+ <td width="100%">
+ <table width="100%" border="0" cellpadding="0" cellspacing="0">
+ <tr>
+ <td width="100%" height="1" colspan="3" class="Couleur11"><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>
+ <tr>
+ <td width="1" height="25" class="Couleur11"><img
+ src="../images/GifTrans.gif" width="1" height="25" alt=""></td>
+ <td width="100%" height="15" class="Couleur10" valign="middle"><font
+ class="TitreBase"><bean:message
+ key="documents.validationByAdmin" /></font></td>
+ <td width="1" height="15" class="Couleur11"><img
+ src="../images/GifTrans.gif" width="1" height="15" alt=""></td>
+ <td width="1" height="15" class="Couleur4"><img
+ src="../images/GifTrans.gif" width="1" height="15" 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%" height="1" class="Couleur12"><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>
+ <logic:empty name="recupDocForm" property="waitingAdminDocs">
+ <tr>
+ <td width="1" height="1" class="Couleur11"><img
+ src="../images/GifTrans.gif" width="1" height="1" alt=""></td>
+ <td width="100%" height="25" valign="middle"
+ class="FondTableau"><font class="TextBase"><bean:message
+ key="no.current.waitingAdminDocs" /></font></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>
+ </logic:empty>
+ <logic:notEmpty name="recupDocForm" property="waitingAdminDocs">
+ <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="FondTableau"><%-- Tableau 3 --%>
+ <table width="100%" border="0" cellpadding="0" cellspacing="0">
+ <tr>
+ <td width="25%" height="50" align="center" valign="middle"><font
+ class="InstructionBase"><bean:message key="documents.title" /></font></td>
+ <td width="2" height="100%" class="Couleur1"><img
+ src="../images/GifTrans.gif" width="2" alt=""></td>
+ <td width="25%" align="center" valign="middle"><font
+ class="InstructionBase"><bean:message
+ key="documents.waiting.submitterName" /></font></td>
+ <td width="2" height="100%" class="Couleur1"><img
+ src="../images/GifTrans.gif" width="2" alt=""></td>
+ <td width="25%" align="center" valign="middle"><font
+ class="InstructionBase"><bean:message
+ key="documents.docType" /></font></td>
+ <td width="2" height="100%" class="Couleur1"><img
+ src="../images/GifTrans.gif" width="2" alt=""></td>
+ <td width="20%" align="center" valign="middle"><font
+ class="InstructionBase"><bean:message
+ key="documents.validerDoc" /></font></td>
+ <td width="2" height="100%" class="Couleur1"><img
+ src="../images/GifTrans.gif" width="2" alt=""></td>
+ <td width="5%" align="center" valign="middle"><font
+ class="InstructionBase"><bean:message
+ key="documents.etapeEnCours" /></font></td>
+ </tr>
+ <tr>
+ <td colspan="9" width="100%" height="2" class="Couleur1"><img
+ src="../images/GifTrans.gif" width="25" height="2" alt=""></td>
+ </tr>
+ <logic:iterate name="recupDocForm"
+ property="waitingAdminDocs" id="documents">
+ <bean:define name="documents" property="key" id="idDocument" />
+ <bean:define name="documents" property="value" id="document" />
+ <bean:define name="document" property="idDoc" id="idDoc" />
+ <tr>
+ <td width="25%" height="46" align="center" valign="middle"><font
+ class="TextBase"> <html:link forward="visualiserDocument"
+ paramId="id" paramName="idDoc" target="_blank">
+ <castor:shortText width="16" replacement=" ...">
+ <bean:write name="document" property="docName" />
+ </castor:shortText>
+ </html:link></font></td>
+ <td width="2" height="100%" class="Couleur1"><img
+ src="../images/GifTrans.gif" width="2" alt=""></td>
+ <td width="25%" align="center" valign="middle"><font
+ class="TextBase"><bean:write name="document"
+ property="soumetteurName" /></font></td>
+ <td width="2" height="100%" class="Couleur1"><img
+ src="../images/GifTrans.gif" width="2" alt=""></td>
+ <td width="25%" align="center" valign="middle"><font
+ class="TextBase"><bean:write name="document"
+ property="docType" /></font></td>
+ <td width="2" height="100%" class="Couleur1"><img
+ src="../images/GifTrans.gif" width="2" height="25" alt=""></td>
+ <td width="20%" align="center" valign="middle"><img
+ src="../images/GifTrans.gif" width="1" height="1" alt=""><font
+ class="TextBase"><html:link action="recupDoc"
+ paramId="idDocument" paramName="idDocument">
+ <bean:message key="validation.link.text" />
+ </html:link></font></td>
+ <td width="2" height="100%" class="Couleur1"><img
+ src="../images/GifTrans.gif" width="2" height="25" alt=""></td>
+ <%-- Infos Bulles : infos etape courante WF --%>
+ <bean:define name="document" property="idDoc"
+ id="compteurBulle3" />
+ <div class="bulle" id='<%=compteurBulle3%>'><%-- type_validation --%>
+ <nested:equal name="document" property="Type_validation"
+ value="CONTENT">
+ <bean:message key="recupDoc.type.validation.contenu" />
+ </nested:equal> <nested:equal name="document"
+ property="Type_validation" value="METADATA">
+ <bean:message key="recupDoc.type.validation.metadonnees" />
+ </nested:equal> <nested:equal name="document"
+ property="Type_validation" value="COLLECTION">
+ <bean:message key="recupDoc.type.validation.collection" />
+ </nested:equal> <nested:equal name="document"
+ property="Type_validation" value="ACCESS">
+ <bean:message key="recupDoc.type.validation.droitsAcces" />
+ </nested:equal> <nested:notEqual name="document"
+ property="Type_validation" value="CONTENT">
+ <nested:notEqual name="document"
+ property="Type_validation" value="METADATA">
+ <nested:notEqual name="document"
+ property="Type_validation" value="COLLECTION">
+ <nested:notEqual name="document"
+ property="Type_validation" value="ACCESS">
+ <bean:write name="document" property="Type_validation" />
+ </nested:notEqual>
+ </nested:notEqual>
+ </nested:notEqual>
+ </nested:notEqual> <%-- type_validateur --%> <nested:equal
+ name="document" property="Type_validateur" value="GROUP">
+ <bean:message key="recupDoc.type.validateur.groupe" />
+ </nested:equal> <nested:equal name="document"
+ property="Type_validateur" value="PEOPLE">
+ <bean:message key="recupDoc.type.validateur.groupe" />
+ </nested:equal> <nested:equal name="document"
+ property="Type_validateur" value="PROFILE">
+ <bean:message key="recupDoc.type.validateur.groupe" />
+ </nested:equal> <nested:notEqual name="document"
+ property="Type_validateur" value="GROUP">
+ <nested:notEqual name="document"
+ property="Type_validateur" value="PEOPLE">
+ <nested:notEqual name="document"
+ property="Type_validateur" value="PROFILE">
+ <bean:write name="document" property="Type_validateur" />
+ </nested:notEqual>
+ </nested:notEqual>
+ </nested:notEqual> <%-- validateur --%> <nested:equal
+ name="document" property="Validateur" value="supervisor">
+ un "<bean:write name="document" property="Validateur" />" :
+ <bean:write name="document" property="Nom_Tuteur" />
+ </nested:equal> <nested:notEqual name="document"
+ property="Validateur" value="supervisor">
+ "<bean:write name="document" property="Validateur" />"
+ </nested:notEqual> <br />
+ <br />
+ </div>
+ <td width="5%" class="textBase">
+ <div id="IconeInfoWF" align="center"><img border="0"
+ src="../images/GifTrans.gif" width="32" height="32"
+ alt="infoWF" align="middle"
+ onmouseover="bulle('<%=compteurBulle3%>',event)"
+ onmouseout="stopbulle()" onclick="return false" /></div>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="9" width="100%" height="2" class="Couleur1"><img
+ src="../images/GifTrans.gif" width="25" height="2" alt=""></td>
+ </tr>
+ </logic:iterate>
+ </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>
+ </logic:notEmpty>
+ <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>
+ <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" 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>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td height="20" width="1" colspan="3"><img
+ src="../images/GifTrans.gif" width="1" height="20" alt=""></td>
+ </tr>
+ </logic:equal>
+ <%-- /fin de la presentation des infos ci dessus si c'est un admin de connecté--%>
+
+
+
<tr>
<td width="100%">
***************
*** 83,89 ****
<td width="1" height="25" class="Couleur11"><img
src="../images/GifTrans.gif" width="1" height="25" alt=""></td>
<td width="100%" height="15" class="Couleur10" valign="middle"><font
! class="TitreBase"><bean:message key="documents.waiting" />
</font></td>
<td width="1" height="15" class="Couleur11"><img
src="../images/GifTrans.gif" width="1" height="15" alt=""></td>
--- 315,328 ----
<td width="1" height="25" class="Couleur11"><img
src="../images/GifTrans.gif" width="1" height="25" alt=""></td>
+ <%-- Changement du titre du tableau de documents en attente en fonction du userType --%>
+ <logic:notEqual value="administrator" name="userProfil">
<td width="100%" height="15" class="Couleur10" valign="middle"><font
! class="TitreBase"><bean:message key="documents.waiting" /> </font></td>
! </logic:notEqual>
! <logic:equal value="administrator" name="userProfil">
! <td width="100%" height="15" class="Couleur10" valign="middle"><font
! class="TitreBase"><bean:message key="documents.waiting.ForAdmin" />
</font></td>
+ </logic:equal>
<td width="1" height="15" class="Couleur11"><img
src="../images/GifTrans.gif" width="1" height="15" alt=""></td>
***************
*** 117,122 ****
<td width="1" height="1" class="Couleur11"><img
src="../images/GifTrans.gif" width="1" height="1" alt=""></td>
! <td width="100%" height="1" class="FondTableau">
! <%-- Tableau 1 --%>
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
--- 356,360 ----
<td width="1" height="1" class="Couleur11"><img
src="../images/GifTrans.gif" width="1" height="1" alt=""></td>
! <td width="100%" height="1" class="FondTableau"><%-- Tableau 1 --%>
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
***************
*** 172,202 ****
<td width="2" height="100%" class="Couleur1" height="25"><img
src="../images/GifTrans.gif" width="2" height="25" alt=""></td>
! <td width="20%" align="center" valign="middle">
!
! <%-- Message d'avertissement pour l'admin --%>
<logic:equal value="administrator" name="userProfil">
! <div class="bulle" id="msgAdmin">
! <bean:message key="recupDoc.avertissement.profil.admin.action.wf" />
! </div>
! <p style="margin:16px; display:inline;float:left;" class="TextBase" > <html:link action="recupDoc"
! paramId="idDocument" paramName="idDocument">
! <bean:message key="validation.link.text" />
! </html:link> </p>
!
! <div id="IconeExclamation" style="float:left;" align="center" >
! <img border="0" src="../images/GifTrans.gif" width="13px" height="32px"
! alt="aide" align="middle" onmouseover="bulle('msgAdmin',event)"
! onmouseout="stopbulle()" onclick="return false" />
! </div>
! </logic:equal>
!
! <logic:notEqual value="administrator" name="userProfil">
! <img src="../images/GifTrans.gif" width="1" height="1" alt=""><font
class="TextBase"><html:link action="recupDoc"
paramId="idDocument" paramName="idDocument">
<bean:message key="validation.link.text" />
</html:link></font>
! </logic:notEqual>
! </td>
<td width="2" height="100%" class="Couleur1" height="25"><img
src="../images/GifTrans.gif" width="2" height="25" alt=""></td>
--- 410,436 ----
<td width="2" height="100%" class="Couleur1" height="25"><img
src="../images/GifTrans.gif" width="2" height="25" alt=""></td>
! <td width="20%" align="center" valign="middle"><%-- Message d'avertissement pour l'admin --%>
<logic:equal value="administrator" name="userProfil">
! <div class="bulle" id="msgAdmin"><bean:message
! key="recupDoc.avertissement.profil.admin.action.wf" /></div>
! <p style="margin:16px; display:inline;float:left;"
class="TextBase"><html:link action="recupDoc"
paramId="idDocument" paramName="idDocument">
<bean:message key="validation.link.text" />
+ </html:link></p>
+
+ <div id="IconeExclamation" style="float:left;" align="center">
+ <img border="0" src="../images/GifTrans.gif" width="13px"
+ height="32px" alt="aide" align="middle"
+ onmouseover="bulle('msgAdmin',event)"
+ onmouseout="stopbulle()" onclick="return false" /></div>
+ </logic:equal> <logic:notEqual value="administrator"
+ name="userProfil">
+ <img src="../images/GifTrans.gif" width="1" height="1" alt="">
+ <font class="TextBase"><html:link action="recupDoc"
+ paramId="idDocument" paramName="idDocument">
+ <bean:message key="validation.link.text" />
</html:link></font>
! </logic:notEqual></td>
<td width="2" height="100%" class="Couleur1" height="25"><img
src="../images/GifTrans.gif" width="2" height="25" alt=""></td>
***************
*** 204,209 ****
<bean:define name="document" property="idDoc"
id="compteurBulle" />
! <div class="bulle" id='<%=compteurBulle%>'>
! <%-- type_validation --%>
<nested:equal name="document" property="Type_validation"
value="CONTENT">
--- 438,442 ----
<bean:define name="document" property="idDoc"
id="compteurBulle" />
! <div class="bulle" id='<%=compteurBulle%>'><%-- type_validation --%>
<nested:equal name="document" property="Type_validation"
value="CONTENT">
***************
*** 230,236 ****
</nested:notEqual>
</nested:notEqual>
! </nested:notEqual>
! <%-- type_validateur --%>
! <nested:equal
name="document" property="Type_validateur" value="GROUP">
<bean:message key="recupDoc.type.validateur.groupe" />
--- 463,467 ----
</nested:notEqual>
</nested:notEqual>
! </nested:notEqual> <%-- type_validateur --%> <nested:equal
name="document" property="Type_validateur" value="GROUP">
<bean:message key="recupDoc.type.validateur.groupe" />
***************
*** 250,256 ****
</nested:notEqual>
</nested:notEqual>
! </nested:notEqual>
! <%-- validateur --%>
! <nested:equal
name="document" property="Validateur" value="supervisor">
un "<bean:write name="document" property="Validateur" />" :
--- 481,485 ----
</nested:notEqual>
</nested:notEqual>
! </nested:notEqual> <%-- validateur --%> <nested:equal
name="document" property="Validateur" value="supervisor">
un "<bean:write name="document" property="Validateur" />" :
***************
*** 330,335 ****
<td width="1" height="25" class="Couleur11"><img
src="../images/GifTrans.gif" width="1" height="25" alt=""></td>
! <td width="100%" height="15" class="Couleur10" valign="middle"><font
! class="TitreBase"><bean:message key="documents.inProgress" /></font></td>
<td width="1" height="15" class="Couleur11"><img
src="../images/GifTrans.gif" width="1" height="15" alt=""></td>
--- 559,571 ----
<td width="1" height="25" class="Couleur11"><img
src="../images/GifTrans.gif" width="1" height="25" alt=""></td>
! <%-- Changement du titre du tableau de documents en cours en fonction du userType --%>
! <logic:notEqual value="administrator" name="userProfil">
! <td width="100%" height="15" class="Couleur10" valign="middle"><font
! class="TitreBase"><bean:message key="documents.inProgress" /></font></td>
! </logic:notEqual>
! <logic:equal value="administrator" name="userProfil">
! <td width="100%" height="15" class="Couleur10" valign="middle"><font
! class="TitreBase"><bean:message key="documents.inProgress.ForAdmin" /></font></td>
! </logic:equal>
<td width="1" height="15" class="Couleur11"><img
src="../images/GifTrans.gif" width="1" height="15" alt=""></td>
***************
*** 543,779 ****
<hr />
<p></p>
! <!-- presentation des infos ci dessous si c'est un admin de connecté -->
! <logic:equal value="administrator" name="userProfil">
! <table width="713" border="0" cellpadding="0" cellspacing="0">
! <tr>
! <td height="20" width="1" colspan="3"><img
! src="../images/GifTrans.gif" width="1" height="20" alt=""></td>
! </tr>
! <tr>
! <!-- Les documents qui nécessitent l'intervention de l'admin -->
! <td width="5%"><img src="../images/GifTrans.gif" width="1" height="1"
! alt=""></td>
! <td width="90%">
! <table width="100%" border="0" cellpadding="0" cellspacing="0">
! <tr>
! <td width="100%">
! <table width="100%" border="0" cellpadding="0" cellspacing="0">
! <tr>
! <td width="100%" height="1" colspan="3" class="Couleur11"><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>
! <tr>
! <td width="1" height="25" class="Couleur11"><img
! src="../images/GifTrans.gif" width="1" height="25" alt=""></td>
! <td width="100%" height="15" class="Couleur10" valign="middle"><font
! class="TitreBase"><bean:message
! key="documents.validationByAdmin" /></font></td>
! <td width="1" height="15" class="Couleur11"><img
! src="../images/GifTrans.gif" width="1" height="15" alt=""></td>
! <td width="1" height="15" class="Couleur4"><img
! src="../images/GifTrans.gif" width="1" height="15" 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%" height="1" class="Couleur12"><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>
! <logic:empty name="recupDocForm" property="waitingAdminDocs">
! <tr>
! <td width="1" height="1" class="Couleur11"><img
! src="../images/GifTrans.gif" width="1" height="1" alt=""></td>
! <td width="100%" height="25" valign="middle" class="FondTableau"><font
! class="TextBase"><bean:message
! key="no.current.waitingAdminDocs" /></font></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>
! </logic:empty>
! <logic:notEmpty name="recupDocForm" property="waitingAdminDocs">
! <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="FondTableau"><%-- Tableau 3 --%>
! <table width="100%" border="0" cellpadding="0" cellspacing="0">
! <tr>
! <td width="25%" height="50" align="center" valign="middle"><font
! class="InstructionBase"><bean:message key="documents.title" /></font></td>
! <td width="2" height="100%" class="Couleur1"><img
! src="../images/GifTrans.gif" width="2" alt=""></td>
! <td width="25%" align="center" valign="middle"><font
! class="InstructionBase"><bean:message
! key="documents.waiting.submitterName" /></font></td>
! <td width="2" height="100%" class="Couleur1"><img
! src="../images/GifTrans.gif" width="2" alt=""></td>
! <td width="25%" align="center" valign="middle"><font
! class="InstructionBase"><bean:message key="documents.docType" /></font></td>
! <td width="2" height="100%" class="Couleur1"><img
! src="../images/GifTrans.gif" width="2" alt=""></td>
! <td width="20%" align="center" valign="middle"><font
! class="InstructionBase"><bean:message
! key="documents.validerDoc" /></font></td>
! <td width="2" height="100%" class="Couleur1"><img
! src="../images/GifTrans.gif" width="2" alt=""></td>
! <td width="5%" align="center" valign="middle"><font
! class="InstructionBase"><bean:message
! key="documents.etapeEnCours" /></font></td>
! </tr>
! <tr>
! <td colspan="9" width="100%" height="2" class="Couleur1"><img
! src="../images/GifTrans.gif" width="25" height="2" alt=""></td>
! </tr>
! <logic:iterate name="recupDocForm" property="waitingAdminDocs"
! id="documents">
! <bean:define name="documents" property="key" id="idDocument" />
! <bean:define name="documents" property="value" id="document" />
! <bean:define name="document" property="idDoc" id="idDoc" />
! <tr>
! <td width="25%" height="46" align="center" valign="middle"><font
! class="TextBase"> <html:link forward="visualiserDocument"
! paramId="id" paramName="idDoc" target="_blank">
! <castor:shortText width="16" replacement=" ...">
! <bean:write name="document" property="docName" />
! </castor:shortText>
! </html:link></font></td>
! <td width="2" height="100%" class="Couleur1"><img
! src="../images/GifTrans.gif" width="2" alt=""></td>
! <td width="25%" align="center" valign="middle"><font
! class="TextBase"><bean:write name="document"
! property="soumetteurName" /></font></td>
! <td width="2" height="100%" class="Couleur1"><img
! src="../images/GifTrans.gif" width="2" alt=""></td>
! <td width="25%" align="center" valign="middle"><font
! class="TextBase"><bean:write name="document"
! property="docType" /></font></td>
! <td width="2" height="100%" class="Couleur1"><img
! src="../images/GifTrans.gif" width="2" height="25" alt=""></td>
! <td width="20%" align="center" valign="middle"><img
! src="../images/GifTrans.gif" width="1" height="1" alt=""><font
! class="TextBase"><html:link action="recupDoc"
! paramId="idDocument" paramName="idDocument">
! <bean:message key="validation.link.text" />
! </html:link></font></td>
! <td width="2" height="100%" class="Couleur1"><img
! src="../images/GifTrans.gif" width="2" height="25" alt=""></td>
! <%-- Infos Bulles : infos etape courante WF --%>
! <bean:define name="document" property="idDoc"
! id="compteurBulle3" />
! <div class="bulle" id='<%=compteurBulle3%>'><%-- type_validation --%>
! <nested:equal name="document" property="Type_validation"
! value="CONTENT">
! <bean:message key="recupDoc.type.validation.contenu" />
! </nested:equal> <nested:equal name="document"
! property="Type_validation" value="METADATA">
! <bean:message key="recupDoc.type.validation.metadonnees" />
! </nested:equal> <nested:equal name="document"
! property="Type_validation" value="COLLECTION">
! <bean:message key="recupDoc.type.validation.collection" />
! </nested:equal> <nested:equal name="document"
! property="Type_validation" value="ACCESS">
! <bean:message key="recupDoc.type.validation.droitsAcces" />
! </nested:equal> <nested:notEqual name="document"
! property="Type_validation" value="CONTENT">
! <nested:notEqual name="document" property="Type_validation"
! value="METADATA">
! <nested:notEqual name="document" property="Type_validation"
! value="COLLECTION">
! <nested:notEqual name="document"
! property="Type_validation" value="ACCESS">
! <bean:write name="document" property="Type_validation" />
! </nested:notEqual>
! </nested:notEqual>
! </nested:notEqual>
! </nested:notEqual> <%-- type_validateur --%> <nested:equal
! name="document" property="Type_validateur" value="GROUP">
! <bean:message key="recupDoc.type.validateur.groupe" />
! </nested:equal> <nested:equal name="document"
! property="Type_validateur" value="PEOPLE">
! <bean:message key="recupDoc.type.validateur.groupe" />
! </nested:equal> <nested:equal name="document"
! property="Type_validateur" value="PROFILE">
! <bean:message key="recupDoc.type.validateur.groupe" />
! </nested:equal> <nested:notEqual name="document"
! property="Type_validateur" value="GROUP">
! <nested:notEqual name="document" property="Type_validateur"
! value="PEOPLE">
! <nested:notEqual name="document" property="Type_validateur"
! value="PROFILE">
! <bean:write name="document" property="Type_validateur" />
! </nested:notEqual>
! </nested:notEqual>
! </nested:notEqual> <%-- validateur --%> <nested:equal
! name="document" property="Validateur" value="supervisor">
! un "<bean:write name="document" property="Validateur" />" :
! <bean:write name="document" property="Nom_Tuteur" />
! </nested:equal> <nested:notEqual name="document"
! property="Validateur" value="supervisor">
! "<bean:write name="document" property="Validateur" />"
! </nested:notEqual> <br />
! <br />
! </div>
! <td width="5%" class="textBase">
! <div id="IconeInfoWF" align="center"><img border="0"
! src="../images/GifTrans.gif" width="32" height="32"
! alt="infoWF" align="middle"
! onmouseover="bulle('<%=compteurBulle3%>',event)"
! onmouseout="stopbulle()" onclick="return false" /></div>
! </td>
! </tr>
! <tr>
! <td colspan="9" width="100%" height="2" class="Couleur1"><img
! src="../images/GifTrans.gif" width="25" height="2" alt=""></td>
! </tr>
! </logic:iterate>
! </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>
! </logic:notEmpty>
! <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>
! <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" 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>
! </table>
! </td>
! </tr>
! </table>
! </td>
! <td width="5%"><img src="../images/GifTrans.gif" width="1" height="1"
! alt=""></td>
! </tr>
! </table>
! </logic:equal></div>
--- 779,782 ----
<hr />
<p></p>
!
! </div>
Plus d'informations sur la liste de diffusion Castore-commits