[Castore-commits] choixDocument.jsp 1.1 1.2
Stéphane Bouchet
sbouchet at adullact1.hosting.cri74.org
Mar 16 Mai 17:33:37 CEST 2006
Update of /cvsroot/castore/castore-struts-webapp/src/webapp/validation
In directory adullact1:/tmp/cvs-serv449/src/webapp/validation
Modified Files:
choixDocument.jsp
Log Message:
Modif logique Workflow
Index: choixDocument.jsp
===================================================================
RCS file: /cvsroot/castore/castore-struts-webapp/src/webapp/validation/choixDocument.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** choixDocument.jsp 15 Sep 2005 14:51:06 -0000 1.1
--- choixDocument.jsp 16 May 2006 15:33:34 -0000 1.2
***************
*** 112,116 ****
<tr>
<td width="25%" align="center" valign="middle"><font
! class="TextBase"> <castor:shortText width="16" replacement=" ...">
<bean:write name="document" property="docName" />
</castor:shortText> </font></td>
--- 112,117 ----
<tr>
<td width="25%" align="center" valign="middle"><font
! class="TextBase"> <castor:shortText width="16"
! replacement=" ...">
<bean:write name="document" property="docName" />
</castor:shortText> </font></td>
***************
*** 127,131 ****
<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
--- 128,131 ----
***************
*** 137,141 ****
</table>
</td>
-
<td width="1" height="1" class="Couleur11"><img
src="../images/GifTrans.gif" width="1" height="1" alt=""></td>
--- 137,140 ----
***************
*** 183,192 ****
</table>
</td>
-
</tr>
-
</table>
</td>
-
<td width="5%"><img src="../images/GifTrans.gif" width="1" height="1"
alt=""></td>
--- 182,188 ----
***************
*** 303,307 ****
<tr>
<td width="20%" align="center" valign="middle"><font
! class="TextBase"><castor:shortText width="16" replacement=" ...">
<bean:write name="document" property="docName" />
</castor:shortText></font></td>
--- 299,304 ----
<tr>
<td width="20%" align="center" valign="middle"><font
! class="TextBase"><castor:shortText width="16"
! replacement=" ...">
<bean:write name="document" property="docName" />
</castor:shortText></font></td>
***************
*** 377,381 ****
</td>
</tr>
-
</table>
</td>
--- 374,377 ----
***************
*** 383,476 ****
alt=""></td>
</tr>
-
</table>
! <p>
<hr />
! </p>
! <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 en attente de tuteurs valide -->
! <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.waitingTutor" /></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="waitingTutorDocs">
<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.submission.waitingTutor" /></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="waitingTutorDocs">
<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="33%" 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="33%" 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="33%" 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>
! </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
--- 379,424 ----
alt=""></td>
</tr>
</table>
! <p></p>
<hr />
! <p></p>
! <!-- presentation des infos ci dessous si c'est un admin de connecté -->
! <bean:define id="userProfil" name="userType" /> <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
***************
*** 479,486 ****
src="../images/GifTrans.gif" width="1" height="1" alt=""></td>
</tr>
! <logic:iterate name="recupDocForm" property="waitingTutorDocs"
! 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
--- 427,444 ----
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
***************
*** 489,508 ****
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
! <td width="33%" 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>
! <td width="33%" 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="33%" 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>
</tr>
</table>
--- 447,467 ----
<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>
! <td width="2" height="100%" class="Couleur1"><img
! src="../images/GifTrans.gif" width="2" alt=""></td>
</tr>
</table>
***************
*** 523,561 ****
src="../images/GifTrans.gif" width="1" height="1" alt=""></td>
</tr>
! </logic:iterate>
! </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 width="5%"><img src="../images/GifTrans.gif" width="1" height="1"
! alt=""></td>
! </tr>
! </table>
! </div>
--- 482,574 ----
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=" ...">
! <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>
! <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="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>
! <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>
! <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>
Plus d'informations sur la liste de diffusion Castore-commits