pvollenweider 2004/09/24 11:18:42 CEST
Modified files:
src/view/jsp/include left_menu.inc main_menu.inc
Log:
Display action menu on edit mode for container with no link. So the user can remove
this container.
Revision Changes Path
1.3 +24 -0 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.2&r2=1.3&f=h
1.6 +14 -5 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.5&r2=1.6&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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- left_menu.inc 13 Sep 2004 07:34:52 -0000 1.2
+++ left_menu.inc 24 Sep 2004 09:18:42 -0000 1.3
@@ -64,6 +64,14 @@
childImageArray.addElement(theBoolean);
getPageSubTree(jData , rootPageID, link.getID(),
childImageArray, theURL,currentLevel, pageContext);
}
+ } else {
+ if (editMode) {
+ out.println("<tr><td> </td>");
+ out.println("<td class='left'><a href='#' class='leftlevel"
+ currentLevel + "' style='color:#ff0000;'>null</a>");
+ ContainerBean linksContainerBean = new
ContainerBean(linksContainer,jData.params());
+ jData.gui().html().drawBeginActionMenu(linksContainerBean,
null, null, false, "", "jahiatemplates.Corporate_portal_templates", null, out);
+ out.println("</td></tr>");
+ }
}
}
}
@@ -140,6 +148,22 @@
<jahiaHtml:actionMenu name="linkContainerList" namePostFix=""
resourceBundle="jahiatemplates.Corporate_portal_templates">
<content:container id="linkContainer">
<content:pageField valueId="link" name="link"/>
+
+
+ <logic:empty name="link">
+ <logic:equal name="currentRequest" property="editMode" value="true">
+ <tr>
+ <td class="leftpict"> </td>
+ <td class="left">
+ <a href="#" class="leftlevel1"
style="color:#ff0000;">null</a>
+ <jahiaHtml:actionMenu name="linkContainer"
namePostFix="" resourceBundle="jahiatemplates.Corporate_portal_templates"
useFieldSet="false">
+ </jahiaHtml:actionMenu>
+ </td>
+ </tr>
+ </logic:equal>
+ </logic:empty>
+
+
<logic:notEmpty name="link">
<bean:define id="state" value=""/>
<logic:equal name="link" property="inCurrentPagePath" value="true">
Index: main_menu.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/main_menu.inc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- main_menu.inc 24 Mar 2004 16:46:58 -0000 1.5
+++ main_menu.inc 24 Sep 2004 09:18:42 -0000 1.6
@@ -57,6 +57,15 @@
<content:container id="topMenuContainer">
<content:pageField valueId="topLink" name="topLink"/>
<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"/>">
+ <a href="#" style="color:#ff0000;">null</a>
+ <jahiaHtml:actionMenu name="topMenuContainer"
namePostFix="" resourceBundle="jahiatemplates.Corporate_portal_templates"
useFieldSet="false">
+ </jahiaHtml:actionMenu>
+ </td>
+ </logic:equal>
+ </logic:empty>
<logic:notEmpty name="topLink">
<bean:define id="classpath" value="topmenu"/>
<logic:equal name="topLink" property="inCurrentPagePath"
value="true">
@@ -160,12 +169,12 @@
<%
if (! jData.gui().isLogged()){
- %><td width="100%" align="right"
- class="topmenubuttons"><a
-
href="javascript:<%=jData.gui().html().drawLoginLauncher()%>"><jahia:resourceBundle
- resourceBundle="jahiatemplates.Corporate_portal_templates"
resourceName="login" defaultValue="login"/></a><img
+ %><td width="100%" align="right"
+ class="topmenubuttons"><a
+
href="javascript:<%=jData.gui().html().drawLoginLauncher()%>"><jahia:resourceBundle
+ resourceBundle="jahiatemplates.Corporate_portal_templates"
resourceName="login" defaultValue="login"/></a><img
src="<%=theURL%>/images/pix.gif" alt="" width="1"
height="21"/> | <a
-
href="<%=jData.gui().html().drawNewUserRegistrationLauncher()%>"><jahia:resourceBundle
+
href="<%=jData.gui().html().drawNewUserRegistrationLauncher()%>"><jahia:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
resourceName="register" defaultValue="register"/> </td><%
} else {
%><td width="100%" class="topmenubg"><img src="<%=theURL%>/images/pix.gif"
alt="" width="1" height="21"/> </td><%
