[Castore-commits] choixDocument.jsp 1.4 1.5
CĂ©line BENOIT
cbenoit at adullact1.hosting.cri74.org
Ven 4 Aou 17:33:01 CEST 2006
Update of /cvsroot/castore/castore-struts-webapp/src/webapp/validation
In directory adullact1:/tmp/cvs-serv21700/src/webapp/validation
Modified Files:
choixDocument.jsp
Log Message:
ajout d'une info bulle sur l'étape ou est rendu le WF
Index: choixDocument.jsp
===================================================================
RCS file: /cvsroot/castore/castore-struts-webapp/src/webapp/validation/choixDocument.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** choixDocument.jsp 17 Jul 2006 15:06:58 -0000 1.4
--- choixDocument.jsp 4 Aug 2006 15:32:59 -0000 1.5
***************
*** 49,52 ****
--- 49,53 ----
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic"%>
<%@ taglib uri="/WEB-INF/castorTagLib.tld" prefix="castor"%>
+ <%@ taglib uri="/WEB-INF/struts-nested.tld" prefix="nested"%>
<bean:define id="userProfil" name="userType" />
***************
*** 63,67 ****
</tr>
<tr>
- <!-- Les documents en attente de validation-->
<td width="5%"><img src="../images/GifTrans.gif" width="1" height="1"
alt=""></td>
--- 64,67 ----
***************
*** 115,164 ****
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%" 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="25%"><img src="../images/GifTrans.gif" width="1"
! height="1" alt=""></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>
- <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>
<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="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>
! <td width="25%" align="center" valign="middle"><font
class="TextBase"> <castor:shortText width="16"
replacement=" ...">
--- 115,159 ----
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=" ...">
***************
*** 167,188 ****
<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" height="25"><img
src="../images/GifTrans.gif" width="2" height="25" alt=""></td>
! <td width="25%" 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>
</tr>
</table>
</td>
<td width="1" height="1" class="Couleur11"><img
--- 162,265 ----
<td width="2" height="100%" class="Couleur1"><img
src="../images/GifTrans.gif" width="2" alt=""></td>
! <td width="25%" height="100%" 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%" height="100%" align="center" valign="middle"><font
class="TextBase"><bean:write name="document"
property="docType" /></font></td>
<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
***************
*** 191,205 ****
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="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>
- </logic:iterate>
</logic:notEmpty>
<tr>
--- 268,271 ----
***************
*** 212,226 ****
<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"
--- 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"
***************
*** 295,301 ****
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="20%" align="center" valign="middle"><font
class="InstructionBase"><bean:message key="documents.title" /></font></td>
<td width="2" height="100%" class="Couleur1"><img
--- 352,366 ----
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="20%" height="50" align="center" valign="middle"><font
class="InstructionBase"><bean:message key="documents.title" /></font></td>
<td width="2" height="100%" class="Couleur1"><img
***************
*** 315,352 ****
<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.inProgress.canContinueValidation" /> </font></td>
<td width="2" height="100%" class="Couleur1"><img
src="../images/GifTrans.gif" width="1" height="1" alt=""></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>
! <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>
! <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="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>
! <td width="20%" align="center" valign="middle"><font
class="TextBase"><castor:shortText width="16"
replacement=" ...">
--- 380,401 ----
<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=" ...">
***************
*** 369,373 ****
class="TextBase"><bean:write name="document"
property="validateurName" /></font></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"
--- 418,424 ----
class="TextBase"><bean:write name="document"
property="validateurName" /></font></td>
! <td width="2" height="100%" class="Couleur1"><img
! src="../images/GifTrans.gif" width="2" alt=""></td>
! <td width="15%" align="center" valign="middle"><img
src="../images/GifTrans.gif" width="1" height="1" alt=""> <font
class="TextBase"> <html:link action="recupDoc"
***************
*** 375,397 ****
<bean:message key="validation.restart.text" />
</html:link></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>
! <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>
! </logic:iterate>
</logic:notEmpty>
<tr>
--- 426,522 ----
<bean:message key="validation.restart.text" />
</html:link></font></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 --%>
+ <%-- 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
! 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>
***************
*** 405,418 ****
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"
--- 530,534 ----
src="../images/GifTrans.gif" width="1" height="1" alt=""></td>
</tr>
!
<tr>
<td width="1" height="1"><img src="../images/GifTrans.gif"
***************
*** 494,500 ****
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%" align="center" valign="middle"><font
class="InstructionBase"><bean:message key="documents.title" /></font></td>
<td width="2" height="100%" class="Couleur1"><img
--- 610,623 ----
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" height="100%" class="Couleur1"><img
***************
*** 509,545 ****
<td width="2" height="100%" class="Couleur1"><img
src="../images/GifTrans.gif" width="2" alt=""></td>
! <td width="25%"><img src="../images/GifTrans.gif" width="1"
! height="1" alt=""></td>
<td width="2" height="100%" class="Couleur1"><img
src="../images/GifTrans.gif" width="2" alt=""></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>
! <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>
! <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="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>
! <td width="25%" align="center" valign="middle"><font
class="TextBase"><castor:shortText width="16"
replacement=" ...">
--- 632,653 ----
<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=" ...">
***************
*** 558,562 ****
<td width="2" height="100%" class="Couleur1"><img
src="../images/GifTrans.gif" width="2" height="25" alt=""></td>
! <td width="25%" align="center" valign="middle"><img
src="../images/GifTrans.gif" width="1" height="1" alt=""><font
class="TextBase"><html:link action="recupDoc"
--- 666,670 ----
<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"
***************
*** 566,588 ****
<td width="2" height="100%" class="Couleur1"><img
src="../images/GifTrans.gif" width="2" height="25" alt=""></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>
! <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>
! </logic:iterate>
</logic:notEmpty>
<tr>
--- 674,765 ----
<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
! 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>
Plus d'informations sur la liste de diffusion Castore-commits