Author: hansbak
Date: Sun Mar 21 04:05:31 2010
New Revision: 925723
URL: http://svn.apache.org/viewvc?rev=925723&view=rev
Log:
show portlets with/without decorators
Modified:
ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml
ofbiz/trunk/framework/common/widget/PortalPageScreens.xml
Modified: ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml?rev=925723&r1=925722&r2=925723&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml
(original)
+++ ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml Sun
Mar 21 04:05:31 2010
@@ -23,19 +23,25 @@ under the License.
<description>Portal ControlServlet Configuration File</description>
<owner>Copyright 2001-2009 The Apache Software Foundation</owner>
- <!-- Portal requests -->
+ <!-- Portlet show requests -->
<request-map uri="showPortlet">
<security https="true" auth="true"/>
<response name="success" type="view" value="showPortlet"/>
</request-map>
- <request-map uri="showPortletDecorator">
+ <request-map uri="showPortletMainDecorator">
<security https="true" auth="true"/>
- <response name="success" type="view" value="showPortletDecorator"/>
+ <response name="success" type="view" value="showPortletMainDecorator"/>
</request-map>
+ <request-map uri="showPortletSimpleDecorator">
+ <security https="true" auth="true"/>
+ <response name="success" type="view"
value="showPortletSimpleDecorator"/>
+ </request-map>
+ <!-- Portal page show requests -->
<request-map uri="showPortalPage">
<security https="true" auth="true"/>
<response name="success" type="view" value="showPortalPage"
save-home-view="true"/>
</request-map>
+ <!-- Portal page update requests -->
<request-map uri="ManagePortalPages">
<security https="true" auth="true"/>
<event type="simple" invoke="copyIfRequiredSystemPage"
path="component://common/script/org/ofbiz/common/PortalPageMethods.xml"/>
@@ -131,7 +137,8 @@ under the License.
<!-- View Mappings -->
<view-map name="showPortalPage" type="screen"
page="component://common/widget/PortalPageScreens.xml#showPortalPage"/>
<view-map name="showPortlet" type="screen"
page="component://common/widget/PortalPageScreens.xml#showPortlet"/>
- <view-map name="showPortletDecorator" type="screen"
page="component://common/widget/PortalPageScreens.xml#showPortletDecorator"/>
+ <view-map name="showPortletMainDecorator" type="screen"
page="component://common/widget/PortalPageScreens.xml#showPortletMainDecorator"/>
+ <view-map name="showPortletSimpleDecorator" type="screen"
page="component://common/widget/PortalPageScreens.xml#showPortletSimpleDecorator"/>
<view-map name="ManagePortalPages" type="screen"
page="component://common/widget/PortalPageScreens.xml#ManagePortalPages"/>
<view-map name="AddPortlet" type="screen"
page="component://common/widget/PortalPageScreens.xml#AddPortlet"/>
</site-conf>
Modified: ofbiz/trunk/framework/common/widget/PortalPageScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortalPageScreens.xml?rev=925723&r1=925722&r2=925723&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/PortalPageScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/PortalPageScreens.xml Sun Mar 21
04:05:31 2010
@@ -21,29 +21,45 @@ under the License.
<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd";>
- <screen name="showPortletDecorator">
+ <screen name="showPortlet">
<section>
<actions>
- <set field="headerItem" from-field="parameters.portletId"/>
+ <set field="headerItem" from-field="parameters.portletId" />
</actions>
<widgets>
+ <section>
+ <actions>
+ <entity-one entity-name="PortalPortlet"
value-field="portlet" />
+ </actions>
+ <widgets>
+ <!--
+ label text=" id: ${parameters.portalPortletId}
location:
+ ${portlet.screenLocation} screen:
${portlet.screenName}"></label
+ -->
+ <platform-specific>
+ <html>
+ <html-template
+
location="component://common/webcommon/portal/showPortlet.ftl" />
+ </html>
+ </platform-specific>
+ </widgets>
+ </section>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="showPortletMainDecorator">
+ <section>
+ <widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <section>
- <actions>
- <entity-one entity-name="PortalPortlet"
value-field="portlet"/>
- </actions>
- <widgets>
- <platform-specific><html><html-template
location="component://common/webcommon/portal/showPortlet.ftl"/></html></platform-specific>
- </widgets>
- </section>
+ <include-screen name="showPortlet"/>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
- <screen name="showPortlet">
+ <screen name="showPortletSimpleDecorator">
<section>
<actions>
<set field="headerItem" from-field="parameters.portletId"/>
@@ -51,14 +67,7 @@ under the License.
<widgets>
<decorator-screen name="SimpleDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <section>
- <actions>
- <entity-one entity-name="PortalPortlet"
value-field="portlet"/>
- </actions>
- <widgets>
- <platform-specific><html><html-template
location="component://common/webcommon/portal/showPortlet.ftl"/></html></platform-specific>
- </widgets>
- </section>
+ <include-screen name="showPortlet"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -75,13 +84,10 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <section>
- <widgets>
- <container id="portalContainerId">
- <include-screen name="PortalPageScreen"
location="component://common/widget/CommonScreens.xml"/>
- </container>
- </widgets>
- </section>
+ <!-- label text=" id: ${parameters.portalPortletId}
location: ${portlet.screenLocation} screen: ${portlet.screenName}"></label-->
+ <container id="portalContainerId">
+ <include-screen name="PortalPageScreen"
location="component://common/widget/CommonScreens.xml"/>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
