Author: tdraier
Date: Mon Aug 13 14:53:25 2007
New Revision: 1228
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D1228&repname=
=3Dcorporate_portal_templates
Log:
fixed main menu with container cache
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=3D1228&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 Mon Aug=
13 14:53:25 2007
@@ -34,10 +34,7 @@
currentLevel++;
try {
if (linksContainerList !=3D null) {
- org.jahia.taglibs.container.ContainerCache oldCacheTag =3D (or=
g.jahia.taglibs.container.ContainerCache) pageContext.getAttribute("cacheta=
g");
- if (oldCacheTag !=3D null) {
- oldCacheTag.addContainerListDependency(linksContainerList.=
getID());
- }
+ org.jahia.taglibs.container.ContainerTag.addContainerListDepen=
dency(pageContext, linksContainerList.getID());
Enumeration linksContainerEnum =3D linksContainerList.getConta=
iners();
isNotALink =3D linksContainerList.getContentContainerList().ge=
tPickedObject() =3D=3D null && isNotALink;
while (linksContainerEnum.hasMoreElements()) {
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=3D1228&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 Mon Aug=
13 14:53:25 2007
@@ -49,8 +49,6 @@
enablePopup =3D enablePopup && (! isNS4(request));
enablePopup =3D enablePopup && (!ParamBean.EDIT.equals(jData.params().getO=
perationMode()));
int menuCount =3D 0;
-StringBuffer callJs =3D new StringBuffer("<script language=3D\"javascript\=
" type=3D\"text/JavaScript\"><!--\n");
-StringBuffer div =3D new StringBuffer();
%>
<table width=3D"<bean:write name=3D"pageWidth" filter=3D"false"/>" border=
=3D"0" cellspacing=3D"0" cellpadding=3D"0" class=3D"maintable">
<tr>
@@ -108,6 +106,7 @@
<logic:equal name=3D"topLink" property=3D"inCurrentPagePat=
h" value=3D"true">
<bean:define id=3D"classpath" value=3D"topmenuon"/>
</logic:equal>
+ <% menuCount++; %>
=
<bean:define id=3D"myclasspath" name=3D"classpath"/>
<content:container-cache cacheKey=3D"<%=3Dmyclasspath%>">
@@ -118,7 +117,6 @@
%>
<logic:notEmpty name=3D"topLink" property=3D"title">
<%
- menuCount++;
String onmouseover =3D "";
String onmouseout =3D "";
if (enablePopup) {
@@ -157,7 +155,6 @@
</logic:notEmpty>
<logic:empty name=3D"topLink" property=3D"title">
<logic:equal name=3D"currentRequest" property=3D"editM=
ode" value=3D"true">
- <%menuCount++;%>
<td id=3D"menu<%=3DmenuCount%>" class=3D"topmenu<b=
ean:write name=3D"myColorSet"/>">
<a href=3D"<bean:write name=3D'topLink' proper=
ty=3D'url'/>" style=3D"color:#ff0000;"><content:resourceBundle
resourceBundle=3D"jahiatemplates.Corporate_po=
rtal_templates" resourceName=3D"noTitle"
@@ -167,66 +164,6 @@
</td>
</logic:equal>
</logic:empty>
- <%
- if (enablePopup && topLink !=3D null){
- div.append("<div id=3D\"menu").append(menuCount).a=
ppend("Container\">\n");
- div.append("<table onmouseover=3D\"topOn" + myColo=
rSet + "('menu" + menuCount + "');\" ");
- div.append("onmouseout=3D\"topOff('menu" + menuCou=
nt + "');\" cellpadding=3D\"0\" cellspacing=3D\"0\" border=3D\"0\">\n");
- div.append("<tr valign=3D\"top\">\n");
- div.append(" <td nowrap=3D\"nowrap\">\n");
- div.append(" <div id=3D\"menu").append(menu=
Count).append("Content\" class=3D\"menu" + myColorSet + "\">\n");
- div.append(" <div class=3D\"options" + =
myColorSet + "\">\n");
-
- int subMenuCount =3D 0;
- int subMenuWidth =3D 0;
- JahiaContainerList linkContainerList =3D jData.con=
tainers().getAbsoluteContainerList( "linkContainer", topLink.getID() );
- if (linkContainerList !=3D null) {
- Enumeration myContainerList =3D linkContainerL=
ist.getContainers();
- while (myContainerList.hasMoreElements()) {
- JahiaContainer myContainer =3D (JahiaConta=
iner) myContainerList.nextElement();
- JahiaPage myLink =3D (JahiaPage) myContain=
er.getFieldObject( "link" );
- if (myLink !=3D null){
- subMenuCount++;
- boolean isRemoteLink =3D
- (myLink.getPageType() =3D=3D PageI=
nfoInterface.TYPE_URL) ||
- (myLink.getPageType() =3D=3D PageI=
nfoInterface.TYPE_LINK );
- div.append(" <a href=3D=
\"").append(myLink.getURL(jData.params())).append("\">");
- if (isRemoteLink) {
- String p =3D myLink.getPageType() =
=3D=3D PageInfoInterface.TYPE_URL ? "remote" : "local";
- div.append("<span class=3D'"+p+"'>=
");
- }
- div.append(myLink.getHighLightDiffTitl=
e(jData.params()));
- if (isRemoteLink) {
- div.append("</span>");
- }
- div.append("</a>\n");
- if (myLink.getHighLightDiffTitle(jData=
.params()) !=3D null) {
- int w =3D myLink.getHighLightDiffT=
itle(jData.params()).length() * 6 + 30;
- if (w > subMenuWidth) {
- subMenuWidth =3D w;
- }
- }
- }
- }
- }
- div.append(" </div>\n");
- div.append(" </div>\n");
- div.append(" </td>\n");
- div.append("</tr>\n");
- div.append("</table>\n");
- div.append("</div>\n");
-
- callJs.append("new ypSlideOutMenu(\"menu").append(=
menuCount);
- callJs.append("\", \"down\", ");
- callJs.append( "getX('menu" + menuCount + "')" ); =
// left
- callJs.append(", ");
- callJs.append( "getY('menu" + menuCount + "')" ); =
// top
- callJs.append(", " + subMenuWidth + ", "); // wid=
th
- callJs.append(subMenuCount * 50); //heigh
- callJs.append(");\n");
-
- }
- %>
</content:container-cache>
</logic:notEmpty>
</content:container>
@@ -254,13 +191,90 @@
%>
</tr>
</table>
+
<%
-callJs.append("\n-->\n</script>");
-if (enablePopup){
- %>
- <%=3DcallJs.toString()%>
- <%=3Ddiv.toString()%>
- <%
-}
+ menuCount =3D 0;
%>
=
+<content:absoluteContainerList name=3D"topMenu" id=3D"topMenu" pageLevel=
=3D"1">
+ <content:container id=3D"topMenuContainer" cacheKey=3D"menu">
+ <content:pageField valueId=3D"topLink" name=3D"topLink" id=3D"topL=
inkField" />
+ <logic:notEmpty name=3D"topLink">
+ <% menuCount++;
+ StringBuffer callJs =3D new StringBuffer();
+ StringBuffer div =3D new StringBuffer();
+ %>
+
+ <%
+ PageBean topLinkBean =3D (PageBean) pageContext.findAttribute(=
"topLink");
+ JahiaPage topLink =3D topLinkBean.getJahiaPage();
+ String myColorSet =3D (String) pageContext.findAttribute("myCo=
lorSet");
+ %>
+
+ <%
+ if (enablePopup && topLink !=3D null){
+
+ div.append("<div id=3D\"menu").append(menuCount).append("C=
ontainer\">\n");
+ div.append("<table onmouseover=3D\"topOn" + myColorSet + "=
('menu" + menuCount + "');\" ");
+ div.append("onmouseout=3D\"topOff('menu" + menuCount + "')=
;\" cellpadding=3D\"0\" cellspacing=3D\"0\" border=3D\"0\">\n");
+ div.append("<tr valign=3D\"top\">\n");
+ div.append(" <td nowrap=3D\"nowrap\">\n");
+ div.append(" <div id=3D\"menu").append(menuCount).a=
ppend("Content\" class=3D\"menu" + myColorSet + "\">\n");
+ div.append(" <div class=3D\"options" + myColorS=
et + "\">\n");
+
+ int subMenuCount =3D 0;
+ int subMenuWidth =3D 0;
+ JahiaContainerList linkContainerList =3D jData.containers(=
).getAbsoluteContainerList( "linkContainer", topLink.getID() );
+ org.jahia.taglibs.container.ContainerTag.addContainerListD=
ependency(pageContext, linkContainerList.getID());
+ if (linkContainerList !=3D null) {
+ Enumeration myContainerList =3D linkContainerList.getC=
ontainers();
+ while (myContainerList.hasMoreElements()) {
+ JahiaContainer myContainer =3D (JahiaContainer) my=
ContainerList.nextElement();
+ JahiaPage myLink =3D (JahiaPage) myContainer.getFi=
eldObject( "link" );
+ if (myLink !=3D null){
+ subMenuCount++;
+ boolean isRemoteLink =3D
+ (myLink.getPageType() =3D=3D PageInfoInter=
face.TYPE_URL) ||
+ (myLink.getPageType() =3D=3D PageInfoInter=
face.TYPE_LINK );
+ div.append(" <a href=3D\"").app=
end(myLink.getURL(jData.params())).append("\">");
+ if (isRemoteLink) {
+ String p =3D myLink.getPageType() =3D=3D P=
ageInfoInterface.TYPE_URL ? "remote" : "local";
+ div.append("<span class=3D'"+p+"'>");
+ }
+ div.append(myLink.getHighLightDiffTitle(jData.=
params()));
+ if (isRemoteLink) {
+ div.append("</span>");
+ }
+ div.append("</a>\n");
+ if (myLink.getHighLightDiffTitle(jData.params(=
)) !=3D null) {
+ int w =3D myLink.getHighLightDiffTitle(jDa=
ta.params()).length() * 6 + 30;
+ if (w > subMenuWidth) {
+ subMenuWidth =3D w;
+ }
+ }
+ }
+ }
+ }
+ div.append(" </div>\n");
+ div.append(" </div>\n");
+ div.append(" </td>\n");
+ div.append("</tr>\n");
+ div.append("</table>\n");
+ div.append("</div>\n");
+
+ callJs.append("new ypSlideOutMenu(\"menu").append(menuCoun=
t);
+ callJs.append("\", \"down\", ");
+ callJs.append( "getX('menu" + menuCount + "')," ); // left
+ callJs.append("getY('menu" + menuCount + "')," ); // top
+ callJs.append(subMenuWidth+", "); // width
+ callJs.append(subMenuCount * 50+");\n"); // height
+ }
+
+ %>
+ <%=3D div %>
+ <script language=3D"javascript" type=3D"text/JavaScript">
+ <%=3D callJs.toString()%>
+ </script>
+ </logic:notEmpty>
+ </content:container>
+</content:absoluteContainerList>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
