You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2006/11/25 18:52:11 UTC
svn commit: r479154 - in /incubator/ofbiz/trunk/applications/content:
webapp/content/WEB-INF/ webapp/content/WEB-INF/actions/includes/
webapp/content/WEB-INF/actions/layout/ webapp/content/WEB-INF/pagedefs/
webapp/content/includes/ webapp/content/layou...
Author: jacopoc
Date: Sat Nov 25 09:52:10 2006
New Revision: 479154
URL: http://svn.apache.org/viewvc?view=rev&rev=479154
Log:
Converted the lasr JPublish pages... now JPublish is completely gone!
Added:
incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/layout/editsubcontent.bsh (with props)
Removed:
incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/includes/
incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/layout/editimageprep.bsh
incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/layout/editlayoutprep.bsh
incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/layout/editsubcontentprep.bsh
incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/layout/findrelatedlayouts.bsh
incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/layout/layoutprep.bsh
incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/jpublish.xml
incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/
incubator/ofbiz/trunk/applications/content/webapp/content/includes/
incubator/ofbiz/trunk/applications/content/webapp/content/layout/AddLayout.ftl
incubator/ofbiz/trunk/applications/content/webapp/content/layout/EditLayoutHtml.ftl
incubator/ofbiz/trunk/applications/content/webapp/content/layout/EditLayoutImage.ftl
incubator/ofbiz/trunk/applications/content/webapp/content/layout/EditLayoutSubContent.ftl
incubator/ofbiz/trunk/applications/content/webapp/content/layout/EditLayoutText.ftl
incubator/ofbiz/trunk/applications/content/webapp/content/layout/EditLayoutUrl.ftl
incubator/ofbiz/trunk/applications/content/webapp/content/layout/layout_menu.ftl
incubator/ofbiz/trunk/applications/content/webapp/content/templates/
Modified:
incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml
incubator/ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml
incubator/ofbiz/trunk/applications/content/webapp/content/layout/LayoutMenus.xml
incubator/ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml
Added: incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/layout/editsubcontent.bsh
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/layout/editsubcontent.bsh?view=auto&rev=479154
==============================================================================
--- incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/layout/editsubcontent.bsh (added)
+++ incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/layout/editsubcontent.bsh Sat Nov 25 09:52:10 2006
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2001-2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.ofbiz.base.util.*;
+import org.ofbiz.entity.*;
+import org.ofbiz.security.*;
+import org.ofbiz.service.*;
+import org.ofbiz.entity.model.*;
+import org.ofbiz.widget.html.*;
+import org.ofbiz.widget.form.*;
+import org.ofbiz.content.data.DataResourceWorker;
+import org.ofbiz.webapp.ftl.FreeMarkerViewHandler;
+
+import java.io.StringWriter;
+import freemarker.ext.beans.BeansWrapper;
+import freemarker.template.WrappingTemplateModel;
+
+import javax.servlet.*;
+import javax.servlet.http.*;
+
+// load edit or create Content form
+dispatcher = (LocalDispatcher)request.getAttribute("dispatcher");
+delegator = (GenericDelegator) request.getAttribute("delegator");
+
+Locale locale = UtilHttp.getLocale(request);
+if (currentValue != null) {
+ dataResourceId = (String)currentValue.get("drDataResourceId");
+ dataResourceTypeId = (String)currentValue.get("drDataResourceTypeId");
+ if (UtilValidate.isNotEmpty(dataResourceTypeId)) {
+ mimeTypeId = (String)currentValue.get("drMimeTypeId");
+ rootDir = request.getSession().getServletContext().getRealPath("/");
+ wrapper = BeansWrapper.getDefaultInstance();
+ WrappingTemplateModel.setDefaultObjectWrapper(wrapper);
+ templateRoot = new HashMap();
+ FreeMarkerViewHandler.prepOfbizRoot(templateRoot, request, response);
+ ctx = new HashMap();
+ ctx.put("rootDir", rootDir);
+ // webSiteId and https need to go here, too
+ templateRoot.put("context", ctx);
+ out = new StringWriter();
+ currentValue.set("drDataTemplateTypeId", "NONE");
+ DataResourceWorker.renderDataResourceAsText(delegator, dataResourceId, out, templateRoot, currentValue, locale, mimeTypeId);
+ textData = out.toString();
+ context.put("textData", textData);
+ }
+}
+
+//context.put("contentIdTo", contentIdTo);
+//mapKey = (String)paramMap.get("mapKey");
+
Propchange: incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/layout/editsubcontent.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/layout/editsubcontent.bsh
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/layout/editsubcontent.bsh
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml?view=diff&rev=479154&r1=479153&r2=479154
==============================================================================
--- incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml (original)
+++ incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml Sat Nov 25 09:52:10 2006
@@ -28,7 +28,6 @@
<handler name="simple" type="request" class="org.ofbiz.webapp.event.SimpleEventHandler"/>
<handler name="bsf" type="request" class="org.ofbiz.webapp.event.BsfEventHandler"/>
- <handler name="jpublish" type="view" class="org.ofbiz.webapp.view.JPublishViewHandler"/>
<handler name="screen" type="view" class="org.ofbiz.widget.screen.ScreenWidgetViewHandler"/>
<handler name="screenfop" type="view" class="org.ofbiz.widget.screen.ScreenFopPdfViewHandler"/>
<handler name="simplecontent" type="view" class="org.ofbiz.content.view.SimpleContentViewHandler"/>
@@ -1595,12 +1594,12 @@
<view-map name="ListLayout" page="component://content/widget/layout/LayoutScreens.xml#ListLayout" type="screen"/>
<view-map name="FindLayout" page="component://content/widget/layout/LayoutScreens.xml#FindLayout" type="screen"/>
<view-map name="EditLayout" page="component://content/widget/layout/LayoutScreens.xml#EditLayout" type="screen"/>
- <view-map name="AddLayout" page="/layout/AddLayout.ftl" type="jpublish"/>
- <view-map name="EditLayoutSubContent" page="/layout/EditLayoutSubContent.ftl" type="jpublish"/>
- <view-map name="EditLayoutText" page="/layout/EditLayoutText.ftl" type="jpublish"/>
- <view-map name="EditLayoutHtml" page="/layout/EditLayoutHtml.ftl" type="jpublish"/>
- <view-map name="EditLayoutImage" page="/layout/EditLayoutImage.ftl" type="jpublish"/>
- <view-map name="EditLayoutUrl" page="/layout/EditLayoutUrl.ftl" type="jpublish"/>
+ <view-map name="AddLayout" page="component://content/widget/layout/LayoutScreens.xml#AddLayout" type="screen"/>
+ <view-map name="EditLayoutSubContent" page="component://content/widget/layout/LayoutScreens.xml#EditLayoutSubContent" type="screen"/>
+ <view-map name="EditLayoutText" page="component://content/widget/layout/LayoutScreens.xml#EditLayoutText" type="screen"/>
+ <view-map name="EditLayoutHtml" page="component://content/widget/layout/LayoutScreens.xml#EditLayoutHtml" type="screen"/>
+ <view-map name="EditLayoutImage" page="component://content/widget/layout/LayoutScreens.xml#EditLayoutImage" type="screen"/>
+ <view-map name="EditLayoutUrl" page="component://content/widget/layout/LayoutScreens.xml#EditLayoutUrl" type="screen"/>
<view-map name="FindContent" page="component://content/widget/content/ContentScreens.xml#FindContent" type="screen"/>
Modified: incubator/ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml?view=diff&rev=479154&r1=479153&r2=479154
==============================================================================
--- incubator/ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml (original)
+++ incubator/ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml Sat Nov 25 09:52:10 2006
@@ -248,6 +248,7 @@
extends="LayoutSubContentMaster"
target="updateLayoutHtml"
title="" type="single">
+ <alt-target use-when="currentValue==null" target="createLayoutHtml"/>
<field name="drDataResourceTypeId" >
<display description="ELECTRONIC_TEXT"/>
</field>
@@ -273,33 +274,6 @@
<submit button-type="button"/>
</field>
</form>
- <form name="AddLayoutHtml"
- default-title-style="tableheadtext"
- default-entity-name="SubContentDataResourceView"
- default-tooltip-style="tabletext" default-widget-style="inputBox"
- default-map-name="currentValue"
- extends="LayoutSubContentMaster"
- target="createLayoutHtml"
- title="" type="single">
- <field name="drDataResourceTypeIdDisplay" title="DataResource Type">
- <display description="ELECTRONIC_TEXT"/>
- </field>
- <field name="drDataResourceTypeId" >
- <hidden value="ELECTRONIC_TEXT"/>
- </field>
- <field name="drMimeTypeIdDisplay" title="Mime Type" >
- <display description="text/plain"/>
- </field>
- <field name="drMimeTypeId" >
- <hidden value="text/html"/>
- </field>
- <field name="textData" title="Text (Use '<>' to enter plain text)" id-name="textData">
- <textarea rows="24" cols="80" />
- </field>
- <field name="submitButton" title="Create" widget-style="smallSubmit">
- <submit button-type="button"/>
- </field>
- </form>
<form name="EditLayoutText"
default-title-style="tableheadtext"
@@ -309,6 +283,7 @@
extends="LayoutSubContentMaster"
target="updateLayoutText"
title="" type="single">
+ <alt-target use-when="currentValue==null" target="createLayoutText"/>
<field name="drDataResourceTypeId" >
<display description="ELECTRONIC_TEXT"/>
</field>
@@ -334,33 +309,6 @@
<submit button-type="button"/>
</field>
</form>
- <form name="AddLayoutText"
- default-title-style="tableheadtext"
- default-entity-name="SubContentDataResourceView"
- default-tooltip-style="tabletext" default-widget-style="inputBox"
- default-map-name="currentValue"
- extends="LayoutSubContentMaster"
- target="createLayoutText"
- title="" type="single">
- <field name="drDataResourceTypeIdDisplay" title="DataResource Type">
- <display description="ELECTRONIC_TEXT"/>
- </field>
- <field name="drDataResourceTypeId" >
- <hidden value="ELECTRONIC_TEXT"/>
- </field>
- <field name="drMimeTypeIdDisplay" title="Mime Type" >
- <display description="text/plain"/>
- </field>
- <field name="drMimeTypeId" >
- <hidden value="text/html"/>
- </field>
- <field name="textData" title="Text" >
- <textarea rows="24" cols="80" />
- </field>
- <field name="submitButton" title="Create" widget-style="smallSubmit">
- <submit button-type="button"/>
- </field>
- </form>
<form name="EditLayoutImage"
default-title-style="tableheadtext"
@@ -444,6 +392,7 @@
extends="LayoutSubContentMaster"
target="updateLayoutUrl"
title="" type="single">
+ <alt-target use-when="currentValue==null" target="createLayoutUrl"/>
<field name="drDataResourceTypeId" >
<display description="URL_RESOURCE"/>
</field>
@@ -469,27 +418,6 @@
<submit button-type="button"/>
</field>
</form>
- <form name="AddLayoutUrl"
- default-title-style="tableheadtext"
- default-entity-name="SubContentDataResourceView"
- default-tooltip-style="tabletext" default-widget-style="inputBox"
- default-map-name="currentValue"
- extends="LayoutSubContentMaster"
- target="createLayoutUrl"
- title="" type="single">
- <field name="drDataResourceTypeId" >
- <display description="URL_RESOURCE"/>
- </field>
- <field name="drMimeTypeId" >
- <display description="text/plain"/>
- </field>
- <field name="drObjectInfo" title="Url">
- <text />
- </field>
- <field name="submitButton" title="Create" widget-style="smallSubmit">
- <submit button-type="button"/>
- </field>
- </form>
<form name="ListRelatedLayouts"
default-title-style="tableheadtext"
default-tooltip-style="tabletext" default-widget-style="display"
@@ -511,6 +439,7 @@
extends="LayoutSubContentMaster"
target="updateLayoutSubContent"
title="" type="single">
+ <alt-target use-when="currentValue==null" target="createLayoutSubContent"/>
<field name="contentIdToDisplay" >
<ignored/>
</field>
@@ -522,10 +451,10 @@
<display/>
</field>
<field name="contentIdTo" >
- <text default-value="${contentIdTo}"/>
+ <text default-value="${parameters.contentIdTo}"/>
</field>
<field name="mapKey" >
- <text default-value="${mapKey}"/>
+ <text default-value="${parameters.mapKey}"/>
</field>
<field name="drDataResourceTypeId" >
<drop-down no-current-selected-key="ELECTRONIC_TEXT">
@@ -551,7 +480,7 @@
<text />
</field>
<field name="textData" id-name="textData">
- <textarea rows="24" cols="80" />
+ <textarea rows="24" cols="80" default-value="${context.textData}"/>
</field>
<field name="createdByUserLogin" position="1">
<display/>
@@ -569,59 +498,7 @@
<submit button-type="button"/>
</field>
</form>
- <form name="AddLayoutSubContent"
- default-title-style="tableheadtext"
- default-entity-name="SubContentDataResourceView"
- default-tooltip-style="tabletext" default-widget-style="inputBox"
- default-map-name="currentValue"
- extends="LayoutSubContentMaster"
- target="createLayoutSubContent"
- title="" type="single">
- <field name="contentIdToDisplay" >
- <ignored/>
- </field>
- <field name="mapKeyDisplay" >
- <ignored/>
- </field>
-
- <field name="contentId" position="1" >
- <text/>
- </field>
- <field name="contentIdTo" >
- <text default-value="TEMPLATE_MASTER"/>
- </field>
- <field name="mapKey" >
- <text default-value="${mapKey}"/>
- </field>
- <field name="drDataResourceTypeId" >
- <drop-down no-current-selected-key="ELECTRONIC_TEXT">
- <option key="LOCAL_FILE" description="Absolute File"/>
- <option key="OFBIZ_FILE" description="File Rel. to OFBIZ_HOME"/>
- <option key="CONTEXT_FILE" description="File Rel. to webapp root"/>
- <option key="ELECTRONIC_TEXT" description="DataBase Text"/>
- </drop-down>
- </field>
- <field name="drDataTemplateTypeId" >
- <drop-down no-current-selected-key="NONE">
- <entity-options description="${description}"
- entity-name="DataTemplateType" key-field-name="dataTemplateTypeId"/>
- </drop-down>
- </field>
- <field name="drMimeTypeId" >
- <drop-down no-current-selected-key="text/html">
- <option key="text/html" description="Html Text" />
- <option key="text/plain" description="Plain Text" />
- </drop-down>
- </field>
- <field name="drObjectInfo" title="${UiLabelMap.ContentFilePath}">
- <text />
- </field>
- <field name="textData" id-name="textData">
- <textarea rows="24" cols="80" />
- </field>
- <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit">
- <submit button-type="button"/>
- </field>
+<!--
<field name="paste" title="" widget-style="buttontext"
use-when="!"${contentIdTo}".equals("TEMPLATE_MASTER")" >
<hyperlink target-type="plain"
@@ -634,6 +511,5 @@
target="javascript:call_fieldlookup2(document.AddLayoutSubContent.drDataResourceId, 'LookupListLayout')"
description="${uiLabelMap.ContentPaste}"/>
</field>
- </form>
-
+-->
</forms>
Modified: incubator/ofbiz/trunk/applications/content/webapp/content/layout/LayoutMenus.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/webapp/content/layout/LayoutMenus.xml?view=diff&rev=479154&r1=479153&r2=479154
==============================================================================
--- incubator/ofbiz/trunk/applications/content/webapp/content/layout/LayoutMenus.xml (original)
+++ incubator/ofbiz/trunk/applications/content/webapp/content/layout/LayoutMenus.xml Sat Nov 25 09:52:10 2006
@@ -36,44 +36,44 @@
<menu-item name="EditLayout" title="${uiLabelMap.CommonEdit}">
<condition>
<not><if-empty field-name="parameters.contentId"/></not>
+ <not><if-empty field-name="parameters.drDataResourceId"/></not>
</condition>
- <link target="EditLayout?contentId=${parameters.contentId}" target-window="_top" style="tabButton" />
+ <link target="EditLayout?contentId=${parameters.contentId}&drDataResourceId=${parameters.drDataResourceId}" target-window="_top" style="tabButton" />
</menu-item>
- <menu-item name="EditLayoutContent" title="${uiLabelMap.ContentSubContent}" >
+ <menu-item name="EditLayoutSubContent" title="${uiLabelMap.ContentSubContent}" >
<condition>
<not><if-empty field-name="parameters.contentId"/></not>
+ <not><if-empty field-name="parameters.drDataResourceId"/></not>
</condition>
- <link target="EditLayoutContent?contentId=${parameters.contentId}" target-window="_top" style="tabButton" />
+ <link target="EditLayoutSubContent?contentId=${parameters.contentId}&drDataResourceId=${parameters.drDataResourceId}" target-window="_top" style="tabButton" />
</menu-item>
<menu-item name="EditLayoutText" title="${uiLabelMap.ContentText}" >
<condition>
<not><if-empty field-name="parameters.contentId"/></not>
+ <not><if-empty field-name="parameters.drDataResourceId"/></not>
</condition>
- <link target="EditLayoutText?contentId=${parameters.contentId}" target-window="_top" style="tabButton" />
+ <link target="EditLayoutText?contentId=${parameters.contentId}&drDataResourceId=${parameters.drDataResourceId}" target-window="_top" style="tabButton" />
</menu-item>
<menu-item name="EditLayoutHtml" title="${uiLabelMap.ContentHtml}" >
<condition>
<not><if-empty field-name="parameters.contentId"/></not>
+ <not><if-empty field-name="parameters.drDataResourceId"/></not>
</condition>
- <link target="EditLayoutHtml?contentId=${parameters.contentId}" target-window="_top" style="tabButton" />
+ <link target="EditLayoutHtml?contentId=${parameters.contentId}&drDataResourceId=${parameters.drDataResourceId}" target-window="_top" style="tabButton" />
</menu-item>
<menu-item name="EditLayoutImage" title="${uiLabelMap.ContentImage}" >
<condition>
<not><if-empty field-name="parameters.contentId"/></not>
+ <not><if-empty field-name="parameters.drDataResourceId"/></not>
</condition>
- <link target="EditLayoutImage?contentId=${parameters.contentId}" target-window="_top" style="tabButton" />
+ <link target="EditLayoutImage?contentId=${parameters.contentId}&drDataResourceId=${parameters.drDataResourceId}" target-window="_top" style="tabButton" />
</menu-item>
<menu-item name="EditLayoutUrl" title="${uiLabelMap.ContentUrl}" >
<condition>
<not><if-empty field-name="parameters.contentId"/></not>
+ <not><if-empty field-name="parameters.drDataResourceId"/></not>
</condition>
- <link target="EditLayoutUrl?contentId=${parameters.contentId}" target-window="_top" style="tabButton" />
- </menu-item>
- <menu-item name="EditLayoutFile" title="${uiLabelMap.ContentFile}" >
- <condition>
- <not><if-empty field-name="parameters.contentId"/></not>
- </condition>
- <link target="EditLayoutFile?contentId=${parameters.contentId}" target-window="_top" style="tabButton" />
+ <link target="EditLayoutUrl?contentId=${parameters.contentId}&drDataResourceId=${parameters.drDataResourceId}" target-window="_top" style="tabButton" />
</menu-item>
</menu>
</menus>
Modified: incubator/ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml?view=diff&rev=479154&r1=479153&r2=479154
==============================================================================
--- incubator/ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml Sat Nov 25 09:52:10 2006
@@ -96,4 +96,142 @@
</widgets>
</section>
</screen>
+ <screen name="EditLayoutSubContent">
+ <section>
+ <condition>
+ <if-has-permission permission="CONTENTMGR" action="_UPDATE"/>
+ </condition>
+ <actions>
+ <set field="titleProperty" value="PageTitleEditLayout"/>
+ <set field="headerItem" value="Layout"/>
+ <set field="tabButtonItem" to-scope="user" value="EditLayoutSubContent"/>
+
+ <entity-one entity-name="SubContentDataResourceView" value-name="currentValue"/>
+ <script location="component://content/webapp/content/WEB-INF/actions/layout/editsubcontent.bsh"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="commonLayoutDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <include-form name="EditLayoutSubContent" location="component://content/webapp/content/layout/LayoutForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="EditLayoutText">
+ <section>
+ <condition>
+ <if-has-permission permission="CONTENTMGR" action="_UPDATE"/>
+ </condition>
+ <actions>
+ <set field="titleProperty" value="PageTitleEditLayout"/>
+ <set field="headerItem" value="Layout"/>
+ <set field="tabButtonItem" to-scope="user" value="EditLayoutText"/>
+
+ <entity-one entity-name="SubContentDataResourceView" value-name="currentValue"/>
+ <script location="component://content/webapp/content/WEB-INF/actions/layout/editsubcontent.bsh"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="commonLayoutDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <!--
+ <include-form name="EditLayoutText" location="component://content/webapp/content/layout/LayoutForms.xml"/>
+ -->
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="EditLayoutHtml">
+ <section>
+ <condition>
+ <if-has-permission permission="CONTENTMGR" action="_UPDATE"/>
+ </condition>
+ <actions>
+ <set field="titleProperty" value="PageTitleEditLayout"/>
+ <set field="headerItem" value="Layout"/>
+ <set field="tabButtonItem" to-scope="user" value="EditLayoutHtml"/>
+
+ <entity-one entity-name="SubContentDataResourceView" value-name="currentValue"/>
+ <script location="component://content/webapp/content/WEB-INF/actions/layout/editsubcontent.bsh"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="commonLayoutDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <!--
+ <include-form name="EditLayoutHtml" location="component://content/webapp/content/layout/LayoutForms.xml"/>
+ -->
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="EditLayoutUrl">
+ <section>
+ <condition>
+ <if-has-permission permission="CONTENTMGR" action="_UPDATE"/>
+ </condition>
+ <actions>
+ <set field="titleProperty" value="PageTitleEditLayout"/>
+ <set field="headerItem" value="Layout"/>
+ <set field="tabButtonItem" to-scope="user" value="EditLayoutUrl"/>
+
+ <entity-one entity-name="SubContentDataResourceView" value-name="currentValue"/>
+ <script location="component://content/webapp/content/WEB-INF/actions/layout/editsubcontent.bsh"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="commonLayoutDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <!--
+ <include-form name="EditLayoutUrl" location="component://content/webapp/content/layout/LayoutForms.xml"/>
+ -->
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="EditLayoutImage">
+ <section>
+ <condition>
+ <if-has-permission permission="CONTENTMGR" action="_UPDATE"/>
+ </condition>
+ <actions>
+ <set field="titleProperty" value="PageTitleEditLayout"/>
+ <set field="headerItem" value="Layout"/>
+ <set field="tabButtonItem" to-scope="user" value="EditLayoutImage"/>
+
+ <entity-one entity-name="SubContentDataResourceView" value-name="currentValue"/>
+ <script location="component://content/webapp/content/WEB-INF/actions/layout/editsubcontent.bsh"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="commonLayoutDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <!--
+ <include-form name="EditLayoutImage" location="component://content/webapp/content/layout/LayoutForms.xml"/>
+ -->
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="AddLayout">
+ <section>
+ <condition>
+ <if-has-permission permission="CONTENTMGR" action="_UPDATE"/>
+ </condition>
+ <actions>
+ <set field="titleProperty" value="PageTitleEditLayout"/>
+ <set field="headerItem" value="Layout"/>
+ <set field="tabButtonItem" to-scope="user" value="EditLayout"/>
+
+ </actions>
+ <widgets>
+ <decorator-screen name="commonLayoutDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <include-form name="AddLayout" location="component://content/webapp/content/layout/LayoutForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
Re: svn commit: r479154 - in /incubator/ofbiz/trunk/applications/content: webapp/content/WEB-INF/ webapp/content/WEB-INF/actions/includes/ webapp/content/WEB-INF/actions/layout/ webapp/content/WEB-INF/pagedefs/ webapp/content/includes/ webapp/content/layou
Posted by "mrisaliti@libero.it" <mr...@libero.it>.
That's a great news and thanks to Jacopo for this migration.
Marco
Il giorno 25/nov/06, alle ore 21:45, Jacques Le Roux ha scritto:
> Hi Jacopo,
>
> A very good news.
>
> Thanks for your hard work
>
> Jacques
>
> From: <ja...@apache.org>
>
>> Author: jacopoc
>> Date: Sat Nov 25 09:52:10 2006
>> New Revision: 479154
>>
>> URL: http://svn.apache.org/viewvc?view=rev&rev=479154
>> Log:
>> Converted the lasr JPublish pages... now JPublish is completely gone!
>
Re: svn commit: r479154 - in
/incubator/ofbiz/trunk/applications/content: webapp/content/WEB-INF/
webapp/content/WEB-INF/actions/includes/
webapp/content/WEB-INF/actions/layout/ webapp/content/WEB-INF/pagedefs/
webapp/content/includes/ webapp/content/layou
Posted by Jacques Le Roux <ja...@les7arts.com>.
Hi Jacopo,
A very good news.
Thanks for your hard work
Jacques
From: <ja...@apache.org>
> Author: jacopoc
> Date: Sat Nov 25 09:52:10 2006
> New Revision: 479154
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=479154
> Log:
> Converted the lasr JPublish pages... now JPublish is completely gone!