pvollenweider 2004/10/27 12:16:59 CEST
Modified files:
src/view/jsp/include main_menu.inc
Log:
Don't display a container if the subpage is null
Revision Changes Path
1.11 +15 -7 corporate_portal_templates/src/view/jsp/include/main_menu.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/main_menu.inc.diff?r1=1.10&r2=1.11&f=h
Index: main_menu.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/main_menu.inc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- main_menu.inc 26 Oct 2004 15:30:46 -0000 1.10
+++ main_menu.inc 27 Oct 2004 10:16:59 -0000 1.11
@@ -61,13 +61,21 @@
<content:sharedLangTextField valueId="myColorSet" name="colorSet"
defaultValue="<%=colorSet%>" display="false"/>
<logic:empty name="topLink">
<logic:equal name="currentRequest" property="editMode" value="true">
- <td id="menu<%=menuCount%>" class="topmenu<bean:write
name="myColorSet"/>">
- <span style="color:#ff0000;"><content:resourceBundle
- resourceBundle="jahiatemplates.Corporate_portal_templates"
resourceName="noPage"
- defaultValue="No page"/></span>
- <jahiaHtml:actionMenu name="topMenuContainer"
namePostFix="" resourceBundle="jahiatemplates.Corporate_portal_templates"
useFieldSet="false">
- </jahiaHtml:actionMenu>
- </td>
+ <%
+ PageBean topLinkBean = (PageBean)
pageContext.findAttribute("topLink");
+ if (topLinkBean != null) {
+ JahiaPage topLink = topLinkBean.getJahiaPage();
+ %>
+ <td id="menu<%=menuCount%>" class="topmenu<bean:write
name="myColorSet"/>">
+ <span style="color:#ff0000;"><content:resourceBundle
+
resourceBundle="jahiatemplates.Corporate_portal_templates" resourceName="noPage"
+ defaultValue="No page"/></span>
+ <jahiaHtml:actionMenu name="topMenuContainer"
namePostFix="" resourceBundle="jahiatemplates.Corporate_portal_templates"
useFieldSet="false">
+ </jahiaHtml:actionMenu>
+ </td>
+ <%
+ }
+ %>
</logic:equal>
</logic:empty>
<logic:notEmpty name="topLink">
