pvollenweider 2004/10/28 17:25:26 CEST
Modified files:
src/view/jsp/include left_menu.inc main_menu.inc
Log:
- rollback... display the page en etit mode, even if it's n/a
Revision Changes Path
1.8 +13 -18 corporate_portal_templates/src/view/jsp/include/left_menu.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/left_menu.inc.diff?r1=1.7&r2=1.8&f=h
1.13 +7 -14 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.12&r2=1.13&f=h
Index: left_menu.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/left_menu.inc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- left_menu.inc 27 Oct 2004 12:59:31 -0000 1.7
+++ left_menu.inc 28 Oct 2004 15:25:26 -0000 1.8
@@ -165,26 +165,21 @@
<logic:empty name="link">
<logic:equal name="currentRequest" property="editMode" value="true">
<%
- PageBean linkBean = (PageBean)
pageContext.findAttribute("link");
- if (linkBean != null) {
- linkCount++;
- if (linkCount == 1) {
- %><table border="0" cellspacing="0" cellpadding="0"
width="100%"><%
- }
- %>
- <tr>
- <td class="leftpict"> </td>
- <td class="left">
- <a href="#" class="leftlevel1"
style="color:#ff0000;"><span style="color:#ff0000;"><content:resourceBundle
-
resourceBundle="jahiatemplates.Corporate_portal_templates" resourceName="noPage"
- defaultValue="No page"/></span></a>
- <jahiaHtml:actionMenu name="linkContainer"
namePostFix="" resourceBundle="jahiatemplates.Corporate_portal_templates"
useFieldSet="false">
- </jahiaHtml:actionMenu>
- </td>
- </tr>
- <%
+ linkCount++;
+ if (linkCount == 1) {
+ %><table border="0" cellspacing="0" cellpadding="0"
width="100%"><%
}
%>
+ <tr>
+ <td class="leftpict"> </td>
+ <td class="left">
+ <a href="#" class="leftlevel1"
style="color:#ff0000;"><span style="color:#ff0000;"><content:resourceBundle
+
resourceBundle="jahiatemplates.Corporate_portal_templates" resourceName="noPage"
+ defaultValue="No page"/></span></a>
+ <jahiaHtml:actionMenu name="linkContainer"
namePostFix="" resourceBundle="jahiatemplates.Corporate_portal_templates"
useFieldSet="false">
+ </jahiaHtml:actionMenu>
+ </td>
+ </tr>
</logic:equal>
</logic:empty>
Index: main_menu.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/main_menu.inc,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- main_menu.inc 27 Oct 2004 12:59:31 -0000 1.12
+++ main_menu.inc 28 Oct 2004 15:25:26 -0000 1.13
@@ -61,20 +61,13 @@
<content:sharedLangTextField valueId="myColorSet" name="colorSet"
defaultValue="<%=colorSet%>" display="false"/>
<logic:empty name="topLink">
<logic:equal name="currentRequest" property="editMode" value="true">
- <%
- PageBean topLinkBean = (PageBean)
pageContext.findAttribute("topLink");
- if (topLinkBean != null) {
- %>
- <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>
- <%
- }
- %>
+ <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">
