[Castore-commits] actionsDocuments.jsp 1.8 1.9
CĂ©line BENOIT
cbenoit at adullact1.hosting.cri74.org
Jeu 11 Mai 11:40:18 CEST 2006
Update of /cvsroot/castore/castore-struts-webapp/src/webapp/profil
In directory adullact1:/tmp/cvs-serv16466/src/webapp/profil
Modified Files:
actionsDocuments.jsp
Log Message:
ajout des liens nécassaires ŕ la visualisation des médias
mise en page
Index: actionsDocuments.jsp
===================================================================
RCS file: /cvsroot/castore/castore-struts-webapp/src/webapp/profil/actionsDocuments.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** actionsDocuments.jsp 19 Apr 2006 16:15:36 -0000 1.8
--- actionsDocuments.jsp 11 May 2006 09:40:15 -0000 1.9
***************
*** 50,54 ****
<nested:define id="idDoc" property="docId" />
! <bean:define id="link" value="../visualisation/visualisationDocument.do" />
<tr>
<td width="1" class="Couleur11"><img src="../images/GifTrans.gif"
--- 50,56 ----
<nested:define id="idDoc" property="docId" />
! <bean:define id="linkTexte"
! value="../visualisation/visualisationDocument.do" />
! <bean:define id="linkMedias" value="../profil/visualiserMediaAction.do" />
<tr>
<td width="1" class="Couleur11"><img src="../images/GifTrans.gif"
***************
*** 65,73 ****
property="estEnCoursConv" value="true">
<nested:notEqual property="estEnErreurConv" value="true">
! <castor:shortText width="15" replacement=" ..."
! link="<%=link.toString()%>" paramName="id"
! paramValue="<%=idDoc.toString()%>" target="_BLANK">
! <nested:write property="docName" />
! </castor:shortText>
</nested:notEqual>
</nested:notEqual> <nested:equal property="estEnCoursConv"
--- 67,90 ----
property="estEnCoursConv" value="true">
<nested:notEqual property="estEnErreurConv" value="true">
!
! <%-- Nom du doc + Lien --%>
! <%-- docTexte --%>
! <nested:equal property="docClass" value="documentTexte">
! <castor:shortText width="15" replacement=" ..."
! link="<%=linkTexte.toString()%>" paramName="id"
! paramValue="<%=idDoc.toString()%>" target="_BLANK">
! <nested:write property="docName" />
! </castor:shortText>
! </nested:equal>
!
! <%-- medias --%>
! <nested:notEqual property="docClass" value="documentTexte">
! <castor:shortText width="15" replacement=" ..."
! link="<%=linkMedias.toString()%>" paramName="id"
! paramValue="<%=idDoc.toString()%>">
! <nested:write property="docName" />
! </castor:shortText>
! </nested:notEqual>
!
</nested:notEqual>
</nested:notEqual> <nested:equal property="estEnCoursConv"
***************
*** 78,81 ****
--- 95,100 ----
<nested:write property="docName" />
</nested:equal> </font></td>
+
+ <%-- Etat du doc --%>
<td width="45%" class="Couleur3" align="left" valign="middle">
<font class="TextBase"> <nested:equal property="estAccepte"
***************
*** 94,97 ****
--- 113,118 ----
<bean:message bundle="common" key="etat.conversion.error" />
</nested:equal> </font></td>
+
+ <%-- Lien visualiser annotation --%>
<nested:equal property="estAccepte" value="true">
<td width="1" height="49" class="Couleur11"><img
***************
*** 111,115 ****
</logic:equal></td>
</nested:equal>
! <%-- case vide --%>
<nested:notEqual property="estAccepte" value="true">
<td width="1" height="49"><img src="../images/GifTrans.gif"
--- 132,137 ----
</logic:equal></td>
</nested:equal>
!
! <%-- Case vide --%>
<nested:notEqual property="estAccepte" value="true">
<td width="1" height="49"><img src="../images/GifTrans.gif"
***************
*** 120,128 ****
</nested:notEqual>
</nested:equal>
<nested:notEqual property="searchScore" value="noScore">
<td width="30%" class="Couleur3"><font class="TextBase"> <nested:equal
property="canSeeDocument" value="true">
<castor:shortText width="15" replacement=" ..."
! link="<%=link.toString()%>" paramName="id"
paramValue="<%=idDoc.toString()%>" target="_BLANK">
<nested:write property="docName" />
--- 142,152 ----
</nested:notEqual>
</nested:equal>
+
+ <%-- --%>
<nested:notEqual property="searchScore" value="noScore">
<td width="30%" class="Couleur3"><font class="TextBase"> <nested:equal
property="canSeeDocument" value="true">
<castor:shortText width="15" replacement=" ..."
! link="<%=linkTexte.toString()%>" paramName="id"
paramValue="<%=idDoc.toString()%>" target="_BLANK">
<nested:write property="docName" />
***************
*** 162,165 ****
--- 186,191 ----
key="document.voirResume" bundle="common" /> </font></div>
</td>
+
+ <%-- Nombre d'Avis --%>
<td width="1" height="49" class="Couleur11"><img
src="../images/GifTrans.gif" width="1" height="49" alt=""></td>
***************
*** 201,204 ****
--- 227,232 ----
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
+
+ <%-- SortirDocPanier --%>
<nested:equal property="canTakeFromBasket" value="true">
<td width="1" height="49" class="Couleur11"><img
***************
*** 213,217 ****
border="0" width="32" height="32" /> </a></td>
</nested:equal>
! <%-- VoirNotice --%>
<nested:equal property="canSeeNotice" value="true">
<td width="1" height="49" class="Couleur11"><img
--- 241,246 ----
border="0" width="32" height="32" /> </a></td>
</nested:equal>
!
! <%-- VoirNotice --%>
<nested:equal property="canSeeNotice" value="true">
<td width="1" height="49" class="Couleur11"><img
***************
*** 228,236 ****
</html:link></td>
</nested:equal>
! <%-- télécharger doc original --%>
<nested:equal property="canDownload" value="true">
<td width="1" height="49" class="Couleur11"><img
src="../images/GifTrans.gif" width="1" height="49" alt=""></td>
! <%-- docTexte --%>
<td width="35" height="49" class="Couleur3"><nested:equal
property="docClass" value="documentTexte">
--- 257,267 ----
</html:link></td>
</nested:equal>
!
! <%-- télécharger doc original --%>
<nested:equal property="canDownload" value="true">
<td width="1" height="49" class="Couleur11"><img
src="../images/GifTrans.gif" width="1" height="49" alt=""></td>
!
! <%-- docTexte --%>
<td width="35" height="49" class="Couleur3"><nested:equal
property="docClass" value="documentTexte">
***************
*** 252,256 ****
title="<bean:message bundle="common" key="document.telecharger.original.htm" />">
</html:link>
! </nested:equal>
<nested:equal property="docFormat" value="sxw">
<html:link forward="telechargerDocumentSource" paramId="id"
--- 283,287 ----
title="<bean:message bundle="common" key="document.telecharger.original.htm" />">
</html:link>
! </nested:equal>
<nested:equal property="docFormat" value="sxw">
<html:link forward="telechargerDocumentSource" paramId="id"
***************
*** 280,289 ****
</html:link>
</nested:equal>
! <%-- docImage --%>
</nested:equal> <nested:equal property="docClass"
value="documentImage">
<nested:equal property="docFormat" value="jpg">
! <html:link forward="telechargerDocumentSource" paramId="id"
! paramName="idDoc" styleClass="BoutonTelechargerSourceJPG">
<img src="../images/GifTrans.gif" width="32" height="32"
alt="<bean:message bundle="common" key="document.telecharger.original.media.image"/>"
--- 311,321 ----
</html:link>
</nested:equal>
!
! <%-- docImage --%>
</nested:equal> <nested:equal property="docClass"
value="documentImage">
<nested:equal property="docFormat" value="jpg">
! <html:link forward="telechargerDocumentSource" paramName="idDoc"
! paramId="id" styleClass="BoutonTelechargerSourceJPG">
<img src="../images/GifTrans.gif" width="32" height="32"
alt="<bean:message bundle="common" key="document.telecharger.original.media.image"/>"
***************
*** 300,304 ****
title="<bean:message bundle="common" key="document.telecharger.original.media.image" />">
</html:link>
! </nested:equal>
<nested:equal property="docFormat" value="bmp">
<html:link forward="telechargerDocumentSource" paramId="id"
--- 332,336 ----
title="<bean:message bundle="common" key="document.telecharger.original.media.image" />">
</html:link>
! </nested:equal>
<nested:equal property="docFormat" value="bmp">
<html:link forward="telechargerDocumentSource" paramId="id"
***************
*** 328,332 ****
</html:link>
</nested:equal>
! <%-- DocVideo --%>
</nested:equal> <nested:equal property="docClass"
value="documentVideo">
--- 360,365 ----
</html:link>
</nested:equal>
!
! <%-- DocVideo --%>
</nested:equal> <nested:equal property="docClass"
value="documentVideo">
***************
*** 357,362 ****
title="<bean:message bundle="common" key="document.telecharger.original.media.image" />">
</html:link>
! </nested:equal>
! <%-- DocAudio --%>
</nested:equal> <nested:equal property="docClass"
value="documentAudio">
--- 390,396 ----
title="<bean:message bundle="common" key="document.telecharger.original.media.image" />">
</html:link>
! </nested:equal>
!
! <%-- DocAudio --%>
</nested:equal> <nested:equal property="docClass"
value="documentAudio">
***************
*** 369,373 ****
title="<bean:message bundle="common" key="document.telecharger.original.media.image" />">
</html:link>
! </nested:equal>
<nested:equal property="docFormat" value="wav">
<html:link forward="telechargerDocumentSource" paramId="id"
--- 403,407 ----
title="<bean:message bundle="common" key="document.telecharger.original.media.image" />">
</html:link>
! </nested:equal>
<nested:equal property="docFormat" value="wav">
<html:link forward="telechargerDocumentSource" paramId="id"
***************
*** 378,382 ****
title="<bean:message bundle="common" key="document.telecharger.original.media.image" />">
</html:link>
! </nested:equal>
<nested:equal property="docFormat" value="mp3">
<html:link forward="telechargerDocumentSource" paramId="id"
--- 412,416 ----
title="<bean:message bundle="common" key="document.telecharger.original.media.image" />">
</html:link>
! </nested:equal>
<nested:equal property="docFormat" value="mp3">
<html:link forward="telechargerDocumentSource" paramId="id"
***************
*** 387,392 ****
title="<bean:message bundle="common" key="document.telecharger.original.media.image" />">
</html:link>
! </nested:equal>
! <%-- DocGroupe --%>
</nested:equal> <nested:equal property="docClass"
value="documentGroupe">
--- 421,427 ----
title="<bean:message bundle="common" key="document.telecharger.original.media.image" />">
</html:link>
! </nested:equal>
!
! <%-- DocGroupe --%>
</nested:equal> <nested:equal property="docClass"
value="documentGroupe">
***************
*** 399,406 ****
title="<bean:message bundle="common" key="document.telecharger.original.media.image" />">
</html:link>
! </nested:equal>
</nested:equal></td>
</nested:equal>
! <%-- Partager --%>
<nested:equal property="canShare" value="true">
<td width="1" height="49" class="Couleur11"><img
--- 434,442 ----
title="<bean:message bundle="common" key="document.telecharger.original.media.image" />">
</html:link>
! </nested:equal>
</nested:equal></td>
</nested:equal>
!
! <%-- Partager --%>
<nested:equal property="canShare" value="true">
<td width="1" height="49" class="Couleur11"><img
***************
*** 416,420 ****
width="32" height="32" /> </a></td>
</nested:equal>
! <%-- telechargerDocument PDF --%>
<nested:equal property="canDownload" value="true">
<nested:equal property="docClass" value="documentTexte">
--- 452,457 ----
width="32" height="32" /> </a></td>
</nested:equal>
!
! <%-- telechargerDocument PDF --%>
<nested:equal property="canDownload" value="true">
<nested:equal property="docClass" value="documentTexte">
***************
*** 433,437 ****
</nested:equal>
</nested:equal>
! <%-- EnvoyerDocPanier --%>
<nested:equal property="canSendToBasket" value="true">
<td width="1" height="49" class="Couleur11"><img
--- 470,475 ----
</nested:equal>
</nested:equal>
!
! <%-- EnvoyerDocPanier --%>
<nested:equal property="canSendToBasket" value="true">
<td width="1" height="49" class="Couleur11"><img
***************
*** 447,451 ****
border="0"> </a></td>
</nested:equal>
! <%-- VoirMotifRefus --%>
<nested:equal property="canSeeReason" value="true">
<td width="1" height="49" class="Couleur11"><img
--- 485,490 ----
border="0"> </a></td>
</nested:equal>
!
! <%-- VoirMotifRefus --%>
<nested:equal property="canSeeReason" value="true">
<td width="1" height="49" class="Couleur11"><img
***************
*** 463,467 ****
</td>
</nested:equal>
! <%-- miseAJourDocPage --%>
<nested:equal property="canUpdate" value="true">
<td width="1" height="49" class="Couleur11"><img
--- 502,507 ----
</td>
</nested:equal>
!
! <%-- miseAJourDocPage --%>
<nested:equal property="canUpdate" value="true">
<td width="1" height="49" class="Couleur11"><img
***************
*** 476,480 ****
border="0" width="32" height="32" /> </a></td>
</nested:equal>
! <%-- reSoumettreDoc --%>
<nested:equal property="canReSubmit" value="true">
<td width="1" height="49" class="Couleur11"><img
--- 516,521 ----
border="0" width="32" height="32" /> </a></td>
</nested:equal>
!
! <%-- reSoumettreDoc --%>
<nested:equal property="canReSubmit" value="true">
<td width="1" height="49" class="Couleur11"><img
***************
*** 489,493 ****
border="0" width="32" height="32" /> </a></td>
</nested:equal>
! <%-- annotationDoc --%>
<nested:equal property="canAnnotate" value="true">
<td width="1" height="49" class="Couleur11"><img
--- 530,535 ----
border="0" width="32" height="32" /> </a></td>
</nested:equal>
!
! <%-- annotationDoc --%>
<nested:equal property="canAnnotate" value="true">
<td width="1" height="49" class="Couleur11"><img
***************
*** 504,508 ****
</html:link></td>
</nested:equal>
! <%-- privatiserDoc --%>
<nested:equal property="canMakePrivate" value="true">
<td width="1" height="49" class="Couleur11"><img
--- 546,551 ----
</html:link></td>
</nested:equal>
!
! <%-- privatiserDoc --%>
<nested:equal property="canMakePrivate" value="true">
<td width="1" height="49" class="Couleur11"><img
***************
*** 519,523 ****
</html:link></td>
</nested:equal>
! <%-- SupprimerDocumentDansCollection --%>
<nested:equal property="canDeleteFromColl" value="true">
<nested:define property="idColl" id="collId" />
--- 562,567 ----
</html:link></td>
</nested:equal>
!
! <%-- SupprimerDocumentDansCollection --%>
<nested:equal property="canDeleteFromColl" value="true">
<nested:define property="idColl" id="collId" />
***************
*** 534,538 ****
width="32" height="32" /> </a></td>
</nested:equal>
! <%-- SupprimerDocument --%>
<nested:equal property="canDelete" value="true">
<td width="1" height="49" class="Couleur11"><img
--- 578,583 ----
width="32" height="32" /> </a></td>
</nested:equal>
!
! <%-- SupprimerDocument --%>
<nested:equal property="canDelete" value="true">
<td width="1" height="49" class="Couleur11"><img
***************
*** 548,552 ****
border="0" width="32" height="32" /> </a></td>
</nested:equal>
! <%-- cases de bourrage --%>
<nested:iterate property="nombreCasesBourrage">
<td width="1" height="49" class="Couleur11"><img
--- 593,598 ----
border="0" width="32" height="32" /> </a></td>
</nested:equal>
!
! <%-- cases de bourrage --%>
<nested:iterate property="nombreCasesBourrage">
<td width="1" height="49" class="Couleur11"><img
***************
*** 563,569 ****
<td width="35" height="49" class="Couleur3"><img
src="../images/GifTrans.gif" width="32" height="32" border="0"></td>
! </nested:notEqual>
<nested:notEqual property="docClass" value="documentTexte">
! <nested:equal property="canDownload" value="true">
<td width="1" height="49" class="Couleur11"><img
src="../images/GifTrans.gif" width="1" height="49" alt=""></td>
--- 609,615 ----
<td width="35" height="49" class="Couleur3"><img
src="../images/GifTrans.gif" width="32" height="32" border="0"></td>
! </nested:notEqual>
<nested:notEqual property="docClass" value="documentTexte">
! <nested:equal property="canDownload" value="true">
<td width="1" height="49" class="Couleur11"><img
src="../images/GifTrans.gif" width="1" height="49" alt=""></td>
Plus d'informations sur la liste de diffusion Castore-commits