[Castore-commits] doc.jsp 1.1 1.2 accessDenied.jsp 1.1 1.2 tree.jsp
1.1 1.2
Arnaud Thimel
thimel at adullact1.hosting.cri74.org
Ven 16 Juin 19:00:28 CEST 2006
Update of /cvsroot/castore/castore-portlets/src/webapp/WEB-INF/pages/common
In directory adullact1:/tmp/cvs-serv4156/src/webapp/WEB-INF/pages/common
Modified Files:
doc.jsp accessDenied.jsp tree.jsp
Log Message:
- Portlets de recherche (partiellement)
- utilisation de renderURL a la pace de actionURL + portlet:param
- regroupement des messages dans BaseCastorePortlet
- ajout d'un include de pages JSP commun aux portlets dans BaseCastorePortlet
Index: doc.jsp
===================================================================
RCS file: /cvsroot/castore/castore-portlets/src/webapp/WEB-INF/pages/common/doc.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** doc.jsp 14 Jun 2006 18:27:57 -0000 1.1
--- doc.jsp 16 Jun 2006 17:00:26 -0000 1.2
***************
*** 4,11 ****
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<%@ page isELIgnored="false"%>
- <portlet:defineObjects/>
<fmt:setBundle basename="fr.emn.castor.portlets.messages.Documents" scope="page"/>
! <c:set var="ns" value="documents" scope="page"></c:set>
<c:if test="${!empty doc}">
--- 4,10 ----
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<%@ page isELIgnored="false"%>
<fmt:setBundle basename="fr.emn.castor.portlets.messages.Documents" scope="page"/>
! <c:set var="ns" value="documents" scope="page"/>
<c:if test="${!empty doc}">
***************
*** 23,27 ****
<c:otherwise>
${doc.docName}
! <div id="IconeExclamation"/>
</c:otherwise>
</c:choose>
--- 22,27 ----
<c:otherwise>
${doc.docName}
! <c:set var="alt" value="${ns}.notenoughcredits"/>
! <img class="IconeExclamation" src="${context}/images/GifTrans.gif" width="13" height="32" alt="<fmt:message key="${alt}"/>" border="0" title="<fmt:message key="${alt}"/>"/>
</c:otherwise>
</c:choose>
***************
*** 40,44 ****
<c:set var="alt" value="${ns}.move"/>
<a href="move">
! <img class="BoutonSortirDocPanier" src="/castore-portlets/images/GifTrans.gif" width="32" height="32" alt="<fmt:message key="${alt}"/>" border="0" title="<fmt:message key="${alt}"/>"/>
</a>
</c:if>
--- 40,44 ----
<c:set var="alt" value="${ns}.move"/>
<a href="move">
! <img class="BoutonSortirDocPanier" src="${context}/images/GifTrans.gif" width="32" height="32" alt="<fmt:message key="${alt}"/>" border="0" title="<fmt:message key="${alt}"/>"/>
</a>
</c:if>
***************
*** 47,51 ****
<c:set var="alt" value="${ns}.seenotice"/>
<a href="seenotice">
! <img class="BoutonVoirNotice" src="/castore-portlets/images/GifTrans.gif" width="32" height="32" alt="<fmt:message key="${alt}"/>" border="0" title="<fmt:message key="${alt}"/>"/>
</a>
</c:if>
--- 47,51 ----
<c:set var="alt" value="${ns}.seenotice"/>
<a href="seenotice">
! <img class="BoutonVoirNotice" src="${context}/images/GifTrans.gif" width="32" height="32" alt="<fmt:message key="${alt}"/>" border="0" title="<fmt:message key="${alt}"/>"/>
</a>
</c:if>
***************
*** 54,58 ****
<c:set var="alt" value="${ns}.original.${doc.docClass}"/>
<a href="source"">
! <img class="BoutonTelechargerSource${fn:toUpperCase(doc.docFormat)}" src="/castore-portlets/images/GifTrans.gif" width="32" height="32" alt="<fmt:message key="${alt}"/>" border="0" title="<fmt:message key="${alt}"/>"/>
</a>
</c:if>
--- 54,58 ----
<c:set var="alt" value="${ns}.original.${doc.docClass}"/>
<a href="source"">
! <img class="BoutonTelechargerSource${fn:toUpperCase(doc.docFormat)}" src="${context}/images/GifTrans.gif" width="32" height="32" alt="<fmt:message key="${alt}"/>" border="0" title="<fmt:message key="${alt}"/>"/>
</a>
</c:if>
***************
*** 61,65 ****
<c:set var="alt" value="${ns}.share"/>
<a href="share">
! <img class="BoutonPartager" src="/castore-portlets/images/GifTrans.gif" width="32" height="32" alt="<fmt:message key="${alt}"/>" border="0" title="<fmt:message key="${alt}"/>"/>
</a>
</c:if>
--- 61,65 ----
<c:set var="alt" value="${ns}.share"/>
<a href="share">
! <img class="BoutonPartager" src="${context}/images/GifTrans.gif" width="32" height="32" alt="<fmt:message key="${alt}"/>" border="0" title="<fmt:message key="${alt}"/>"/>
</a>
</c:if>
***************
*** 68,72 ****
<c:set var="alt" value="${ns}.download"/>
<a href="download">
! <img class="BoutonTelechargerSourcePDF" src="/castore-portlets/images/GifTrans.gif" width="32" height="32" alt="<fmt:message key="${alt}"/>" border="0" title="<fmt:message key="${alt}"/>"/>
</a>
</c:if>
--- 68,72 ----
<c:set var="alt" value="${ns}.download"/>
<a href="download">
! <img class="BoutonTelechargerSourcePDF" src="${context}/images/GifTrans.gif" width="32" height="32" alt="<fmt:message key="${alt}"/>" border="0" title="<fmt:message key="${alt}"/>"/>
</a>
</c:if>
***************
*** 75,79 ****
<c:set var="alt" value="${ns}.copytobasket"/>
<a href="copytobasket">
! <img class="BoutonEnvoyerDocPanier" src="/castore-portlets/images/GifTrans.gif" width="32" height="32" alt="<fmt:message key="${alt}"/>" border="0" title="<fmt:message key="${alt}"/>"/>
</a>
</c:if>
--- 75,79 ----
<c:set var="alt" value="${ns}.copytobasket"/>
<a href="copytobasket">
! <img class="BoutonEnvoyerDocPanier" src="${context}/images/GifTrans.gif" width="32" height="32" alt="<fmt:message key="${alt}"/>" border="0" title="<fmt:message key="${alt}"/>"/>
</a>
</c:if>
***************
*** 86,90 ****
<c:set var="alt" value="${ns}.update"/>
<a href="update">
! <img class="BoutonMettreAJour" src="/castore-portlets/images/GifTrans.gif" width="32" height="32" alt="<fmt:message key="${alt}"/>" border="0" title="<fmt:message key="${alt}"/>"/>
</a>
</c:if>
--- 86,90 ----
<c:set var="alt" value="${ns}.update"/>
<a href="update">
! <img class="BoutonMettreAJour" src="${context}/images/GifTrans.gif" width="32" height="32" alt="<fmt:message key="${alt}"/>" border="0" title="<fmt:message key="${alt}"/>"/>
</a>
</c:if>
***************
*** 93,97 ****
<c:set var="alt" value="${ns}.resubmit"/>
<a href="resubmit">
! <img class="BoutonResoumettre" src="/castore-portlets/images/GifTrans.gif" width="32" height="32" alt="<fmt:message key="${alt}"/>" border="0" title="<fmt:message key="${alt}"/>"/>
</a>
</c:if>
--- 93,97 ----
<c:set var="alt" value="${ns}.resubmit"/>
<a href="resubmit">
! <img class="BoutonResoumettre" src="${context}/images/GifTrans.gif" width="32" height="32" alt="<fmt:message key="${alt}"/>" border="0" title="<fmt:message key="${alt}"/>"/>
</a>
</c:if>
***************
*** 100,104 ****
<c:set var="alt" value="${ns}.annotate"/>
<a href="annotate">
! <img class="BoutonAnnoter" src="/castore-portlets/images/GifTrans.gif" width="32" height="32" alt="<fmt:message key="${alt}"/>" border="0" title="<fmt:message key="${alt}"/>"/>
</a>
</c:if>
--- 100,104 ----
<c:set var="alt" value="${ns}.annotate"/>
<a href="annotate">
! <img class="BoutonAnnoter" src="${context}/images/GifTrans.gif" width="32" height="32" alt="<fmt:message key="${alt}"/>" border="0" title="<fmt:message key="${alt}"/>"/>
</a>
</c:if>
***************
*** 107,111 ****
<c:set var="alt" value="${ns}.makeprivate"/>
<a href="makeprivate">
! <img class="BoutonPrivatiser" src="/castore-portlets/images/GifTrans.gif" width="32" height="32" alt="<fmt:message key="${alt}"/>" border="0" title="<fmt:message key="${alt}"/>"/>
</a>
</c:if>
--- 107,111 ----
<c:set var="alt" value="${ns}.makeprivate"/>
<a href="makeprivate">
! <img class="BoutonPrivatiser" src="${context}/images/GifTrans.gif" width="32" height="32" alt="<fmt:message key="${alt}"/>" border="0" title="<fmt:message key="${alt}"/>"/>
</a>
</c:if>
***************
*** 114,118 ****
<c:set var="alt" value="${ns}.deletefromcoll"/>
<a href="deletefromcoll">
! <img class="BoutonSupprimerDocumentDansCollection" src="/castore-portlets/images/GifTrans.gif" width="32" height="32" alt="<fmt:message key="${alt}"/>" border="0" title="<fmt:message key="${alt}"/>"/>
</a>
</c:if>
--- 114,118 ----
<c:set var="alt" value="${ns}.deletefromcoll"/>
<a href="deletefromcoll">
! <img class="BoutonSupprimerDocumentDansCollection" src="${context}/images/GifTrans.gif" width="32" height="32" alt="<fmt:message key="${alt}"/>" border="0" title="<fmt:message key="${alt}"/>"/>
</a>
</c:if>
***************
*** 121,125 ****
<c:set var="alt" value="${ns}.delete"/>
<a href="delete">
! <img class="BoutonSupprimerDocument" src="/castore-portlets/images/GifTrans.gif" width="32" height="32" alt="<fmt:message key="${alt}"/>" border="0" title="<fmt:message key="${alt}"/>"/>
</a>
</c:if>
--- 121,125 ----
<c:set var="alt" value="${ns}.delete"/>
<a href="delete">
! <img class="BoutonSupprimerDocument" src="${context}/images/GifTrans.gif" width="32" height="32" alt="<fmt:message key="${alt}"/>" border="0" title="<fmt:message key="${alt}"/>"/>
</a>
</c:if>
Index: tree.jsp
===================================================================
RCS file: /cvsroot/castore/castore-portlets/src/webapp/WEB-INF/pages/common/tree.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tree.jsp 14 Jun 2006 18:27:57 -0000 1.1
--- tree.jsp 16 Jun 2006 17:00:26 -0000 1.2
***************
*** 3,10 ****
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ page isELIgnored="false"%>
- <portlet:defineObjects/>
<fmt:setBundle basename="fr.emn.castor.portlets.messages.Collections"/>
! <c:set var="ns" value="mycollections"></c:set>
<c:set var="coll" value="${currentColl}"/>
--- 3,9 ----
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ page isELIgnored="false"%>
<fmt:setBundle basename="fr.emn.castor.portlets.messages.Collections"/>
! <c:set var="ns" value="mycollections"/>
<c:set var="coll" value="${currentColl}"/>
***************
*** 25,29 ****
</c:if>
<span style="padding : 0px 0px 0px ${decalage}px;">
! <a class="${style}" href="<portlet:actionURL/>&collId=${coll.id}">${coll.name }</a><br>
</span>
<c:if test="${selectedId == coll.id}">
--- 24,28 ----
</c:if>
<span style="padding : 0px 0px 0px ${decalage}px;">
! <a class="${style}" href="<portlet:renderURL><portlet:param name="collId" value="${coll.id}"/></portlet:renderURL>">${coll.name }</a><br>
</span>
<c:if test="${selectedId == coll.id}">
Index: accessDenied.jsp
===================================================================
RCS file: /cvsroot/castore/castore-portlets/src/webapp/WEB-INF/pages/common/accessDenied.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** accessDenied.jsp 14 Jun 2006 18:27:57 -0000 1.1
--- accessDenied.jsp 16 Jun 2006 17:00:26 -0000 1.2
***************
*** 3,7 ****
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ page isELIgnored="false"%>
- <portlet:defineObjects/>
<fmt:setBundle basename="fr.emn.castor.portlets.messages.Common"/>
--- 3,6 ----
***************
*** 16,20 ****
<div align="center">
! <a href="<portlet:actionURL/>"><fmt:message key="${ns}.reload"/></a>
</div>
--- 15,19 ----
<div align="center">
! <a href="<portlet:renderURL/>"><fmt:message key="${ns}.reload"/></a>
</div>
Plus d'informations sur la liste de diffusion Castore-commits