Author: cmailleux
Date: Mon Aug 27 10:40:59 2007
New Revision: 1231
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D1231&repname=
=3Dcorporate_portal_templates
Log:
This migration will transform each container Tag into a fragment Tag and us=
e the new ContainerHtmlCache from thomas and serge to make track back of co=
ntainers inside containers list, this automatic fragment will be automatica=
lly invalidated by jahia during is processing of events, otherwise you can =
still use the classic fragment tag but this one will be only flushed by exp=
iration delay (or invalidation events if it use always invalidate parameter=
s) for a starting point as for the HtmlContainerCache you can refer to the =
corporate portal templates V1, as this new cache and fragments strongly bas=
e themselves on Tag.
Modified:
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/home.jsp
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/top_banner.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/simple.jsp
Modified: branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/home.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/home.jsp&rev=3D1231&repname=3Dcorporate_portal_templat=
es
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/home.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/home.jsp Mon Aug 27 10:40:59 =
2007
@@ -22,7 +22,6 @@
<%@ include file=3D"include/top_banner.inc"%>
=
=
-<jesi:fragment aclGroup=3D"true">
<table width=3D"100%" border=3D"0" cellpadding=3D"0" cellspacing=3D"0">
<tr>
<td valign=3D"top"><%@ include file=3D"include/image.inc"%></td>
@@ -43,9 +42,6 @@
</tr>
</table>
<br/>
-</jesi:fragment>
- =
-<jesi:fragment aclGroup=3D"true">
<table width=3D"100%" border=3D"0" cellpadding=3D"0" cellspacing=3D"0">
<tr>
<td><img src=3D"<content:contextURL/>/images/pix.gif" width=3D"10" hei=
ght=3D"12" alt=3D""/></td>
@@ -70,7 +66,6 @@
<td><img src=3D"<content:contextURL/>/images/pix.gif" width=3D"10" hei=
ght=3D"12" alt=3D""/></td>
</tr>
</table>
-</jesi:fragment>
=
=
<jesi:fragment absolute=3D"true" group=3D'<%=3D"footer_TemplateId_"+jDat=
a.page().getPageTemplateID()%>' > =
Modified: branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/top_banner.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/include/top_banner.inc&rev=3D1231&repname=3Dcorporate_=
portal_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/top_banner.inc (origi=
nal)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/top_banner.inc Mon Au=
g 27 10:40:59 2007
@@ -30,7 +30,7 @@
%><table width=3D"<bean:write name=3D"pageWidth" filter=3D"false"/>" b=
order=3D"0" cellspacing=3D"0" cellpadding=3D"0" class=3D"maintable"><%
if (jData.gui().isLogged()) {
%><tr><td>
- <jesi:fragment aclGroup=3D"true" ignore=3D"<%=3DignoreFragmentTag%>" >
+ <jesi:fragment aclGroup=3D"true" alwaysInvalidate=3D"true">
<%@ include file=3D"admin_menu.inc"%>
</jesi:fragment>
</td></tr><%
@@ -38,11 +38,10 @@
}
=
%>
-<jesi:fragment aclGroup=3D"true" ignore=3D"<%=3DignoreFragmentTag%>" >
+
<% if (!thePrint) { %>
<tr>
<td>
-
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpaddi=
ng=3D"0">
<tr>
<td rowspan=3D"4" class=3D"adminmenu">
@@ -107,6 +106,7 @@
<%
}
%>
+
<table width=3D"<bean:write name=3D"pageWidth" filter=3D"false"/>" border=
=3D"0" cellspacing=3D"0" cellpadding=3D"0" class=3D"maintable">
<%
if (!thePrint) {
@@ -138,6 +138,7 @@
}
}
%>
+<jesi:fragment aclGroup=3D"true" alwaysInvalidate=3D"true">
<logic:equal name=3D"currentPage" property=3D"homePage" value=3D"false">
<tr>
<td class=3D"path" colspan=3D"2"><%
Modified: branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/simple.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/simple.jsp&rev=3D1231&repname=3Dcorporate_portal_templ=
ates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/simple.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/simple.jsp Mon Aug 27 10:40:5=
9 2007
@@ -21,26 +21,21 @@
<%@ include file=3D"include/header.inc"%>
<%@ include file=3D"include/top_banner.inc"%>
=
-<jesi:fragment aclGroup=3D"true">
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
<tr>
<td width=3D"159" valign=3D"top"><%@ include file=3D"include/left_menu=
.inc"%></td>
<% if (!thePrint && hasLeft !=3D 0) { %><td class=3D"verticaleline"><i=
mg src=3D"<content:contextURL/>/images/pix.gif" width=3D"25" height=3D"12" =
alt=3D""/></td><% } %>
<td width=3D"100%" valign=3D"top">
<h1><%@ include file=3D"include/page_title_ctn.inc"%></h1>
-</jesi:fragment>
-<jesi:fragment aclGroup=3D"true">
+
+
<jsp:include page=3D"include/main_content.jsp" flush=3D"true">
<jsp:param name=3D"id" value=3D"main_1"/>
</jsp:include>
- </jesi:fragment>
- <jesi:fragment aclGroup=3D"true">
<jsp:include page=3D"include/box.jsp" flush=3D"true">
<jsp:param name=3D"id" value=3D"main_1"/>
<jsp:param name=3D"displayDetails" value=3D"true"/>
</jsp:include>
- </jesi:fragment>
- <jesi:fragment aclGroup=3D"true">
</td>
<td><img src=3D"<content:contextURL/>/images/pix.gif" width=3D"25" hei=
ght=3D"12" alt=3D""/></td>
<td valign=3D"top">
@@ -51,7 +46,6 @@
</td>
</tr>
</table>
-</jesi:fragment>
=
=
<jesi:fragment absolute=3D"true" group=3D'<%=3D"footer_TemplateId_"+jDat=
a.page().getPageTemplateID()%>' > =
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
