checht 2005/06/03 17:10:00 CEST
Modified files:
templates_intranet template_alize_accueil.jsp
template_alize_actualite.jsp
template_alize_communique.jsp
template_alize_contenu_general.jsp
template_alize_lettre_mission.jsp
template_alize_liste.jsp
template_alize_liste_actualite.jsp
template_alize_liste_communiques.jsp
Added files:
templates_intranet template_alize_agenda.jsp
template_alize_annuaire_service.jsp
template_alize_discours.jsp
template_alize_liste_discours.jsp
Log:
no message
Revision Changes Path
1.2 +0 -1
minefi_templates/templates_intranet/template_alize_accueil.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/minefi_templates/templates_intranet/template_alize_accueil.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +54 -60
minefi_templates/templates_intranet/template_alize_actualite.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/minefi_templates/templates_intranet/template_alize_actualite.jsp.diff?r1=1.1&r2=1.2&f=h
1.1 +37 -0
minefi_templates/templates_intranet/template_alize_agenda.jsp (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/minefi_templates/templates_intranet/template_alize_agenda.jsp?rev=1.1&content-type=text/plain
1.1 +33 -0
minefi_templates/templates_intranet/template_alize_annuaire_service.jsp (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/minefi_templates/templates_intranet/template_alize_annuaire_service.jsp?rev=1.1&content-type=text/plain
1.3 +3 -58
minefi_templates/templates_intranet/template_alize_communique.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/minefi_templates/templates_intranet/template_alize_communique.jsp.diff?r1=1.2&r2=1.3&f=h
1.2 +3 -1
minefi_templates/templates_intranet/template_alize_contenu_general.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/minefi_templates/templates_intranet/template_alize_contenu_general.jsp.diff?r1=1.1&r2=1.2&f=h
1.1 +24 -0
minefi_templates/templates_intranet/template_alize_discours.jsp (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/minefi_templates/templates_intranet/template_alize_discours.jsp?rev=1.1&content-type=text/plain
1.2 +4 -3
minefi_templates/templates_intranet/template_alize_lettre_mission.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/minefi_templates/templates_intranet/template_alize_lettre_mission.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +1 -2
minefi_templates/templates_intranet/template_alize_liste.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/minefi_templates/templates_intranet/template_alize_liste.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +25 -36
minefi_templates/templates_intranet/template_alize_liste_actualite.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/minefi_templates/templates_intranet/template_alize_liste_actualite.jsp.diff?r1=1.1&r2=1.2&f=h
1.3 +3 -295
minefi_templates/templates_intranet/template_alize_liste_communiques.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/minefi_templates/templates_intranet/template_alize_liste_communiques.jsp.diff?r1=1.2&r2=1.3&f=h
1.1 +28 -0
minefi_templates/templates_intranet/template_alize_liste_discours.jsp (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/minefi_templates/templates_intranet/template_alize_liste_discours.jsp?rev=1.1&content-type=text/plain
Index: template_alize_agenda.jsp
====================================================================
<%@ include file="include/alize_headers.inc"%>
<a name="top"></a>
<div class="accessibilite"><a href="#menu" accesskey="m"><img
src="<content:contextURL/>/images_alize/dot.gif" height="1" width="1"
alt="Aller au menu - racourcis (alt + m)" /></a> <a href="#contenu"
accesskey="s"><img src="<content:contextURL/>/images_alize/dot.gif" height="1"
width="1" alt="Acc�der au contenu - racourcis (alt + s)" /></a></div>
<div id="inner">
<%-- bandeau --%>
<%@ include file="include/alize_bandeau.inc"%>
<%-- menus de gauche --%>
<%@ include file="include/alize_menus_gauche.inc"%>
<%-- footer --%>
<%@ include file="include/alize_navigation.inc"%>
<%-- contenu --%>
<div id="large">
<div id="centreBig">
<jsp:include page="include/alize_titres.jsp" flush="true">
<jsp:param name="notSousTitre" value="true" />
</jsp:include>
<p/><jsp:include page="include/alize_agenda_periode.jsp" flush="true"/>
<p/><jsp:include page="include/alize_agenda_journee.jsp" flush="true"/>
<p/><jsp:include page="include/alize_agenda_contact.jsp" flush="true"/>
<%-- footer --%>
<%@ include file="include/alize_footer.inc"%>
</div>
</div>
</div>
</body>
</html>
Index: template_alize_annuaire_service.jsp
====================================================================
<%@ include file="include/alize_headers.inc"%>
<a name="top"></a>
<div class="accessibilite"><a href="#menu" accesskey="m"><img
src="<content:contextURL/>/images_alize/dot.gif" height="1" width="1"
alt="Aller au menu - racourcis (alt + m)" /></a> <a href="#contenu"
accesskey="s"><img src="<content:contextURL/>/images_alize/dot.gif" height="1"
width="1" alt="Acc�der au contenu - racourcis (alt + s)" /></a></div>
<div id="inner">
<%-- bandeau --%>
<%@ include file="include/alize_bandeau.inc"%>
<%-- menus de gauche --%>
<%@ include file="include/alize_menus_gauche.inc"%>
<%-- footer --%>
<%@ include file="include/alize_navigation.inc"%>
<%-- contenu --%>
<div id="large">
<div id="centreBig">
<jsp:include page="include/alize_titres.jsp" flush="true">
<jsp:param name="notSousTitre" value="true" />
</jsp:include>
<jsp:include page="include/alize_annuaire_service_resume.jsp"
flush="true"/>
<jsp:include page="include/alize_annuaire_service.jsp" flush="true"/>
<%-- footer --%>
<%@ include file="include/alize_footer.inc"%>
</div>
</div>
</div>
</body>
</html>
Index: template_alize_discours.jsp
====================================================================
<%@ include file="include/alize_headers.inc"%>
<%-- declaration --%>
<%@ include file="include/alize_discours_declaration.inc"%>
<a name="top"></a>
<div class="accessibilite"><a href="#menu" accesskey="m"><img
src="<content:contextURL/>/images_alize/dot.gif" height="1" width="1"
alt="Aller au menu - racourcis (alt + m)" /></a> <a href="#contenu"
accesskey="s"><img src="<content:contextURL/>/images_alize/dot.gif" height="1"
width="1" alt="Acc�der au contenu - racourcis (alt + s)" /></a></div>
<div id="inner">
<%-- bandeau --%>
<%@ include file="include/alize_bandeau.inc"%>
<%-- menus de gauche --%>
<%@ include file="include/alize_menus_gauche.inc"%>
<%-- footer --%>
<%@ include file="include/alize_navigation.inc"%>
<%-- content --%>
<%@ include file="include/alize_commu_discours.inc"%>
</div>
</body>
</html>
Index: template_alize_liste_discours.jsp
====================================================================
<[EMAIL PROTECTED]
import="fr.gouv.finances.dpma.gcp.jahia.util.minefi.MultipleContainerSearch"%>
<[EMAIL PROTECTED]
import="fr.gouv.finances.dpma.gcp.jahia.util.minefi.SearchResultat"%>
<%@ include file="include/alize_headers.inc"%>
<%-- javascript de validation des champs date sur le client --%>
<script type="text/javascript" language="javascript"
src="<content:contextURL/>/js/formvalidation.js"></script>
<%@ include file="include/alize_discours_declaration.inc"%>
<a name="top"></a>
<div class="accessibilite"><a href="#menu" accesskey="m"><img
src="<content:contextURL/>/images_alize/dot.gif" height="1" width="1"
alt="Aller au menu - racourcis (alt + m)" /></a> <a href="#contenu"
accesskey="s"><img src="<content:contextURL/>/images_alize/dot.gif" height="1"
width="1" alt="Accéder au contenu - racourcis (alt + s)" /></a></div>
<div id="inner">
<%-- bandeau --%>
<%@ include file="include/alize_bandeau.inc"%>
<%-- menus de gauche --%>
<%@ include file="include/alize_menus_gauche.inc"%>
<%-- footer --%>
<%@ include file="include/alize_navigation.inc"%>
<%-- contenu --%>
<%@ include file="include/alize_commu_discours_contenu.inc"%>
</div>
</body>
</html>
Index: template_alize_accueil.jsp
===================================================================
RCS file:
/home/cvs/repository/minefi_templates/templates_intranet/template_alize_accueil.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- template_alize_accueil.jsp 25 May 2005 09:48:14 -0000 1.1
+++ template_alize_accueil.jsp 3 Jun 2005 15:09:59 -0000 1.2
@@ -1,4 +1,3 @@
-
<%@ include file="include/alize_headers.inc"%>
<a name="top"></a>
<div class="accessibilite"><a href="#menu" accesskey="m"><img
src="<content:contextURL/>/images_alize/dot.gif" height="1" width="1"
alt="Aller au menu - racourcis (alt + m)" /></a> <a href="#contenu"
accesskey="s"><img src="<content:contextURL/>/images_alize/dot.gif" height="1"
width="1" alt="Acc�der au contenu - racourcis (alt + s)" /></a></div>
Index: template_alize_actualite.jsp
===================================================================
RCS file:
/home/cvs/repository/minefi_templates/templates_intranet/template_alize_actualite.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- template_alize_actualite.jsp 25 May 2005 09:48:14 -0000 1.1
+++ template_alize_actualite.jsp 3 Jun 2005 15:09:59 -0000 1.2
@@ -31,33 +31,26 @@
JahiaContainer jc =
parentContainer.getJahiaContainer(jParams, jParams.getEntryLoadRequest());
String actuTitreLong =
jc.getFieldValue("actuTitreLong","",true , jData.params());
pageContext.setAttribute("actuTitreLong",actuTitreLong);
- String actuTitreCourt =
jc.getFieldValue("actuTitreCourt","",true , jData.params());
- pageContext.setAttribute("actuTitreCourt",actuTitreCourt);
-
String actuAccroche =
jc.getFieldValue("actuAccroche","",true , jData.params());
- pageContext.setAttribute("actuAccroche",actuAccroche);
-
String actuDate = jc.getFieldValue("actuDate","",true ,
jData.params());
pageContext.setAttribute("actuDate",actuDate);
- String actuResume = jc.getFieldValue("actuResume","",true ,
jData.params());
- pageContext.setAttribute("actuResume",actuResume);
- String actuTexte = jc.getFieldValue("actuTexte","",true ,
jData.params());
- pageContext.setAttribute("actuTexte",actuTexte);
-
- JahiaFileField actuImg = (JahiaFileField)
jc.getFieldObject("actuImg");
- pageContext.setAttribute("actuImg",actuImg.getDownloadUrl());
- String actuImgAlign =
jc.getFieldValue("actuImgAlign","",true , jData.params());
- pageContext.setAttribute("actuImgAlign",actuImgAlign);
- String actuImgTitre =
jc.getFieldValue("actuImgTitre","",true , jData.params());
- pageContext.setAttribute("actuImgTitre",actuImgTitre);
- String actuImgLegende =
jc.getFieldValue("actuImgLegende","",true , jData.params());
- if (actuImgLegende == null || actuImgLegende.length() == 0)
{
- actuImgLegende = actuImgTitre;
+ JahiaFileField actuVideo = (JahiaFileField)
jc.getFieldObject("actuVideo");
+ if (actuVideo != null && actuVideo.isDownloadable()) {
+ pageContext.setAttribute("actuVideo",
actuVideo.getDownloadUrl());
+ }
+ String actuVideoTitre =
jc.getFieldValue("actuVideoTitre","",true , jData.params());
+ pageContext.setAttribute("actuVideoTitre", actuVideoTitre);
+ String actuVideoLegende =
jc.getFieldValue("actuVideoLegende","",true , jData.params());
+ if (actuVideoLegende == null || actuVideoLegende.length()
== 0) {
+ actuVideoLegende = actuVideoTitre;
}
- pageContext.setAttribute("actuImgLegende",actuImgAlign);
- String actuImgCopyright =
jc.getFieldValue("actuImgCopyright","",true , jData.params());
-
pageContext.setAttribute("actuImgCopyright",actuImgCopyright);
+ String actuVideoCopyright =
jc.getFieldValue("actuVideoCopyright","",true , jData.params());
+ if (actuVideoCopyright != null &&
actuVideoCopyright.length() > 0) {
+ actuVideoLegende += " - Auteur: ";
+ actuVideoLegende += actuVideoCopyright;
+ }
+
pageContext.setAttribute("actuVideoLegende",actuVideoLegende);
%>
<jahiaHtml:actionMenu name="parentContainerBean"
namePostFix="" resourceBundle="jahiatemplates.Corporate_portal_templates">
<h1> <!-- Titre long -->
@@ -66,55 +59,56 @@
<!-- div texte -->
<div class="txtContent">
<h2> <!-- Titre court -->
- <logic:notEmpty name="actuTitreCourt">
- <bean:write name="actuTitreCourt" filter="false"/>
- </logic:notEmpty>
</h2>
- <p> <!-- Accroche -->
- <logic:notEmpty name="actuAccroche">
- <bean:write name="actuAccroche" filter="false"/>
- </logic:notEmpty>
+ <p> <!-- Accroche -->
+ <%=actuAccroche%>
</p>
- <!-- Image. parametre d'alignement de l'image :
imgAlignLeft, imgAlignCenter, imgAlignTopLeft et imgAlignRight -->
- <p>
- <logic:notEmpty name="actuImg">
- <div class="imgAlign<bean:write
name="actuImgAlign" filter="false"/>">
- <div> <!-- titre image -->
- <logic:notEmpty
name="actuImgTitre">
- <bean:write name="actuImgTitre"
filter="false"/>
- </logic:notEmpty>
- </div>
- <img src="<bean:write
name="actuImg" filter="false"/>" width="200" height="133" alt="<bean:write
name="actuImgLegende" filter="false"/>">
- <!-- copyright -->
- <div class="txtCopyright">
- <logic:notEmpty
name="actuImgCopyright">
- © <bean:write
name="actuImgCopyright" filter="false"/>
- </logic:notEmpty>
- </div>
- </div>
- </logic:notEmpty>
- <!-- resume -->
- <%=actuResume%>
- </p>
- <ul>
- <%=actuTexte%>
- </ul>
<p class="txtDateContentList">
<!-- Date de l'information -->
<logic:notEmpty name="actuDate">
[<bean:write name="actuDate"
filter="false"/>]
</logic:notEmpty>
</p>
+ <p class="txtDateContentList">
+ <logic:notEmpty name="actuVideo">
+ <br />
+ <img src="<content:contextURL/>/images_alize/ico_video.gif"
width="17" height="15" alt="Vidéo Avi" />
+ <a href="<bean:write name="actuVideo" filter="false"/>"
title="<bean:write name="actuVideoLegende" filter="false"/>"><bean:write
name="actuVideoTitre" filter="false"/></a><br />
+ </logic:notEmpty>
+ </p>
</div>
</jahiaHtml:actionMenu>
+ <%}
+ if
("liensContainercontenuLien_liste_actualite".equals(parentContainerBean.getDefinition().getName()))
{
+
pageContext.setAttribute("parentContainerBean",parentContainerBean);
+ JahiaContainer jc =
parentContainer.getJahiaContainer(jParams, jParams.getEntryLoadRequest());
+ //String actuTitre = jc.getFieldValue("lienPage","",true ,
jData.params());
+ JahiaPage lienPage = (JahiaPage)
jc.getFieldObject("lienPage" );
+ String actuTitre = lienPage.getTitle();
+ %>
+ <h1> <!-- Titre long -->
+ <%=actuTitre%>
+ </h1>
+ <jsp:include page="include/alize_titres.jsp"
flush="true">
+ <jsp:param name="accroche" value="true" />
+ <jsp:param name="notTitreLong" value="true" />
+ <jsp:param name="ContainerName"
value="actualiteTitre" />
+ </jsp:include>
+
+ <%
+ }
+ %>
+ <br />
+ <jsp:include page="include/alize_paragraphe.jsp"
flush="true"/>
<!-- /div texte -->
- <div class="savoirPlusContent">
- <jsp:include
page="include/alize_liens.jsp"flush="true"/>
- </div>
-<%}}%>
- </div>
- <%-- footer --%>
- <%@ include file="include/alize_footer.inc"%>
+ <br />
+ <jsp:include page="include/alize_liens.jsp"flush="true">
+ <jsp:param name="class"
value="savoirPlusContent" />
+ </jsp:include>
+<%}%>
+ <%-- footer --%>
+ <%@ include file="include/alize_footer.inc"%>
+ </div>
</div>
</body>
</html>
Index: template_alize_communique.jsp
===================================================================
RCS file:
/home/cvs/repository/minefi_templates/templates_intranet/template_alize_communique.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- template_alize_communique.jsp 25 May 2005 10:12:41 -0000 1.2
+++ template_alize_communique.jsp 3 Jun 2005 15:09:59 -0000 1.3
@@ -1,7 +1,5 @@
<%@ include file="include/alize_headers.inc"%>
<%-- declaration --%>
-<%-- Nombre d'element a afficher dans la liste --%>
-<% int CommuniqueWindowSize = 5; %>
<%@ include file="include/alize_communique_declaration.inc"%>
@@ -17,63 +15,10 @@
<%-- footer --%>
<%@ include file="include/alize_navigation.inc"%>
-
- <%-- contenu --%>
- <div id="large">
- <div id="centreBig">
- <%ContentContainer parentContainer = null;
- ContentPageField contentPageField = (ContentPageField)
contentPage.getParent(
jParams.getUser(),jParams.getEntryLoadRequest(),ParamBean.NORMAL);
- if ( contentPageField == null ){
- // try to get the active
- EntryLoadRequest lRequest = new
EntryLoadRequest(EntryLoadRequest.ACTIVE_WORKFLOW_STATE,0,jParams.getEntryLoadRequest().getLocales());
- contentPageField = (ContentPageField)contentPage.getParent(
jParams.getUser(),lRequest,ParamBean.NORMAL);
- }
- if (contentPageField != null){
- parentContainer =
(ContentContainer)contentPageField.getParent(jParams.getUser(),
jParams.getEntryLoadRequest(), jParams.getOperationMode());
- ContainerBean parentContainerBean = new
ContainerBean(parentContainer.getJahiaContainer(jParams,
jParams.getEntryLoadRequest()),jParams);
- if
("CommuniqueContainer".equals(parentContainerBean.getDefinition().getName())) {
-
pageContext.setAttribute("parentContainerBean",parentContainerBean);
- JahiaContainer jc =
parentContainer.getJahiaContainer(jParams, jParams.getEntryLoadRequest());
- String titreLong = jc.getFieldValue("titreLong","",true ,
jData.params());
- pageContext.setAttribute("titreLong",titreLong);
- String date = jc.getFieldValue("titreDate","",true ,
jData.params());
- %>
-
- <jahiaHtml:actionMenu name="parentContainerBean"
namePostFix="" resourceBundle="jahiatemplates.Corporate_portal_templates">
- <h1><%=titreLong%></h1>
- <p
class="txtDateContentList">[<%=date%>]</p><br />
- </jahiaHtml:actionMenu>
- <%
- }
- }%>
-
-
- <jsp:include page="include/alize_titres.jsp" flush="true">
- <jsp:param name="accroche" value="true" />
- <jsp:param name="notTitreLong" value="true" />
- </jsp:include>
-
- <!-- div texte -->
- <div class="txtContentMedium">
- <p>
- <%@ include
file="include/alize_lieu_communiquant.inc"%>
- </p>
- </div>
- <div class="lineContent"><img
src="images_alize/dot.gif" width="1" height="1" alt="" /></div>
-
-<jsp:include page="include/alize_paragraphe.jsp" flush="true"/>
-<br />
-<div class="lineContent"><img src="images_alize/dot.gif" width="1"
height="1" alt="" /></div>
-
- <%@ include file="include/alize_copyright.inc"%>
- <div class="savoirPlusContent">
- <jsp:include page="include/alize_liens.jsp"
flush="true"/>
- </div>
- <%-- footer --%>
- <%@ include file="include/alize_footer.inc"%>
- </div> <!-- /large-->
- </div> <!-- /centre Big-->
+ <%-- content --%>
+ <%@ include file="include/alize_commu_discours.inc"%>
+
</div>
</body>
</html>
Index: template_alize_contenu_general.jsp
===================================================================
RCS file:
/home/cvs/repository/minefi_templates/templates_intranet/template_alize_contenu_general.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- template_alize_contenu_general.jsp 25 May 2005 09:48:14 -0000
1.1
+++ template_alize_contenu_general.jsp 3 Jun 2005 15:09:59 -0000
1.2
@@ -21,7 +21,9 @@
<p/><jsp:include page="include/alize_contenu_general_date.jsp"
flush="true"/>
- <p/><jsp:include page="include/alize_liens.jsp" flush="true"/>
+ <p/><jsp:include page="include/alize_liens.jsp" flush="true">
+ <jsp:param name="class" value="savoirPlusContent" />
+ </jsp:include>
<%-- footer --%>
<%@ include file="include/alize_footer.inc"%>
Index: template_alize_lettre_mission.jsp
===================================================================
RCS file:
/home/cvs/repository/minefi_templates/templates_intranet/template_alize_lettre_mission.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- template_alize_lettre_mission.jsp 25 May 2005 09:48:14 -0000 1.1
+++ template_alize_lettre_mission.jsp 3 Jun 2005 15:09:59 -0000 1.2
@@ -18,7 +18,7 @@
<jsp:include page="include/alize_titres.jsp" flush="true">
<jsp:param name="notSousTitre" value="true" />
- </jsp:include>
+ </jsp:include>
<p/><jsp:include page="include/alize_lettre_mission_descriptif.jsp"
flush="true"/>
@@ -26,8 +26,9 @@
<p/><jsp:include page="include/alize_lettre_mission_signature.jsp"
flush="true"/>
- <p/><jsp:include page="include/alize_liens.jsp" flush="true"/>
-
+ <p/><jsp:include page="include/alize_liens.jsp" flush="true">
+ <jsp:param name="class" value="savoirPlusContent" />
+ </jsp:include>
<p/><jsp:include page="include/alize_bas_page.jsp" flush="true"/>
<%-- footer --%>
Index: template_alize_liste.jsp
===================================================================
RCS file:
/home/cvs/repository/minefi_templates/templates_intranet/template_alize_liste.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- template_alize_liste.jsp 25 May 2005 09:48:14 -0000 1.1
+++ template_alize_liste.jsp 3 Jun 2005 15:09:59 -0000 1.2
@@ -18,8 +18,7 @@
<div><h1><%@ include file="include/page_title.inc"%></h1></div>
<jsp:include page="include/alize_liste_contenu.jsp" flush="true">
<jsp:param name="id" value="liste_actualite"/>
- <jsp:param name="titre_contenu" value="Actualités des
directions"/>
-
+ <jsp:param name="titre_contenu" value="<%=pageTitle%>"/>
</jsp:include>
<%-- footer --%>
<%@ include file="include/alize_footer.inc"%>
Index: template_alize_liste_actualite.jsp
===================================================================
RCS file:
/home/cvs/repository/minefi_templates/templates_intranet/template_alize_liste_actualite.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- template_alize_liste_actualite.jsp 25 May 2005 09:48:14 -0000
1.1
+++ template_alize_liste_actualite.jsp 3 Jun 2005 15:09:59 -0000
1.2
@@ -1,18 +1,10 @@
<%@ include file="include/alize_headers.inc"%>
<%@ include file="include/alize_actualite_declaration.inc"%>
-
-<%
-long cacheExpirationDelay = 5000; // [ms]
-jParams.setCacheExpirationDelay(cacheExpirationDelay);
-
-if ( actuContainerList !=null && actuContainerList.getID()==0 ) {
- ServicesRegistry.getInstance().getJahiaContainersService().
- saveContainerListInfo(actuContainerList,
jData.params().getContentPage().getAclID());
-}
-%>
-
<a name="top"></a>
-<div class="accessibilite"><a href="#menu" accesskey="m"><img
src="<content:contextURL/>/images_alize/dot.gif" height="1" width="1"
alt="Aller au menu - racourcis (alt + m)" /></a> <a href="#contenu"
accesskey="s"><img src="<content:contextURL/>/images_alize/dot.gif" height="1"
width="1" alt="Acc�der au contenu - racourcis (alt + s)" /></a></div>
+<div class="accessibilite">
+<a href="#menu" accesskey="m"><img
src="<content:contextURL/>/images_alize/dot.gif" height="1" width="1"
alt="Aller au menu - racourcis (alt + m)" /></a>
+<a href="#contenu" accesskey="s"><img
src="<content:contextURL/>/images_alize/dot.gif" height="1" width="1"
alt="Acc�der au contenu - racourcis (alt + s)" /></a>
+</div>
<div id="inner">
<%-- bandeau --%>
@@ -21,19 +13,19 @@
<%-- menus de gauche --%>
<%@ include file="include/alize_menus_gauche.inc"%>
+ <div id="large">
+ <a name="contenu"></a>
+
<%-- footer --%>
<%@ include file="include/alize_navigation.inc"%>
<%-- contenu --%>
- <!-- Bloc tout actu -->
- <br/>
- <div id="centreBig">
-
- <div class="encartTopContentBig"><img src="images_alize/dot.gif"
width="1" height="1" alt="" /></div>
+
+ <!-- Bloc tout actu -->
+ <div class="encartTopContentBig"><img
src="<content:contextURL/>/images_alize/dot.gif" width="1" height="1" alt=""
/></div>
<div class="encartContentBig">
<div><h2>Toute l'actualité</h2><br /></div>
-
- <ul class="actuList">
+ <ul class="actuList">
<%
int containerListSize = actuContainerList.size();
int actuContainerListID = actuContainerList.getID();
@@ -48,7 +40,7 @@
String Accroche = actuDocContainer.getFieldValue("actuAccroche","", true
, jData.params());
String Date = actuDocContainer.getFieldValue("actuDate","", true ,
jData.params());
%>
- <li>
+ <li>
<div>
<h3><%=TitreLong%>
<%jData.gui().html().drawBeginActionMenu(actuDocContainerBean , null, null,
false, "", "jahiatemplates.Corporate_portal_templates", null,
out);%>
@@ -79,28 +71,25 @@
} // for
}
-org.jahia.engines.JahiaEngine theAddContainerEngine =
(org.jahia.engines.JahiaEngine)
org.jahia.registries.EnginesRegistry.getInstance().getEngine( "addcontainer" );
-StringBuffer addContName = new StringBuffer("addContainer_");
-addContName.append(actuContainerList.getID());
-addContName.append(jData.gui().html().cleanSessionID(jParams.getSessionID()));
-String addContHtml = theAddContainerEngine.renderLink( jParams,
actuContainerList );
-String launcher =
"OpenJahiaScrollableWindow('"+addContHtml+"','"+addContName+"',640,480)";
-if (jData.gui().isEditMode() &&
actuContainerList.checkWriteAccess(jParams.getUser())) {
+if (jData.gui().isEditMode() /*&&
actuContainerList.checkWriteAccess(jParams.getUser())*/) {
+ final String vAddLauncher =
jData.gui().html().drawAddContainerLauncher(actuContainerList);
+ final String vListPropertiesLauncher =
jData.gui().html().drawContainerListPropertiesLauncher(actuContainerList);
%>
- <br><a class="horizontaleline"
href="javascript:<%=launcher%>"><%=addButton%> Ajouter une actualite</a>
+ <span class="boutonJahia" >
+ <br />
+ <a href="javascript:<%=vAddLauncher%>"><%=addButton%> Ajouter
une actualité</a><br />
+ <a
href="javascript:<%=vListPropertiesLauncher%>"><%=propertiesButton%> Trier
les actualités</a>
+ </span>
<%
}
%>
</ul>
- </div>
- <div class="encartBottomContentBig"><img
src="images_alize/dot.gif" width="1" height="1" alt="" /></div>
- </div>
- <!-- /Bloc tout actu -->
-
- <%-- footer --%>
- <%@ include file="include/alize_footer.inc"%>
-
+ </div>
+ <div class="encartBottomContentBig"><img
src="<content:contextURL/>/images_alize/dot.gif" width="1" height="1" alt=""
/></div>
+ <!-- /Bloc tout actu -->
+ <%-- footer --%>
+ <%@ include file="include/alize_footer.inc"%>
</div>
</body>
</html>
Index: template_alize_liste_communiques.jsp
===================================================================
RCS file:
/home/cvs/repository/minefi_templates/templates_intranet/template_alize_liste_communiques.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- template_alize_liste_communiques.jsp 25 May 2005 10:12:41 -0000
1.2
+++ template_alize_liste_communiques.jsp 3 Jun 2005 15:09:59 -0000
1.3
@@ -1,18 +1,10 @@
+<[EMAIL PROTECTED]
import="fr.gouv.finances.dpma.gcp.jahia.util.minefi.MultipleContainerSearch"%>
+<[EMAIL PROTECTED]
import="fr.gouv.finances.dpma.gcp.jahia.util.minefi.SearchResultat"%>
<%@ include file="include/alize_headers.inc"%>
-<%-- Personnalite --%>
-<content:declareContainerList name="Personnalites" title="Personnalit�s">
- <content:declareContainer>
- <content:declareField name="Personnalite" title="Personnalit�"
type="SmallText"/>
- </content:declareContainer>
-</content:declareContainerList>
-
<%-- javascript de validation des champs date sur le client --%>
<script type="text/javascript" language="javascript"
src="<content:contextURL/>/js/formvalidation.js"></script>
-<%-- Nombre d'element a afficher dans la liste --%>
-<% int CommuniqueWindowSize = 5; %>
-
<%@ include file="include/alize_communique_declaration.inc"%>
<a name="top"></a>
@@ -28,292 +20,8 @@
<%-- footer --%>
<%@ include file="include/alize_navigation.inc"%>
-<%
-// definition des filtres, texte de recherche et ordre d'affichage
-boolean isInSearch = false;
-
-Vector containerFilterVector = new Vector();
-
-// date de debut
-String dateDebutString = request.getParameter("dateDebut");
-if (dateDebutString == null ) {
- dateDebutString = "";
-}
-if (dateDebutString != null && dateDebutString.length() > 0) {
- try {
- SimpleDateFormat formatter = new SimpleDateFormat("dd/MM/yyyy",
Locale.FRENCH);
- Date upperVal = (Date)formatter.parse(dateDebutString);
- ContainerFilterBean dateFilter = new
ContainerFilterBean("titreDate",true,jParams.getEntryLoadRequest());
- dateFilter.addClause(ContainerFilterBean.COMP_BIGGER,
String.valueOf(upperVal.getTime()) );
- containerFilterVector.add(dateFilter);
- isInSearch = true;
- }
- catch (java.text.ParseException e) {
- dateDebutString = "";
- }
-}
-// date de fin
-String dateFinString = request.getParameter("dateFin");
-if (dateFinString == null ) {
- dateFinString = "";
-}
-if (dateFinString != null && dateFinString.length() > 0) {
- try {
- SimpleDateFormat formatter = new SimpleDateFormat("dd/MM/yyyy",
Locale.FRENCH);
- Date lowerVal = (Date)formatter.parse(dateFinString);
- ContainerFilterBean dateFilter = new
ContainerFilterBean("titreDate",true,jParams.getEntryLoadRequest());
- dateFilter.addClause(ContainerFilterBean.COMP_SMALLER,
String.valueOf(lowerVal.getTime()) );
- containerFilterVector.add(dateFilter);
- isInSearch = true;
- }
- catch (java.text.ParseException e) {
- dateFinString = "";
- }
-}
-// positionnement des filtres pour les dates
-if ( containerFilterVector.size()>0 ) {
- ContainerFilters containerFilters = new
ContainerFilters(containerFilterVector,jParams.getSiteID(),null);
-
request.setAttribute("CommuniqueContainer_filter_handler",containerFilters);
-}
-
-// chaine de recherche et filtre pour les personnalites
-String commuSearchString = request.getParameter("commuSearchString");
-if (commuSearchString == null ) {
- commuSearchString = "";
-}
-String personnalite = request.getParameter("personnalite");
-// si personnalite vaut toute on annule la recherche
-if (personnalite == null ) {
- personnalite = "";
-}
-if ("toute".equals(personnalite)) {
- personnalite = "";
-}
-
-// construit la requete de recherche
-if ((commuSearchString != null && commuSearchString.length() > 0) ||
- (personnalite != null && personnalite.length() > 0) ) {
- StringBuffer searchBlogQuery = new StringBuffer();
- if (commuSearchString != null && commuSearchString.length() > 0) {
- searchBlogQuery.append(commuSearchString);
- }
- if (personnalite != null && personnalite.length() > 0) {
- if (searchBlogQuery.length() > 1) {
- searchBlogQuery.append(" AND ");
- searchBlogQuery.append(personnalite);
- }
- else {
- searchBlogQuery.append(personnalite);
- }
- }
- ContentPage startPage = ContentPage.getPage(jData.page().getID());
- int pageInfosFlag = ContentPage.ACTIVE_PAGE_INFOS |
ContentPage.STAGING_PAGE_INFOS;
- FlatSiteMapViewHelper flatSiteMap = new
FlatSiteMapViewHelper(jParams.getUser(), startPage, pageInfosFlag,
- jParams.getLocale().toString(),
FlatSiteMapViewHelper.DEFAULT_LEVEL);
-
- searchBlogQuery.append(" AND (");
- for (int j = 0; j < flatSiteMap.size(); j++) {
- int pageId = flatSiteMap.getPageID(j);
- if (j > 0) {
- searchBlogQuery.append(" OR ");
- }
- searchBlogQuery.append("pageid:" + pageId );
- }
- searchBlogQuery.append(")");
- searchBlogQuery.append(" AND
(container_definition_name:CommuniqueContainer OR
container_definition_name:titreContainer OR
container_definition_name:paraContainerList)");
- ContainerSearcher containerSearcher = new
ContainerSearcher(jParams.getSiteID(),null,searchBlogQuery.toString(),jParams.getEntryLoadRequest());
-
request.setAttribute("CommuniqueContainer_search_handler",containerSearcher);
- isInSearch = true;
-}
-
-// tri
-ContainerSorterByContainerDefinition communique_sort_handler = new
ContainerSorterByContainerDefinition(-1, "titreDate",
"CommuniqueContainer",jParams.getEntryLoadRequest(), true);
-communique_sort_handler.setDescOrdering();
-//request.setAttribute("CommuniqueContainer_sort_handler",
communique_sort_handler);
-%>
-
<%-- contenu --%>
- <div id="large">
- <div id="centreBig">
-
-<%
-// definition de quelques variables
-JahiaContainerList CommuniqueContainerList =
jData.containers().getContainerList( "CommuniqueContainer" );
-CommuniqueContainerList.setIsContainersLoaded(false);
-int containerListFullSize = communiqueContainerList.getFullSize();
-JahiaContainerListPagination pagination =
communiqueContainerList.getCtnListPagination();
-%>
- <!-- titre -->
- <h1>Les communiqués de presse</h1>
- <!-- /titre -->
-
- <!-- div de callage -->
- <div id="centreBig">
-
- <!-- bt retour -->
- <div class="savoirPlus"><a
href="<%=jData.page().getURL(jParams)%>">Retour à la liste</a></div>
- <div class="clearer"><img
src="<jahia:contextURL/>/images_alize/dot.gif" width="1" height="10" alt=""
/></div>
- <!-- /bt retour -->
-
- <!-- Bloc recherche -->
- <div class="encartTopContentBig"><img
src="<jahia:contextURL/>/images_alize/dot.gif" width="1" height="1" alt=""
/></div>
- <div class="encartContentBig">
- <!-- texte -->
- <div><h2>Moteur de recherche</h2></div>
-
- <div>
- <br />
- <form name="commusearch"
action="<%=bypassUrl%>" method="GET" onsubmit="return ValidateForm()">
- <dd><label
for="dateDebut"><img src="<jahia:contextURL/>/images_alize/dot.gif" width="1"
height="1" alt="Période de début de parution" /></label><span
class="txtContentMedium"><strong>Période de parution :</strong></span>
- <span
class="txtContent">du</span>
- <input type="text"
name="dateDebut" class="frmInput80" value="<%=dateDebutString%>">
- <label
for="dateFin"><img src="<jahia:contextURL/>/images_alize/dot.gif" width="1"
height="1" alt="Période de fin de parution" /></label>
- <span
class="txtContent">au</span>
- <input type="text"
name="dateFin" class="frmInput80" value="<%=dateFinString%>"> <span
class="txtContent">format date : jj/mm/aaaa</span></dd>
- <br /><img
src="<jahia:contextURL/>/images_alize/dot.gif" width="1" height="10" alt=""
/><br />
- <dd><label
for="motcle"><img src="<jahia:contextURL/>/images_alize/dot.gif" width="1"
height="1" alt="Titre ou mots significatifs" /></label><span
class="txtContentMedium"><strong>Titre ou mots significatifs :</strong></span>
- <input type="text"
name="commuSearchString" class="frmInput300"
value="<%=commuSearchString%>"></dd>
- <br /><img
src="<jahia:contextURL/>/images_alize/dot.gif" width="1" height="10" alt=""
/><br />
- <dd><label
for="personnalite"><img src="<jahia:contextURL/>/images_alize/dot.gif"
width="1" height="1" alt="Personnalité" /></label><span
class="txtContentMedium"><strong>Personnalité : </strong></span>
- <select
name="personnalite" class="frmSelect"
onChange="javascript:document.commusearch.submit()">
- <option
value="toute">toute</option>
-
<content:containerList name='Personnalites' id="Personnalites">
- <content:container
id="PersonnalitesContainer">
-
<content:textField name='Personnalite' display="false" valueId="Personnalite"
defaultValue="" diffActive="true"/>
-
<logic:equal name='Personnalite' value="<%=personnalite%>" >
-
<option value="<bean:write name='Personnalite'/>" selected ><bean:write
name='Personnalite'/></option>
- </logic:equal>
-
<logic:notEqual name='Personnalite' value="<%=personnalite%>" >
-
<option value="<bean:write name='Personnalite'/>" ><bean:write
name='Personnalite'/></option>
-
</logic:notEqual>
- </content:container>
-
</content:containerList>
- </select>
- <%-- Affiche la liste
des personalites en mode edit --%>
- <%if
(jData.gui().isEditMode()) {%>
- <span
class="txtContent" style="font-size:10px;width: 200px;display: block;">
- <%-- <fieldset
style="padding: 5px; width: 200px"> --%>
- <div
style="font-size:10px;width: 200px">
-
<jahiaHtml:actionMenu name="Personnalites" namePostFix=""
resourceBundle="jahiatemplates.Corporate_portal_templates">
-
<content:containerList name='Personnalites' id="Personnalites">
-
<content:updateFieldURL id="PersonnalitesUpdateURL" display="false"/>
-
<content:addContainerURL id="PersonnalitesAddURL" display="false"/>
-
<content:container id="PersonnalitesContainer">
-
<content:containerDiffHighlight id="PersonnalitesHighLight"
name="PersonalitesContainer"/>
-
<content:textField name='Personnalite' />
-
<content:updateContainerURL id="PersonnaliteUpdateURL" display="false"/>
-
<content:deleteContainerURL id="PersonnaliteDeleteURL" display="false"/>
-
<logic:present name="PersonnaliteUpdateURL">
-
<a href="<bean:write name='PersonnaliteUpdateURL'/>"><%=updateButton%></a>
-
<a href="<bean:write name='PersonnaliteDeleteURL'/>"><%=deleteButton%></a>
-
</logic:present>
-
<br />
-
</content:container>
-
</content:containerList>
-
<logic:present name="PersonnalitesUpdateURL">
- <a
href="<bean:write name='PersonnalitesUpdateURL'/>">Ajouter une
personnalité</a>
-
</logic:present>
-
<logic:present name="PersonnalitesAddURL">
- <a
style="font-size:12px;color:#ff9900" href="<bean:write
name='PersonnalitesAddURL'/>">Ajouter une personnalité</a>
-
</logic:present>
-
</jahiaHtml:actionMenu>
- </div>
- <%-- </fieldset> --%>
- </span>
- <%}%>
- </dd>
- <br /><img
src="<jahia:contextURL/>/images_alize/dot.gif" width="1" height="10" alt=""
/><br />
- <dd><label
for="rubrique"><img src="<jahia:contextURL/>/images_alize/dot.gif" width="1"
height="1" alt="Rubrique" /></label><span
class="txtContentMedium"><strong>Rubrique : </strong></span> <select
name="rubrique" class="frmSelect"><option
value="toute">toute</option></select></dd>
-
- <br /><img
src="<jahia:contextURL/>/images_alize/dot.gif" width="1" height="10" alt=""
/><br />
- <div class="alignRight">
- <input type="reset"
name="Annuler" value="Annuler" alt="Ré-initialiser les champs du
formulaire" class="btnSubmit " /> <input type="submit" name="valider"
value="Valider" alt="Rechercher dans les archives" class="btnSubmit " /> </div>
- <input type='hidden'
name='ctnscroll_CommuniqueContainer' value='5_0'>
- </form>
- <br />
- </div>
- <!-- /texte -->
- </div>
- <div class="encartBottomContentBig"><img
src="<jahia:contextURL/>/images_alize/dot.gif" width="1" height="1" alt=""
/></div>
- <!-- /Bloc recherche -->
-
- <!-- Bloc liste communique -->
- <div class="encartTopContentBig"><img
src="<jahia:contextURL/>/images_alize/dot.gif" width="1" height="1" alt=""
/></div>
- <div class="encartContentBig">
- <!-- texte -->
- <div><h2>Liste des
communiqués</h2></div>
- <% if (isInSearch) { %>
- <div class="txtContent">Il y a
<strong><%=containerListFullSize%></strong> réponses correspondant
à votre recherche.</div>
- <%}%>
-<%if (containerListFullSize > CommuniqueWindowSize) {%>
-<%@ include file="include/alize_pagination.inc"%>
-<%}%>
- <ul class="linkListCommunique">
-
-<%
-int communiqueContainerListID = communiqueContainerList.getID();
-Enumeration communiqueEnumeration = CommuniqueContainerList.getContainers();
-
-int currentPageId = jData.page().getID();
-
-while (communiqueEnumeration.hasMoreElements()) {
- JahiaContainer CommuniqueContainer =
(JahiaContainer)communiqueEnumeration.nextElement();
- int pageId = CommuniqueContainer.getPageID();
- // si la page id du container est differente de la page courante alors
la chaine trouve est dans une autre page
- if (pageId != currentPageId) {
- // retrouve la page en remontant dans la hierarchie des
containers
- ContentContainer container =
ContentContainer.getContainer(CommuniqueContainer.getID());
- ContentPage containerPage = container.getPage();
- ContentPageField contentPageField = (ContentPageField)
containerPage.getParent(
jParams.getUser(),jParams.getEntryLoadRequest(),ParamBean.NORMAL);
- ContentContainer parentContainer =
(ContentContainer)contentPageField.getParent(jParams.getUser(),
jParams.getEntryLoadRequest(), jParams.getOperationMode());
- ContainerBean parentContainerBean = new
ContainerBean(parentContainer.getJahiaContainer(jParams,
jParams.getEntryLoadRequest()),jParams);
- CommuniqueContainer =
parentContainer.getJahiaContainer(jParams, jParams.getEntryLoadRequest());
- }
- String TitreLong = CommuniqueContainer.getFieldValue("titreLong","",
true , jData.params());
- String titreDate = CommuniqueContainer.getFieldValue("titreDate","",
true , jData.params());
-
- ContainerBean communiqueDocContainerBean = new
ContainerBean(CommuniqueContainer,jData.params());
- JahiaPage communiqueDocPage = (JahiaPage)
CommuniqueContainer.getFieldObject("CommuniquePage" );
-
- if (communiqueDocPage != null) {
-%>
- <li><a
href="<%=communiqueDocPage.getURL(jParams)%>"><%=titreDate%> - <%=TitreLong%>
</a>
-
<%jData.gui().html().drawBeginActionMenu(communiqueDocContainerBean , null,
null, false, "", "jahiatemplates.Corporate_portal_templates", null, out);%>
- </li>
- <!-- /texte -->
-<%
- }
-}%>
- </ul>
-<%
-
-org.jahia.engines.JahiaEngine theAddContainerEngine =
(org.jahia.engines.JahiaEngine)
org.jahia.registries.EnginesRegistry.getInstance().getEngine( "addcontainer" );
-StringBuffer addContName = new StringBuffer("addContainer_");
-addContName.append(communiqueContainerList.getID());
-addContName.append(jData.gui().html().cleanSessionID(jParams.getSessionID()));
-String addContHtml = theAddContainerEngine.renderLink( jParams,
communiqueContainerList );
-String launcher =
"OpenJahiaScrollableWindow('"+addContHtml+"','"+addContName+"',640,480)";
-
-if (!isInSearch && jData.gui().isEditMode() &&
communiqueContainerList.checkWriteAccess(jParams.getUser())) {
- %>
- <br><a class="horizontaleline"
href="javascript:<%=launcher%>"><%=addButton%> Ajouter un
communiqué</a>
- <%
-}
-%>
-<%if (containerListFullSize > CommuniqueWindowSize) {%>
-<%@ include file="include/alize_pagination.inc"%>
-<%}%>
- </div>
-
- <div class="encartBottomContentBig"><img
src="<jahia:contextURL/>/images_alize/dot.gif" width="1" height="1" alt=""
/></div>
- <!-- Bloc liste communique -->
-
- </div>
- <!-- div de callage -->
- <%-- footer --%>
- <%@ include file="include/alize_footer.inc"%>
- </div>
- </div>
+ <%@ include file="include/alize_commu_discours_contenu.inc"%>
</div>
</body>
