[Castore-commits] choixDocument.jsp 1.5 1.6
CĂ©line BENOIT
cbenoit at adullact1.hosting.cri74.org
Ven 4 Aou 19:33:09 CEST 2006
Update of /cvsroot/castore/castore-struts-webapp/src/webapp/validation
In directory adullact1:/tmp/cvs-serv9117/src/webapp/validation
Modified Files:
choixDocument.jsp
Log Message:
mise en page
ajout d'une info bulle pour les administrateurs lors de la validation des documents en attente
Index: choixDocument.jsp
===================================================================
RCS file: /cvsroot/castore/castore-struts-webapp/src/webapp/validation/choixDocument.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** choixDocument.jsp 4 Aug 2006 15:32:59 -0000 1.5
--- choixDocument.jsp 4 Aug 2006 17:33:07 -0000 1.6
***************
*** 58,61 ****
--- 58,62 ----
<hr />
<div align="center">
+
<table width="713" border="0" cellpadding="0" cellspacing="0">
<tr>
***************
*** 66,69 ****
--- 67,71 ----
<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">
***************
*** 77,86 ****
width="1" height="1" alt=""></td>
</tr>
! <%-- Documents en attente de votre validation --%>
<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.waiting" /></font></td>
<td width="1" height="15" class="Couleur11"><img
src="../images/GifTrans.gif" width="1" height="15" alt=""></td>
--- 79,89 ----
width="1" height="1" alt=""></td>
</tr>
! <%-- Documents en attente de votre validation --%>
<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.waiting" />
! </font></td>
<td width="1" height="15" class="Couleur11"><img
src="../images/GifTrans.gif" width="1" height="15" alt=""></td>
***************
*** 115,163 ****
src="../images/GifTrans.gif" width="1" height="1" alt=""></td>
<td width="100%" height="1" class="FondTableau">
!
!
!
!
!
!
!
!
!
<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" 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" 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" 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="waitingDocs"
! id="documents">
! <bean:define name="documents" property="key" id="idDocument" />
! <bean:define name="documents" property="value" id="document" />
<tr>
<td width="25%" height="46" align="center" valign="middle"><font
! class="TextBase"> <castor:shortText width="16"
! replacement=" ...">
! <bean:write name="document" property="docName" />
! </castor:shortText></font></td>
<td width="2" height="100%" class="Couleur1"><img
src="../images/GifTrans.gif" width="2" alt=""></td>
--- 118,163 ----
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>
<td width="25%" height="50" align="center" valign="middle"><font
class="InstructionBase"><bean:message key="documents.title" /></font></td>
! <td width="2" 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" 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" 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="waitingDocs"
! 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>
***************
*** 172,271 ****
<td width="2" height="100%" class="Couleur1" height="25"><img
src="../images/GifTrans.gif" width="2" height="25" alt=""></td>
! <td width="20%" height="100%" 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>
! </div>
</td>
<td width="2" height="100%" class="Couleur1" height="25"><img
src="../images/GifTrans.gif" width="2" height="25" alt=""></td>
! <%-- Infos Bulles : infos etape courante WF --%>
! <bean:define name="document" property="idDoc" id="compteurBulle" />
! <div class="bulle" id='<%=compteurBulle%>'>
! <%-- 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('<%=compteurBulle%>',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>
--- 172,285 ----
<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>
! <%-- Infos Bulles : infos etape courante WF --%>
! <bean:define name="document" property="idDoc"
! id="compteurBulle" />
! <div class="bulle" id='<%=compteurBulle%>'>
! <%-- 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('<%=compteurBulle%>',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>
***************
*** 278,283 ****
<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"
--- 292,296 ----
<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"
***************
*** 299,303 ****
</tr>
<tr>
! <%-- Les documents en cours de validation --%>
<td width="5%"><img src="../images/GifTrans.gif" width="1" height="1"
alt=""></td>
--- 312,316 ----
</tr>
<tr>
! <%-- Les documents en cours de validation --%>
<td width="5%"><img src="../images/GifTrans.gif" width="1" height="1"
alt=""></td>
***************
*** 351,363 ****
<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">
!
!
!
!
!
!
!
!
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
--- 364,368 ----
<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 2 --%>
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
***************
*** 380,405 ****
<td width="2" height="100%" class="Couleur1"><img
src="../images/GifTrans.gif" width="2" alt=""></td>
! <td width="15%" 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="1" height="1" alt=""></td>
!
! <td width="5%" align="center" valign="middle"><font
! class="InstructionBase"><bean:message key="documents.etapeEnCours" /></font></td>
</tr>
<tr>
<td colspan="11" width="100%" height="2" class="Couleur1"><img
! src="../images/GifTrans.gif" width="25" height="2" alt=""></td>
</tr>
<logic:iterate name="recupDocForm" property="inProgressDocs"
! id="documents">
! <bean:define name="documents" property="key" id="idDocument" />
! <bean:define name="documents" property="value" id="document" />
<tr>
<td width="20%" height="46" align="center" valign="middle"><font
! class="TextBase"><castor:shortText width="16"
! replacement=" ...">
! <bean:write name="document" property="docName" />
! </castor:shortText></font></td>
<td width="2" height="100%" class="Couleur1"><img
src="../images/GifTrans.gif" width="2" alt=""></td>
--- 385,415 ----
<td width="2" height="100%" class="Couleur1"><img
src="../images/GifTrans.gif" width="2" alt=""></td>
! <td width="15%" 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="1" height="1" alt=""></td>
!
! <td width="5%" align="center" valign="middle"><font
! class="InstructionBase"><bean:message
! key="documents.etapeEnCours" /></font></td>
</tr>
<tr>
<td colspan="11" width="100%" height="2" class="Couleur1"><img
! src="../images/GifTrans.gif" width="25" height="2" alt=""></td>
</tr>
<logic:iterate name="recupDocForm" property="inProgressDocs"
! 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="20%" 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>
***************
*** 428,516 ****
<td width="2" height="100%" class="Couleur1" height="25"><img
src="../images/GifTrans.gif" width="2" height="25" alt=""></td>
!
!
!
! <%-- Infos Bulles : infos etape courante WF --%>
! <%-- TODO --%>
!
! <bean:define name="document" property="idDoc" id="compteurBulle2" />
! <div class="bulle" id='<%=compteurBulle2%>'>
! <%-- 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('<%=compteurBulle2%>',event)" onmouseout="stopbulle()"
! onclick="return false" /></div>
! </td>
!
!
!
!
!
</tr>
! <tr>
! <td colspan="11" 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
--- 438,511 ----
<td width="2" height="100%" class="Couleur1" height="25"><img
src="../images/GifTrans.gif" width="2" height="25" alt=""></td>
! <%-- Infos Bulles : infos etape courante WF --%>
! <bean:define name="document" property="idDoc"
! id="compteurBulle2" />
! <div class="bulle" id='<%=compteurBulle2%>'><%-- 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('<%=compteurBulle2%>',event)"
! onmouseout="stopbulle()" onclick="return false" /></div>
! </td>
</tr>
! <tr>
! <td colspan="11" 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
***************
*** 530,534 ****
src="../images/GifTrans.gif" width="1" height="1" alt=""></td>
</tr>
-
<tr>
<td width="1" height="1"><img src="../images/GifTrans.gif"
--- 525,528 ----
***************
*** 609,620 ****
<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">
!
!
!
!
!
!
!
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
--- 603,607 ----
<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>
***************
*** 632,657 ****
<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" />
!
<tr>
<td width="25%" height="46" align="center" valign="middle"><font
! class="TextBase"><castor:shortText width="16"
! replacement=" ...">
! <bean:write name="document" property="docName" />
! </castor:shortText></font></td>
<td width="2" height="100%" class="Couleur1"><img
src="../images/GifTrans.gif" width="2" alt=""></td>
--- 619,648 ----
<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>
***************
*** 674,759 ****
<td width="2" height="100%" class="Couleur1"><img
src="../images/GifTrans.gif" width="2" height="25" alt=""></td>
!
!
! <%-- Infos Bulles : infos etape courante WF --%>
! <%-- TODO --%>
!
!
! <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
--- 665,738 ----
<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
Plus d'informations sur la liste de diffusion Castore-commits