Author: tdraier
Date: Thu Aug 2 12:17:14 2007
New Revision: 1226
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D1226&repname=
=3Dcorporate_portal_templates
Log:
add container cache in menus
Modified:
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/left_menu.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/main_menu.inc
Modified: branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/left_menu.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/include/left_menu.inc&rev=3D1226&repname=3Dcorporate_p=
ortal_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/left_menu.inc (origin=
al)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/left_menu.inc Thu Aug=
2 12:17:14 2007
@@ -184,13 +184,43 @@
=
<content:absoluteContainerList name=3D"linkContainer" id=3D"linkContai=
nerList" pageLevel=3D"<%=3DString.valueOf(startLevel)%>">
<jahiaHtml:actionMenu name=3D"linkContainerList" namePostFix=3D"" =
resourceBundle=3D"jahiatemplates.Corporate_portal_templates">
- <content:container id=3D"linkContainer">
+ <content:container id=3D"linkContainer" cache=3D"off">
<content:pageField valueId=3D"link" name=3D"link" id=3D"topLin=
kField" />
+ <logic:notEmpty name=3D"link">
+ <logic:equal name=3D"link" property=3D"currentPage" value=
=3D"true">
+ <bean:define id=3D"state" value=3D"current"/>
+ </logic:equal>
+ <logic:notEqual name=3D"link" property=3D"currentPage" val=
ue=3D"true">
+ <logic:equal name=3D"link" property=3D"inCurrentPagePath=
" value=3D"true">
+ <bean:define id=3D"state" value=3D"on"/>
+ </logic:equal>
+ <logic:notEqual name=3D"link" property=3D"inCurrentPagePath=
" value=3D"true">
+ <bean:define id=3D"state" value=3D""/>
+ </logic:notEqual>
+ </logic:notEqual>
+ <logic:notEmpty name=3D"link" property=3D"title">
+ <% linkCount++; %>
+ </logic:notEmpty>
+
+ </logic:notEmpty>
+
+ <logic:empty name=3D"link">
+ <logic:equal name=3D"currentRequest" property=3D"editMode"=
value=3D"true">
+ <% linkCount++; %>
+ </logic:equal>
+ </logic:empty>
+
+ <bean:define id=3D"mystate" name=3D"state"/>
+ <%
+ if (mystate.equals("on")) {
+ mystate =3D "" + mystate + jData.params().getPageID();
+ }
+ %>
+ <content:container-cache cacheKey=3D"<%=3D(String)mystate%>">
=
<logic:empty name=3D"link">
<logic:equal name=3D"currentRequest" property=3D"editMode"=
value=3D"true">
<%
- linkCount++;
if (linkCount =3D=3D 1) {
%><table border=3D"0" cellspacing=3D"0" cellpaddin=
g=3D"0" width=3D"100%"><%
}
@@ -210,22 +240,8 @@
=
=
<logic:notEmpty name=3D"link">
-
- <logic:equal name=3D"link" property=3D"currentPage" value=
=3D"true">
- <bean:define id=3D"state" value=3D"current"/>
- </logic:equal>
- <logic:notEqual name=3D"link" property=3D"currentPage" val=
ue=3D"true">
- <logic:equal name=3D"link" property=3D"inCurrentPagePath"
v=
alue=3D"true">
- <bean:define id=3D"state" value=3D"on"/>
- </logic:equal>
- <logic:notEqual name=3D"link" property=3D"inCurrentPagePath=
" value=3D"true">
- <bean:define id=3D"state" value=3D""/>
- </logic:notEqual>
- </logic:notEqual>
-
<logic:notEmpty name=3D"link" property=3D"title">
<%
- linkCount++;
if (linkCount =3D=3D 1) {
%><table border=3D"0" cellspacing=3D"0" cellpaddin=
g=3D"0" width=3D"100%"><%
}
@@ -275,7 +291,6 @@
<logic:empty name=3D"link" property=3D"title">
<logic:equal name=3D"currentRequest" property=3D"editM=
ode" value=3D"true">
<%
- linkCount++;
if (linkCount =3D=3D 1) {
%><table border=3D"0" cellspacing=3D"0" cellpa=
dding=3D"0" width=3D"100%"><%
}
@@ -297,6 +312,7 @@
</logic:empty>
=
</logic:notEmpty>
+ </content:container-cache>
</content:container>
<%
if (linkCount > 0) {
Modified: branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/main_menu.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/include/main_menu.inc&rev=3D1226&repname=3Dcorporate_p=
ortal_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/main_menu.inc (origin=
al)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/main_menu.inc Thu Aug=
2 12:17:14 2007
@@ -87,7 +87,7 @@
homePageTitle =3D"";
}
%>
- <content:container id=3D"topMenuContainer">
+ <content:container id=3D"topMenuContainer" cache=3D"false">
<content:pageField valueId=3D"topLink" name=3D"topLink" id=3D"=
topLinkField" />
<content:sharedLangTextField valueId=3D"myColorSet" name=3D"co=
lorSet" defaultValue=3D"<%=3DcolorSet%>" display=3D"false"/>
<logic:empty name=3D"topLink">
@@ -108,6 +108,9 @@
<logic:equal name=3D"topLink" property=3D"inCurrentPagePat=
h" value=3D"true">
<bean:define id=3D"classpath" value=3D"topmenuon"/>
</logic:equal>
+
+ <bean:define id=3D"myclasspath" name=3D"classpath"/>
+ <content:container-cache cacheKey=3D"<%=3Dmyclasspath%>">
<%
PageBean topLinkBean =3D (PageBean) pageContext.findAttrib=
ute("topLink");
JahiaPage topLink =3D topLinkBean.getJahiaPage();
@@ -224,7 +227,7 @@
=
}
%>
-
+ </content:container-cache>
</logic:notEmpty>
</content:container>
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
