[OFBiz] SVN: r6714 - in trunk/applications: accounting/widget manufacturing/widget/manufacturing order/widget/ordermgr party/widget/partymgr product/widget/catalog product/widget/facility
jacopo@svn.ofbiz.org
jacopo at svn.ofbiz.org
Sat Feb 11 02:28:09 CST 2006
Author: jacopo
Date: 2006-02-11 02:27:30 -0600 (Sat, 11 Feb 2006)
New Revision: 6714
Modified:
trunk/applications/accounting/widget/AccountingScreens.xml
trunk/applications/accounting/widget/CommonScreens.xml
trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml
trunk/applications/order/widget/ordermgr/CommonScreens.xml
trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml
trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml
trunk/applications/order/widget/ordermgr/RequestScreens.xml
trunk/applications/party/widget/partymgr/CommonScreens.xml
trunk/applications/product/widget/catalog/CatalogCommonScreens.xml
trunk/applications/product/widget/catalog/CatalogScreens.xml
trunk/applications/product/widget/catalog/CategoryScreens.xml
trunk/applications/product/widget/catalog/CommonScreens.xml
trunk/applications/product/widget/catalog/ConfigScreens.xml
trunk/applications/product/widget/catalog/FeatureScreens.xml
trunk/applications/product/widget/catalog/FindScreens.xml
trunk/applications/product/widget/catalog/PriceScreens.xml
trunk/applications/product/widget/catalog/ProductScreens.xml
trunk/applications/product/widget/catalog/PromoScreens.xml
trunk/applications/product/widget/catalog/ReviewScreens.xml
trunk/applications/product/widget/catalog/ThesaurusScreens.xml
trunk/applications/product/widget/facility/CommonScreens.xml
Log:
Converted the accounting, catalog, facility, manufacturing, order, party screens to use the GlobalDecorator screen (as a central template) defined in the common component.
Some minor cleanups.
Modified: trunk/applications/accounting/widget/AccountingScreens.xml
===================================================================
--- trunk/applications/accounting/widget/AccountingScreens.xml 2006-02-11 00:35:35 UTC (rev 6713)
+++ trunk/applications/accounting/widget/AccountingScreens.xml 2006-02-11 08:27:30 UTC (rev 6714)
@@ -65,9 +65,6 @@
<screen name="CommonAccountDecorator">
<section>
<actions>
- <set field="leftbarScreenName" value="leftbar"/>
- <!-- <set field="leftbarScreenLocation" value=""/> -->
-
<set field="glAccountId" from-field="parameters.glAccountId"/>
<entity-one entity-name="GlAccount" value-name="glAccount"/>
</actions>
Modified: trunk/applications/accounting/widget/CommonScreens.xml
===================================================================
--- trunk/applications/accounting/widget/CommonScreens.xml 2006-02-11 00:35:35 UTC (rev 6713)
+++ trunk/applications/accounting/widget/CommonScreens.xml 2006-02-11 08:27:30 UTC (rev 6714)
@@ -40,31 +40,10 @@
<!-- <set field="layoutSettings.headerMiddleBackgroundUrl" value="" global="true"/> -->
<!-- <set field="layoutSettings.headerRightBackgroundUrl" value="" global="true"/> -->
<set field="activeApp" value="accounting" global="true"/>
+ <set field="appheaderTemplate" value="component://accounting/webapp/accounting/includes/appheader.ftl" global="true"/>
</actions>
<widgets>
- <!-- render header -->
- <platform-specific><html><html-template location="component://common/webcommon/includes/header.ftl"/></html></platform-specific>
- <!-- render appbar -->
- <platform-specific><html><html-template location="component://common/webcommon/includes/appbar.ftl"/></html></platform-specific>
-
- <container style="centerarea">
- <!-- render appheader -->
- <platform-specific><html><html-template location="component://accounting/webapp/accounting/includes/appheader.ftl"/></html></platform-specific>
-
- <container style="contentarea">
- <!-- by default will render left-bar only if leftbarScreen value not empty -->
- <!-- include-screen name="${leftbarScreenName}" location="${leftbarScreenLocation}"/ -->
-
- <container style="column-main">
- <!-- render messages -->
- <platform-specific><html><html-template location="component://common/webcommon/includes/messages.ftl"/></html></platform-specific>
- <decorator-section-include name="body"/>
- </container>
- </container>
- </container>
-
- <!-- render footer -->
- <platform-specific><html><html-template location="component://common/webcommon/includes/footer.ftl"/></html></platform-specific>
+ <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
</widgets>
</section>
</screen>
Modified: trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml
===================================================================
--- trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml 2006-02-11 00:35:35 UTC (rev 6713)
+++ trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml 2006-02-11 08:27:30 UTC (rev 6714)
@@ -30,6 +30,9 @@
<actions>
<!-- base/top/specific map first, then more common map added for shared labels -->
<property-map resource="ManufacturingUiLabels" map-name="uiLabelMap" global="true"/>
+ <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
+ <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+ <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
<set field="layoutSettings.companyName" from-field="uiLabelMap.ManufacturingCompanyName" global="true"/>
@@ -38,28 +41,10 @@
<!-- <set field="layoutSettings.headerMiddleBackgroundUrl" value="" global="true"/> -->
<!-- <set field="layoutSettings.headerRightBackgroundUrl" value="" global="true"/> -->
<set field="activeApp" value="manufacturing" global="true"/>
+ <set field="appheaderTemplate" value="component://manufacturing/webapp/manufacturing/includes/appheader.ftl" global="true"/>
</actions>
<widgets>
- <!-- render header -->
- <platform-specific><html><html-template location="component://common/webcommon/includes/header.ftl"/></html></platform-specific>
- <!-- render appbar -->
- <platform-specific><html><html-template location="component://common/webcommon/includes/appbar.ftl"/></html></platform-specific>
-
- <container style="centerarea">
- <!-- render appheader -->
- <platform-specific><html><html-template location="component://manufacturing/webapp/manufacturing/includes/appheader.ftl"/></html></platform-specific>
-
- <container style="contentarea">
- <container style="column-main">
- <!-- render messages -->
- <platform-specific><html><html-template location="component://common/webcommon/includes/messages.ftl"/></html></platform-specific>
- <decorator-section-include name="body"/>
- </container>
- </container>
- </container>
-
- <!-- render footer -->
- <platform-specific><html><html-template location="component://common/webcommon/includes/footer.ftl"/></html></platform-specific>
+ <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
</widgets>
</section>
</screen>
Modified: trunk/applications/order/widget/ordermgr/CommonScreens.xml
===================================================================
--- trunk/applications/order/widget/ordermgr/CommonScreens.xml 2006-02-11 00:35:35 UTC (rev 6713)
+++ trunk/applications/order/widget/ordermgr/CommonScreens.xml 2006-02-11 08:27:30 UTC (rev 6714)
@@ -46,34 +46,10 @@
<!-- <set field="layoutSettings.headerMiddleBackgroundUrl" value="" global="true"/> -->
<!-- <set field="layoutSettings.headerRightBackgroundUrl" value="" global="true"/> -->
<set field="activeApp" value="ordermgr" global="true"/>
+ <set field="appheaderTemplate" value="component://order/webapp/ordermgr/includes/appheader.ftl" global="true"/>
</actions>
<widgets>
- <!-- render header -->
- <platform-specific><html><html-template location="component://common/webcommon/includes/header.ftl"/></html></platform-specific>
- <!-- render appbar -->
- <platform-specific><html><html-template location="component://common/webcommon/includes/appbar.ftl"/></html></platform-specific>
-
- <container style="centerarea">
- <!-- render appheader -->
- <platform-specific><html><html-template location="component://order/webapp/ordermgr/includes/appheader.ftl"/></html></platform-specific>
-
- <container style="contentarea">
- <container id="column-container">
- <!-- by default will render left-bar only if leftbarScreen value not empty -->
- <include-screen name="${leftbarScreenName}" location="${leftbarScreenLocation}"/>
-
- <container style="${MainColumnStyle}">
- <!-- render messages -->
- <platform-specific><html><html-template location="component://common/webcommon/includes/messages.ftl"/></html></platform-specific>
- <decorator-section-include name="body"/>
- </container>
- <container style="endcolumns"><label text="&nbsp;"/></container>
- </container>
- </container>
- </container>
-
- <!-- render footer -->
- <platform-specific><html><html-template location="component://common/webcommon/includes/footer.ftl"/></html></platform-specific>
+ <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
</widgets>
</section>
</screen>
Modified: trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml
===================================================================
--- trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml 2006-02-11 00:35:35 UTC (rev 6713)
+++ trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml 2006-02-11 08:27:30 UTC (rev 6714)
@@ -113,7 +113,7 @@
<section>
<actions>
<set field="leftbarScreenName" value="leftbar"/>
-
+ <set field="leftbarScreenLocation" value="component://order/widget/ordermgr/OrderEntryCommonScreens.xml"/>
<set field="title" value="Show All Promotions"/>
<set field="promoUseDetailsInlineScreen" value="component://order/widget/ordermgr/OrderEntryCartScreens.xml#promoUseDetailsInline"/>
<script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/showcart.bsh"/>
@@ -132,7 +132,7 @@
<section>
<actions>
<set field="leftbarScreenName" value="leftbar"/>
- <set field="rightbarScreenName" value="rightbar"/>
+ <set field="leftbarScreenLocation" value="component://order/widget/ordermgr/OrderEntryCommonScreens.xml"/>
<set field="title" value="Show Promotion Details"/>
<set field="productsummaryScreen" value="component://order/widget/ordermgr/OrderEntryCatalogScreens.xml#productsummary"/>
Modified: trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml
===================================================================
--- trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml 2006-02-11 00:35:35 UTC (rev 6713)
+++ trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml 2006-02-11 08:27:30 UTC (rev 6714)
@@ -84,10 +84,6 @@
<screen name="category">
<section>
<actions>
-<!-- <set field="leftbarScreenName" value="leftbar"/>
- <set field="rightbarScreenName" value="rightbar"/>
- <set field="MainColumnStyle" value="center"/>-->
-
<set field="title-property" value="PageTitleCategoryPage"/>
</actions>
<widgets>
Modified: trunk/applications/order/widget/ordermgr/RequestScreens.xml
===================================================================
--- trunk/applications/order/widget/ordermgr/RequestScreens.xml 2006-02-11 00:35:35 UTC (rev 6713)
+++ trunk/applications/order/widget/ordermgr/RequestScreens.xml 2006-02-11 08:27:30 UTC (rev 6714)
@@ -85,7 +85,6 @@
<screen name="ViewRequest">
<section>
<actions>
- <set field="rightbarScreenName" value="rightbar"/>
<set field="MainColumnStyle" value="rightonly"/>
<set field="tabButtonItem" value="ViewRequest"/>
<set field="title-property" value="PageTitleViewRequest"/>
Modified: trunk/applications/party/widget/partymgr/CommonScreens.xml
===================================================================
--- trunk/applications/party/widget/partymgr/CommonScreens.xml 2006-02-11 00:35:35 UTC (rev 6713)
+++ trunk/applications/party/widget/partymgr/CommonScreens.xml 2006-02-11 08:27:30 UTC (rev 6714)
@@ -40,28 +40,10 @@
<!-- <set field="layoutSettings.headerMiddleBackgroundUrl" value="" global="true"/> -->
<!-- <set field="layoutSettings.headerRightBackgroundUrl" value="" global="true"/> -->
<set field="activeApp" value="partymgr" global="true"/>
+ <set field="appheaderTemplate" value="component://party/webapp/partymgr/includes/appheader.ftl" global="true"/>
</actions>
<widgets>
- <!-- render header -->
- <platform-specific><html><html-template location="component://common/webcommon/includes/header.ftl"/></html></platform-specific>
- <!-- render appbar -->
- <platform-specific><html><html-template location="component://common/webcommon/includes/appbar.ftl"/></html></platform-specific>
-
- <container style="centerarea">
- <!-- render appheader -->
- <platform-specific><html><html-template location="component://party/webapp/partymgr/includes/appheader.ftl"/></html></platform-specific>
-
- <container style="contentarea">
- <container style="column-main">
- <!-- render messages -->
- <platform-specific><html><html-template location="component://common/webcommon/includes/messages.ftl"/></html></platform-specific>
- <decorator-section-include name="body"/>
- </container>
- </container>
- </container>
-
- <!-- render footer -->
- <platform-specific><html><html-template location="component://common/webcommon/includes/footer.ftl"/></html></platform-specific>
+ <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
</widgets>
</section>
</screen>
Modified: trunk/applications/product/widget/catalog/CatalogCommonScreens.xml
===================================================================
--- trunk/applications/product/widget/catalog/CatalogCommonScreens.xml 2006-02-11 00:35:35 UTC (rev 6713)
+++ trunk/applications/product/widget/catalog/CatalogCommonScreens.xml 2006-02-11 08:27:30 UTC (rev 6714)
@@ -40,34 +40,10 @@
<!-- <set field="layoutSettings.headerMiddleBackgroundUrl" value="" global="true"/> -->
<!-- <set field="layoutSettings.headerRightBackgroundUrl" value="" global="true"/> -->
<set field="activeApp" value="catalogmgr" global="true"/>
+ <set field="appheaderTemplate" value="component://product/webapp/catalog/includes/appheader.ftl" global="true"/>
</actions>
<widgets>
- <!-- render header -->
- <platform-specific><html><html-template location="component://common/webcommon/includes/header.ftl"/></html></platform-specific>
- <!-- render appbar -->
- <platform-specific><html><html-template location="component://common/webcommon/includes/appbar.ftl"/></html></platform-specific>
-
- <container style="centerarea">
- <!-- render appheader -->
- <platform-specific><html><html-template location="component://product/webapp/catalog/includes/appheader.ftl"/></html></platform-specific>
-
- <container style="contentarea">
- <container id="column-container">
- <!-- by default will render left-bar only if leftbarScreen value not empty -->
- <include-screen name="${leftbarScreenName}" location="${leftbarScreenLocation}"/>
-
- <container style="${MainColumnStyle}">
- <!-- render messages -->
- <platform-specific><html><html-template location="component://common/webcommon/includes/messages.ftl"/></html></platform-specific>
- <decorator-section-include name="body"/>
- </container>
- <container style="endcolumns"><label text="&nbsp;"/></container>
- </container>
- </container>
- </container>
-
- <!-- render footer -->
- <platform-specific><html><html-template location="component://common/webcommon/includes/footer.ftl"/></html></platform-specific>
+ <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
</widgets>
</section>
</screen>
@@ -76,6 +52,7 @@
<section>
<actions>
<set field="leftbarScreenName" value="leftbar"/>
+ <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/>
<set field="MainColumnStyle" value="leftonly"/>
<set field="productId" from-field="parameters.productId"/>
@@ -125,6 +102,7 @@
<section>
<actions>
<set field="leftbarScreenName" value="leftbar"/>
+ <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/>
<set field="MainColumnStyle" value="leftonly"/>
</actions>
<widgets>
@@ -160,6 +138,7 @@
<section>
<actions>
<set field="leftbarScreenName" value="leftbar"/>
+ <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/>
<set field="MainColumnStyle" value="leftonly"/>
</actions>
<widgets>
@@ -261,6 +240,7 @@
<section>
<actions>
<set field="leftbarScreenName" value="leftbar"/>
+ <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/>
<set field="MainColumnStyle" value="leftonly"/>
<set field="titleProperty" value="PageTitleChooseTopCategory"/>
@@ -279,6 +259,7 @@
<section>
<actions>
<set field="leftbarScreenName" value="leftbar"/>
+ <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/>
<set field="MainColumnStyle" value="leftonly"/>
<set field="title" value="Fast Load Cache"/>
@@ -298,6 +279,7 @@
<section>
<actions>
<set field="leftbarScreenName" value="leftbar"/>
+ <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/>
<set field="MainColumnStyle" value="leftonly"/>
<set field="headerItem" value="main"/>
Modified: trunk/applications/product/widget/catalog/CatalogScreens.xml
===================================================================
--- trunk/applications/product/widget/catalog/CatalogScreens.xml 2006-02-11 00:35:35 UTC (rev 6713)
+++ trunk/applications/product/widget/catalog/CatalogScreens.xml 2006-02-11 08:27:30 UTC (rev 6714)
@@ -31,6 +31,7 @@
<set field="title" value="Edit Product Catalog"/>
<set field="titleProperty" value="PageTitleEditProductCatalog"/>
<set field="leftbarScreenName" value="leftbar"/>
+ <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/>
<set field="headerItem" value="catalog"/>
<set field="tabButtonItem" value="ProductCatalog"/>
@@ -55,6 +56,7 @@
<set field="title" value="Edit Product Catalog Categories"/>
<set field="titleProperty" value="PageTitleEditProductCatalogCategories"/>
<set field="leftbarScreenName" value="leftbar"/>
+ <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/>
<set field="headerItem" value="catalog"/>
<set field="tabButtonItem" value="ProductCategories"/>
@@ -91,6 +93,7 @@
<set field="title" value="Edit Product Catalog Parties"/>
<set field="titleProperty" value="PageTitleEditProductCatalogParties"/>
<set field="leftbarScreenName" value="leftbar"/>
+ <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/>
<set field="headerItem" value="catalog"/>
<set field="tabButtonItem" value="PartyParties"/>
@@ -122,6 +125,7 @@
<set field="title" value="Edit Product Catalog Stores"/>
<set field="titleProperty" value="PageTitleEditProductCatalog Stores"/>
<set field="leftbarScreenName" value="leftbar"/>
+ <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/>
<set field="headerItem" value="catalog"/>
<set field="tabButtonItem" value="ProductStores"/>
@@ -153,6 +157,7 @@
<set field="title" value="Find Product Catalog"/>
<set field="titleProperty" value="PageTitleEditFindProductCatalog"/>
<set field="leftbarScreenName" value="leftbar"/>
+ <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/>
<entity-condition entity-name="ProdCatalog" list-name="prodCatalogs">
<order-by field-name="catalogName"/>
Modified: trunk/applications/product/widget/catalog/CategoryScreens.xml
===================================================================
--- trunk/applications/product/widget/catalog/CategoryScreens.xml 2006-02-11 00:35:35 UTC (rev 6713)
+++ trunk/applications/product/widget/catalog/CategoryScreens.xml 2006-02-11 08:27:30 UTC (rev 6714)
@@ -29,6 +29,7 @@
<section>
<actions>
<set field="leftbarScreenName" value="leftbar"/>
+ <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/>
<set field="MainColumnStyle" value="leftonly"/>
</actions>
<widgets>
Modified: trunk/applications/product/widget/catalog/CommonScreens.xml
===================================================================
--- trunk/applications/product/widget/catalog/CommonScreens.xml 2006-02-11 00:35:35 UTC (rev 6713)
+++ trunk/applications/product/widget/catalog/CommonScreens.xml 2006-02-11 08:27:30 UTC (rev 6714)
@@ -87,6 +87,7 @@
<section>
<actions>
<set field="leftbarScreenName" value="leftbar"/>
+ <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/>
<set field="MainColumnStyle" value="leftonly"/>
<set field="titleProperty" value="PageTitleChooseTopCategory"/>
@@ -105,6 +106,7 @@
<section>
<actions>
<set field="leftbarScreenName" value="leftbar"/>
+ <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/>
<set field="MainColumnStyle" value="leftonly"/>
<set field="title" value="Fast Load Cache"/>
@@ -124,6 +126,7 @@
<section>
<actions>
<set field="leftbarScreenName" value="leftbar"/>
+ <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/>
<set field="MainColumnStyle" value="leftonly"/>
<set field="headerItem" value="main"/>
Modified: trunk/applications/product/widget/catalog/ConfigScreens.xml
===================================================================
--- trunk/applications/product/widget/catalog/ConfigScreens.xml 2006-02-11 00:35:35 UTC (rev 6713)
+++ trunk/applications/product/widget/catalog/ConfigScreens.xml 2006-02-11 08:27:30 UTC (rev 6714)
@@ -29,6 +29,7 @@
<section>
<actions>
<set field="leftbarScreenName" value="leftbar"/>
+ <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/>
<set field="MainColumnStyle" value="leftonly"/>
</actions>
<widgets>
Modified: trunk/applications/product/widget/catalog/FeatureScreens.xml
===================================================================
--- trunk/applications/product/widget/catalog/FeatureScreens.xml 2006-02-11 00:35:35 UTC (rev 6713)
+++ trunk/applications/product/widget/catalog/FeatureScreens.xml 2006-02-11 08:27:30 UTC (rev 6714)
@@ -29,6 +29,7 @@
<section>
<actions>
<set field="leftbarScreenName" value="leftbar"/>
+ <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/>
<set field="MainColumnStyle" value="leftonly"/>
<!--<set field="productId" from-field="parameters.productId"/>-->
Modified: trunk/applications/product/widget/catalog/FindScreens.xml
===================================================================
--- trunk/applications/product/widget/catalog/FindScreens.xml 2006-02-11 00:35:35 UTC (rev 6713)
+++ trunk/applications/product/widget/catalog/FindScreens.xml 2006-02-11 08:27:30 UTC (rev 6714)
@@ -29,6 +29,7 @@
<section>
<actions>
<set field="leftbarScreenName" value="leftbar"/>
+ <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/>
<set field="MainColumnStyle" value="leftonly"/>
</actions>
<widgets>
@@ -96,6 +97,7 @@
<section>
<actions>
<set field="leftbarScreenName" value="leftbar"/>
+ <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/>
<set field="MainColumnStyle" value="leftonly"/>
<set field="title" value="Find Product By ID"/>
Modified: trunk/applications/product/widget/catalog/PriceScreens.xml
===================================================================
--- trunk/applications/product/widget/catalog/PriceScreens.xml 2006-02-11 00:35:35 UTC (rev 6713)
+++ trunk/applications/product/widget/catalog/PriceScreens.xml 2006-02-11 08:27:30 UTC (rev 6714)
@@ -29,6 +29,7 @@
<section>
<actions>
<set field="leftbarScreenName" value="leftbar"/>
+ <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/>
<set field="MainColumnStyle" value="leftonly"/>
</actions>
<widgets>
Modified: trunk/applications/product/widget/catalog/ProductScreens.xml
===================================================================
--- trunk/applications/product/widget/catalog/ProductScreens.xml 2006-02-11 00:35:35 UTC (rev 6713)
+++ trunk/applications/product/widget/catalog/ProductScreens.xml 2006-02-11 08:27:30 UTC (rev 6714)
@@ -736,6 +736,7 @@
<section>
<actions>
<set field="leftbarScreenName" value="leftbar"/>
+ <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
Modified: trunk/applications/product/widget/catalog/PromoScreens.xml
===================================================================
--- trunk/applications/product/widget/catalog/PromoScreens.xml 2006-02-11 00:35:35 UTC (rev 6713)
+++ trunk/applications/product/widget/catalog/PromoScreens.xml 2006-02-11 08:27:30 UTC (rev 6714)
@@ -29,6 +29,7 @@
<section>
<actions>
<set field="leftbarScreenName" value="leftbar"/>
+ <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/>
<set field="MainColumnStyle" value="leftonly"/>
</actions>
<widgets>
Modified: trunk/applications/product/widget/catalog/ReviewScreens.xml
===================================================================
--- trunk/applications/product/widget/catalog/ReviewScreens.xml 2006-02-11 00:35:35 UTC (rev 6713)
+++ trunk/applications/product/widget/catalog/ReviewScreens.xml 2006-02-11 08:27:30 UTC (rev 6714)
@@ -29,6 +29,7 @@
<section>
<actions>
<set field="leftbarScreenName" value="leftbar"/>
+ <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/>
<set field="MainColumnStyle" value="leftonly"/>
</actions>
<widgets>
Modified: trunk/applications/product/widget/catalog/ThesaurusScreens.xml
===================================================================
--- trunk/applications/product/widget/catalog/ThesaurusScreens.xml 2006-02-11 00:35:35 UTC (rev 6713)
+++ trunk/applications/product/widget/catalog/ThesaurusScreens.xml 2006-02-11 08:27:30 UTC (rev 6714)
@@ -29,6 +29,7 @@
<section>
<actions>
<set field="leftbarScreenName" value="leftbar"/>
+ <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/>
<set field="MainColumnStyle" value="leftonly"/>
</actions>
<widgets>
Modified: trunk/applications/product/widget/facility/CommonScreens.xml
===================================================================
--- trunk/applications/product/widget/facility/CommonScreens.xml 2006-02-11 00:35:35 UTC (rev 6713)
+++ trunk/applications/product/widget/facility/CommonScreens.xml 2006-02-11 08:27:30 UTC (rev 6714)
@@ -38,31 +38,10 @@
<!-- <set field="layoutSettings.headerMiddleBackgroundUrl" value="" global="true"/> -->
<!-- <set field="layoutSettings.headerRightBackgroundUrl" value="" global="true"/> -->
<set field="activeApp" value="facilitymgr" global="true"/>
+ <set field="appheaderTemplate" value="component://product/webapp/facility/includes/appheader.ftl" global="true"/>
</actions>
<widgets>
- <!-- render header -->
- <platform-specific><html><html-template location="component://common/webcommon/includes/header.ftl"/></html></platform-specific>
- <!-- render appbar -->
- <platform-specific><html><html-template location="component://common/webcommon/includes/appbar.ftl"/></html></platform-specific>
-
- <container style="centerarea">
- <!-- render appheader -->
- <platform-specific><html><html-template location="component://product/webapp/facility/includes/appheader.ftl"/></html></platform-specific>
-
- <container style="contentarea">
- <!-- by default will render left-bar only if leftbarScreen value not empty -->
- <include-screen name="${leftbarScreenName}" location="${leftbarScreenLocation}"/>
-
- <container style="column-main">
- <!-- render messages -->
- <platform-specific><html><html-template location="component://common/webcommon/includes/messages.ftl"/></html></platform-specific>
- <decorator-section-include name="body"/>
- </container>
- </container>
- </container>
-
- <!-- render footer -->
- <platform-specific><html><html-template location="component://common/webcommon/includes/footer.ftl"/></html></platform-specific>
+ <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
</widgets>
</section>
</screen>
More information about the Svn
mailing list