[OFBiz] SVN: r6681 - in trunk/applications: party/widget/partymgr product/webapp/catalog/catalog product/widget/catalog
jonesde@svn.ofbiz.org
jonesde at svn.ofbiz.org
Mon Feb 6 00:28:42 CST 2006
Author: jonesde
Date: 2006-02-06 00:28:34 -0600 (Mon, 06 Feb 2006)
New Revision: 6681
Modified:
trunk/applications/party/widget/partymgr/CommonScreens.xml
trunk/applications/party/widget/partymgr/PartyScreens.xml
trunk/applications/party/widget/partymgr/SecurityScreens.xml
trunk/applications/product/webapp/catalog/catalog/ProdCatalogForms.xml
trunk/applications/product/widget/catalog/CatalogCommonScreens.xml
trunk/applications/product/widget/catalog/ProductScreens.xml
Log:
Applied a couple of patches from Hans Bakker to use parameteried decorator locations; also some quick visual cleanups in the catalog area for the more modern styles
Modified: trunk/applications/party/widget/partymgr/CommonScreens.xml
===================================================================
--- trunk/applications/party/widget/partymgr/CommonScreens.xml 2006-02-06 01:53:07 UTC (rev 6680)
+++ trunk/applications/party/widget/partymgr/CommonScreens.xml 2006-02-06 06:28:34 UTC (rev 6681)
@@ -148,6 +148,45 @@
</widgets>
</section>
</screen>
+ <screen name="SecurityGroupDecorator">
+ <section>
+ <actions>
+ <set field="headerItem" value="security"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator">
+ <decorator-section name="body">
+ <section>
+ <condition>
+ <if-has-permission permission="SECURITY" action="_VIEW"/>
+ </condition>
+ <widgets>
+ <section>
+ <condition><not><if-empty field-name="groupId"/></not></condition>
+ <widgets>
+ <platform-specific>
+ <html><html-template location="component://party/webapp/partymgr/security/SecurityGroupTabBar.ftl"/></html>
+ </platform-specific>
+ </widgets>
+ </section>
+ <container>
+ <label style="head1" text="${uiLabelMap.${labelTitleProperty}} [${groupId}]"/>
+ </container>
+ <container>
+ <link target="EditSecurityGroup" style="buttontext" text="[${uiLabelMap.PartyNewSecurityGroup}]"/>
+ </container>
+
+ <decorator-section-include name="body"/>
+ </widgets>
+ <fail-widgets>
+ <label style="head3">${uiLabelMap.PartySecurityViewPermissionError}</label>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
<screen name="login">
<section>
<widgets>
Modified: trunk/applications/party/widget/partymgr/PartyScreens.xml
===================================================================
--- trunk/applications/party/widget/partymgr/PartyScreens.xml 2006-02-06 01:53:07 UTC (rev 6680)
+++ trunk/applications/party/widget/partymgr/PartyScreens.xml 2006-02-06 06:28:34 UTC (rev 6681)
@@ -50,7 +50,7 @@
</platform-specific>
</widgets>
<fail-widgets>
- <label style="head3">${uiLabelMap.PartyMgrViewPermissionError}</label>
+ <label style="head3" text="${uiLabelMap.PartyMgrViewPermissionError}"/>
</fail-widgets>
</section>
</decorator-section>
Modified: trunk/applications/party/widget/partymgr/SecurityScreens.xml
===================================================================
--- trunk/applications/party/widget/partymgr/SecurityScreens.xml 2006-02-06 01:53:07 UTC (rev 6680)
+++ trunk/applications/party/widget/partymgr/SecurityScreens.xml 2006-02-06 06:28:34 UTC (rev 6681)
@@ -37,7 +37,7 @@
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="component://party/widget/partymgr/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<condition>
@@ -61,45 +61,6 @@
</widgets>
</section>
</screen>
- <screen name="SecurityGroupDecorator">
- <section>
- <actions>
- <set field="headerItem" value="security"/>
- </actions>
- <widgets>
- <decorator-screen name="main-decorator" location="component://party/widget/partymgr/CommonScreens.xml">
- <decorator-section name="body">
- <section>
- <condition>
- <if-has-permission permission="SECURITY" action="_VIEW"/>
- </condition>
- <widgets>
- <section>
- <condition><not><if-empty field-name="groupId"/></not></condition>
- <widgets>
- <platform-specific>
- <html><html-template location="component://party/webapp/partymgr/security/SecurityGroupTabBar.ftl"/></html>
- </platform-specific>
- </widgets>
- </section>
- <container>
- <label style="head1" text="${uiLabelMap.${labelTitleProperty}} [${groupId}]"/>
- </container>
- <container>
- <link target="EditSecurityGroup" style="buttontext" text="[${uiLabelMap.PartyNewSecurityGroup}]"/>
- </container>
-
- <decorator-section-include name="body"/>
- </widgets>
- <fail-widgets>
- <label style="head3">${uiLabelMap.PartySecurityViewPermissionError}</label>
- </fail-widgets>
- </section>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
<screen name="EditSecurityGroup">
<section>
<actions>
@@ -111,7 +72,7 @@
<entity-one entity-name="SecurityGroup" value-name="securityGroup"/>
</actions>
<widgets>
- <decorator-screen name="SecurityGroupDecorator">
+ <decorator-screen name="SecurityGroupDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="EditSecurityGroup" location="component://party/widget/partymgr/SecurityForms.xml"/>
</decorator-section>
@@ -130,7 +91,7 @@
<entity-one entity-name="SecurityGroup" value-name="securityGroup"/>
</actions>
<widgets>
- <decorator-screen name="SecurityGroupDecorator">
+ <decorator-screen name="SecurityGroupDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="ListSecurityGroupPermissions" location="component://party/widget/partymgr/SecurityForms.xml"/>
<container><label style="head2" text="${uiLabelMap.PartyAddPermissionToSecurityGroup}"/></container>
@@ -153,7 +114,7 @@
<entity-one entity-name="SecurityGroup" value-name="securityGroup"/>
</actions>
<widgets>
- <decorator-screen name="SecurityGroupDecorator">
+ <decorator-screen name="SecurityGroupDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="ListSecurityGroupUserLogins" location="component://party/widget/partymgr/SecurityForms.xml"/>
<container><label style="head2" text="${uiLabelMap.PartyAddUserLoginToSecurityGroup}"/></container>
Modified: trunk/applications/product/webapp/catalog/catalog/ProdCatalogForms.xml
===================================================================
--- trunk/applications/product/webapp/catalog/catalog/ProdCatalogForms.xml 2006-02-06 01:53:07 UTC (rev 6680)
+++ trunk/applications/product/webapp/catalog/catalog/ProdCatalogForms.xml 2006-02-06 06:28:34 UTC (rev 6681)
@@ -65,25 +65,23 @@
<field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="UpdateProdCatalogToParty" type="list"
- target="updateProdCatalogToParty" title="" list-name="prodCatalogRoleList"
- default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+ target="updateProdCatalogToParty" title="" list-name="prodCatalogRoleList"
+ default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
<auto-fields-service service-name="updateProdCatalogToParty"/>
<field name="prodCatalogId"><hidden/></field>
<!-- three possibilities for the Party: person, partyGroup, neither... just print everything and if it's empty, no biggie -->
<field name="partyId" title="${uiLabelMap.PartyParty}">
<display-entity entity-name="PartyNameView" description="${personalTitle} ${firstName} ${middleName} ${lastName} ${suffix} ${groupName}" also-hidden="true" cache="false">
- <sub-hyperlink target-type="inter-app" link-style="buttontext" target="/partymgr/control/viewprofile?party_id=${partyId}" description="[${partyId}]"/>
+ <sub-hyperlink target-type="inter-app" link-style="buttontext" target="/partymgr/control/viewprofile?party_id=${partyId}" description="${partyId}"/>
</display-entity>
</field>
- <field name="roleTypeId" title="${uiLabelMap.PartyRole}" widget-style="tabletext">
- <display-entity entity-name="RoleType"/>
- </field>
- <field name="fromDate" title="${uiLabelMap.CommonFromDateTime}" widget-style="tabletext"><display/></field>
- <field name="thruDate" title="${uiLabelMap.CommonThruDateTime}"></field>
+ <field name="roleTypeId" title="${uiLabelMap.PartyRole}"><display-entity entity-name="RoleType"/></field>
+ <field name="fromDate" title="${uiLabelMap.CommonFromDateTime}"><display/></field>
+ <field name="thruDate" title="${uiLabelMap.CommonThruDateTime}" widget-style="inputBox"></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
<hyperlink target="removeProdCatalogFromParty?prodCatalogId=${prodCatalogId}&partyId=${partyId}&roleTypeId=${roleTypeId}&fromDate=${fromDate}"
- description="[Delete]" also-hidden="false"/>
+ description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
</field>
</form>
<form name="CreateProductStoreCatalog" type="single"
@@ -107,7 +105,7 @@
<field name="prodCatalogId"><hidden/></field>
<field name="productStoreId" title="${uiLabelMap.ProductStoreId}">
<display-entity entity-name="ProductStore" description="${storeName}" also-hidden="true" cache="true">
- <sub-hyperlink link-style="buttontext" target="EditProductStore?productStoreId=${productStoreId}" description="[${productStoreId}]"/>
+ <sub-hyperlink link-style="buttontext" target="EditProductStore?productStoreId=${productStoreId}" description="${productStoreId}"/>
</display-entity>
</field>
<field name="fromDate" title="${uiLabelMap.CommonFromDateTime}" widget-style="tabletext"><display/></field>
@@ -115,30 +113,30 @@
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
<hyperlink target="deleteProdCatalogStore?prodCatalogId=${prodCatalogId}&productStoreId=${productStoreId}&fromDate=${fromDate}"
- description="[Delete]" also-hidden="false"/>
+ description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
</field>
</form>
<form name="EditProdCatalogCategories" type="list"
target="updateProductCategoryToProdCatalog" title="" list-name="prodCatalogCategories"
- default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+ default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
<auto-fields-service service-name="updateProductCategoryToProdCatalog"/>
<field name="prodCatalogId"><hidden/></field>
<field name="productCategoryId">
<display-entity entity-name="ProductCategory" description="${description}" also-hidden="true" cache="true">
- <sub-hyperlink link-style="buttontext" target="EditCategory?productCategoryId=${productCategoryId}" description="[${productCategoryId}]"/>
+ <sub-hyperlink link-style="buttontext" target="EditCategory?productCategoryId=${productCategoryId}" description="${productCategoryId}"/>
</display-entity>
</field>
<field name="prodCatalogCategoryTypeId" title="Type"><display-entity entity-name="ProdCatalogCategoryType" also-hidden="true" cache="true"/></field>
<field name="fromDate"><display/></field>
- <field name="thruDate"></field>
- <field name="sequenceNum"></field>
+ <field name="thruDate" widget-style="inputBox"></field>
+ <field name="sequenceNum" widget-style="inputBox"></field>
<field name="deleteLink" title=" " widget-style="buttontext">
<hyperlink target="removeProductCategoryFromProdCatalog?prodCatalogId=${prodCatalogId}&productCategoryId=${productCategoryId}&fromDate=${fromDate}&prodCatalogCategoryTypeId=${prodCatalogCategoryTypeId}"
- description="[${uiLabelMap.CommonDelete}]" also-hidden="false"/>
+ description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
</field>
<field name="makeTopLink" title=" " widget-style="buttontext">
<hyperlink target="EditCategory?CATALOG_TOP_CATEGORY=${productCategoryId}&productCategoryId=${productCategoryId}"
- description="[${uiLabelMap.ProductMakeTop}]" also-hidden="false"/>
+ description="${uiLabelMap.ProductMakeTop}" also-hidden="false"/>
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
Modified: trunk/applications/product/widget/catalog/CatalogCommonScreens.xml
===================================================================
--- trunk/applications/product/widget/catalog/CatalogCommonScreens.xml 2006-02-06 01:53:07 UTC (rev 6680)
+++ trunk/applications/product/widget/catalog/CatalogCommonScreens.xml 2006-02-06 06:28:34 UTC (rev 6681)
@@ -72,6 +72,55 @@
</section>
</screen>
+ <screen name="CommonProductDecorator">
+ <section>
+ <actions>
+ <set field="leftbarScreenName" value="leftbar"/>
+ <set field="MainColumnStyle" value="leftonly"/>
+
+ <set field="productId" from-field="parameters.productId"/>
+ <entity-one entity-name="Product" value-name="product"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <!-- do check for CATALOG, _VIEW permission -->
+ <condition>
+ <if-has-permission permission="CATALOG" action="_VIEW"/>
+ </condition>
+ <widgets>
+ <section>
+ <condition><not><if-empty field-name="productId"/></not></condition>
+ <widgets>
+ <platform-specific>
+ <html><html-template location="component://product/webapp/catalog/product/ProductTabBar.ftl"/></html>
+ </platform-specific>
+ <container>
+ <label style="head1">${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonFor}: ${product.internalName} [${uiLabelMap.CommonId}:${productId}] ${${extraFunctionName}}</label>
+ </container>
+
+ <!-- add Create Product and View Product (in ecommerce) links -->
+ <container>
+ <link target="EditProduct" text="${uiLabelMap.ProductNewProduct}" style="buttontext"/>
+ <link target="CreateVirtualWithVariantsForm" text="${uiLabelMap.ProductNewVirtualProduct}" style="buttontext"/>
+ <link target="ecommerce/control/product?product_id=${productId}" url-mode="plain" text="${uiLabelMap.ProductProductPage}" style="buttontext"/>
+ </container>
+ </widgets>
+ </section>
+
+ <decorator-section-include name="body"/>
+ </widgets>
+ <fail-widgets>
+ <label style="head3">${uiLabelMap.ProductCatalogViewPermissionError}</label>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
<screen name="CommonCatalogDecorator">
<section>
<actions>
Modified: trunk/applications/product/widget/catalog/ProductScreens.xml
===================================================================
--- trunk/applications/product/widget/catalog/ProductScreens.xml 2006-02-06 01:53:07 UTC (rev 6680)
+++ trunk/applications/product/widget/catalog/ProductScreens.xml 2006-02-06 06:28:34 UTC (rev 6681)
@@ -25,55 +25,7 @@
<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-screen.xsd">
- <screen name="CommonProductDecorator">
- <section>
- <actions>
- <set field="leftbarScreenName" value="leftbar"/>
- <set field="MainColumnStyle" value="leftonly"/>
- <set field="productId" from-field="parameters.productId"/>
- <entity-one entity-name="Product" value-name="product"/>
- </actions>
- <widgets>
- <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <section>
- <!-- do check for CATALOG, _VIEW permission -->
- <condition>
- <if-has-permission permission="CATALOG" action="_VIEW"/>
- </condition>
- <widgets>
- <section>
- <condition><not><if-empty field-name="productId"/></not></condition>
- <widgets>
- <platform-specific>
- <html><html-template location="component://product/webapp/catalog/product/ProductTabBar.ftl"/></html>
- </platform-specific>
- <container>
- <label style="head1">${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonFor}: ${product.internalName} [${uiLabelMap.CommonId}:${productId}] ${${extraFunctionName}}</label>
- </container>
-
- <!-- add Create Product and View Product (in ecommerce) links -->
- <container>
- <link target="EditProduct" text="${uiLabelMap.ProductNewProduct}" style="buttontext"/>
- <link target="CreateVirtualWithVariantsForm" text="${uiLabelMap.ProductNewVirtualProduct}" style="buttontext"/>
- <link target="ecommerce/control/product?product_id=${productId}" url-mode="plain" text="${uiLabelMap.ProductProductPage}" style="buttontext"/>
- </container>
- </widgets>
- </section>
-
- <decorator-section-include name="body"/>
- </widgets>
- <fail-widgets>
- <label style="head3">${uiLabelMap.ProductCatalogViewPermissionError}</label>
- </fail-widgets>
- </section>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
-
<screen name="EditProduct">
<section>
<actions>
@@ -85,7 +37,7 @@
<entity-one entity-name="Product" value-name="product"/>
</actions>
<widgets>
- <decorator-screen name="CommonProductDecorator">
+ <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="EditProduct" location="component://product/webapp/catalog/product/ProductForms.xml"/>
@@ -119,7 +71,7 @@
<property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/>
</actions>
<widgets>
- <decorator-screen name="CommonProductDecorator">
+ <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="UpdateProductPrice" location="component://product/webapp/catalog/product/ProductForms.xml"/>
<include-form name="AddProductPrice" location="component://product/webapp/catalog/product/ProductForms.xml"/>
@@ -145,7 +97,7 @@
</entity-condition>
</actions>
<widgets>
- <decorator-screen name="CommonProductDecorator">
+ <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="UpdateProductCategoryMemeber" location="component://product/webapp/catalog/product/ProductForms.xml"/>
<include-form name="AddProductCategoryMember" location="component://product/webapp/catalog/product/ProductForms.xml"/>
@@ -172,7 +124,7 @@
</entity-and>
</actions>
<widgets>
- <decorator-screen name="CommonProductDecorator">
+ <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="UpdateProductConfig" location="component://product/webapp/catalog/product/ProductForms.xml"/>
<include-form name="AddProductConfig" location="component://product/webapp/catalog/product/ProductForms.xml"/>
@@ -195,7 +147,7 @@
</entity-condition>
</actions>
<widgets>
- <decorator-screen name="CommonProductDecorator">
+ <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="EditProductAssetUsage" location="component://product/webapp/catalog/product/ProductForms.xml"/>
<container>
@@ -223,7 +175,7 @@
<entity-one entity-name="FixedAssetProduct" value-name="fixedAssetProduct"/>
</actions>
<widgets>
- <decorator-screen name="CommonProductDecorator">
+ <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="showFixedAssetProduct" location="component://product/webapp/catalog/product/ProductForms.xml"/>
</decorator-section>
@@ -242,7 +194,7 @@
<set field="productId" from-field="parameters.productId"/>
</actions>
<widgets>
- <decorator-screen name="CommonProductDecorator">
+ <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="addFixedAssetProduct" location="component://product/webapp/catalog/product/ProductForms.xml"/>
</decorator-section>
@@ -277,7 +229,7 @@
</entity-and>
</actions>
<widgets>
- <decorator-screen name="CommonProductDecorator">
+ <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<!--<include-form name="UpdateProductPrice" location="component://product/webapp/catalog/product/ProductForms.xml"/>-->
<container><label style="head2">${uiLabelMap.ProductRoutings}</label></container>
@@ -308,7 +260,7 @@
</entity-and>
</actions>
<widgets>
- <decorator-screen name="CommonProductDecorator">
+ <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container><label style="head2">${uiLabelMap.ProductCosts}</label></container>
<include-form name="ListCostComponents" location="component://product/webapp/catalog/product/ProductForms.xml"/>
@@ -332,7 +284,7 @@
<script location="component://product/webapp/catalog/WEB-INF/actions/product/QuickAddVariants.bsh"/>
</actions>
<widgets>
- <decorator-screen name="CommonProductDecorator">
+ <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://product/webapp/catalog/product/QuickAddVariants.ftl"/></html>
@@ -355,7 +307,7 @@
<script location="component://product/webapp/catalog/WEB-INF/actions/product/EditProductQuickAdmin.bsh"/>
</actions>
<widgets>
- <decorator-screen name="CommonProductDecorator">
+ <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://product/webapp/catalog/product/EditProductQuickAdmin.ftl"/></html>
@@ -385,7 +337,7 @@
</entity-condition>
</actions>
<widgets>
- <decorator-screen name="CommonProductDecorator">
+ <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://product/webapp/catalog/product/EditProductFacilities.ftl"/></html>
@@ -415,7 +367,7 @@
</entity-condition>
</actions>
<widgets>
- <decorator-screen name="CommonProductDecorator">
+ <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://product/webapp/catalog/product/EditProductFacilityLocations.ftl"/></html>
@@ -436,7 +388,7 @@
<entity-one entity-name="Product" value-name="product"/>
</actions>
<widgets>
- <decorator-screen name="CommonProductDecorator">
+ <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://product/webapp/catalog/product/EditProductKeyword.ftl"/></html>
@@ -458,7 +410,7 @@
<script location="component://product/webapp/catalog/WEB-INF/actions/product/EditProductInventoryItems.bsh"/>
</actions>
<widgets>
- <decorator-screen name="CommonProductDecorator">
+ <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://product/webapp/catalog/product/EditProductInventoryItems.ftl"/></html>
@@ -490,7 +442,7 @@
</entity-condition>
</actions>
<widgets>
- <decorator-screen name="CommonProductDecorator">
+ <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://product/webapp/catalog/product/EditProductGoodIdentifications.ftl"/></html>
@@ -522,7 +474,7 @@
</entity-condition>
</actions>
<widgets>
- <decorator-screen name="CommonProductDecorator">
+ <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://product/webapp/catalog/product/EditProductGlAccounts.ftl"/></html>
@@ -549,7 +501,7 @@
</entity-condition>
</actions>
<widgets>
- <decorator-screen name="CommonProductDecorator">
+ <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="UpdateProductPaymentMethodType" location="component://product/webapp/catalog/product/ProductForms.xml"/>
<include-form name="AddProductPaymentMethodType" location="component://product/webapp/catalog/product/ProductForms.xml"/>
@@ -571,7 +523,7 @@
<script location="component://product/webapp/catalog/WEB-INF/actions/product/EditProductFeatures.bsh"/>
</actions>
<widgets>
- <decorator-screen name="CommonProductDecorator">
+ <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://product/webapp/catalog/product/EditProductFeatures.ftl"/></html>
@@ -600,7 +552,7 @@
<entity-one entity-name="SupplierProduct" value-name="supplierProduct" auto-field-map="true"/>
</actions>
<widgets>
- <decorator-screen name="CommonProductDecorator">
+ <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="ListSupplierProducts" location="component://product/webapp/catalog/product/ProductForms.xml"/>
<section>
@@ -625,7 +577,7 @@
<script location="component://product/webapp/catalog/WEB-INF/actions/product/EditProductContent.bsh"/>
</actions>
<widgets>
- <decorator-screen name="CommonProductDecorator">
+ <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://product/webapp/catalog/product/EditProductContent.ftl"/></html>
@@ -647,7 +599,7 @@
<script location="component://product/webapp/catalog/WEB-INF/actions/product/EditProductContentContent.bsh"/>
</actions>
<widgets>
- <decorator-screen name="CommonProductDecorator">
+ <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://product/webapp/catalog/product/EditProductContentContent.ftl"/></html>
@@ -673,7 +625,7 @@
</entity-and>
</actions>
<widgets>
- <decorator-screen name="CommonProductDecorator">
+ <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://product/webapp/catalog/product/EditProductAttributes.ftl"/></html>
@@ -695,7 +647,7 @@
<script location="component://product/webapp/catalog/WEB-INF/actions/product/EditProductAssoc.bsh"/>
</actions>
<widgets>
- <decorator-screen name="CommonProductDecorator">
+ <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://product/webapp/catalog/product/EditProductAssoc.ftl"/></html>
@@ -724,7 +676,7 @@
</entity-and>
</actions>
<widgets>
- <decorator-screen name="CommonProductDecorator">
+ <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="ListProductAssocs" location="component://product/webapp/catalog/product/ProductForms.xml"/>
<include-form name="ListProductAssocsTo" location="component://product/webapp/catalog/product/ProductForms.xml"/>
@@ -743,7 +695,7 @@
<entity-one entity-name="Product" value-name="product"/>
</actions>
<widgets>
- <decorator-screen name="CommonProductDecorator">
+ <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://product/webapp/catalog/product/createVirtualWithVariantsForm.ftl"/></html>
@@ -769,7 +721,7 @@
<script location="component://product/webapp/catalog/WEB-INF/actions/product/ApplyFeaturesFromGroup.bsh"/>
</actions>
<widgets>
- <decorator-screen name="CommonProductDecorator">
+ <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl"/></html>
More information about the Svn
mailing list