Author: buscob
Date: Sat Jan 2 12:27:53 2010
New Revision: 895182
URL: http://svn.apache.org/viewvc?rev=895182&view=rev
Log:
Removed settings of unused fields "leftbarScreenName", "leftbarScreenLocation"
and "MainColumnStyle"
Removed redundant <container style="left"> in leftbar screens
Modified:
ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml
ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
Modified: ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml?rev=895182&r1=895181&r2=895182&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml Sat Jan 2
12:27:53 2010
@@ -38,9 +38,6 @@
<set field="applicationMenuName" value="SfaAppBar"
global="true"/>
<set field="applicationMenuLocation"
value="component://marketing/widget/sfa/SfaMenus.xml" global="true"/>
<set field="applicationTitle"
value="${uiLabelMap.SfaManagerApplication}" global="true"/>
- <set field="leftbarScreenName" value="leftbar"/>
- <set field="leftbarScreenLocation"
value="component://marketing/widget/sfa/CommonScreens.xml"/>
- <set field="MainColumnStyle" value="leftonly-larger"/>
<set field="parameters.parentPortalPageId"
from-field="parameters.parentPortalPageId" default-value="SFA" global="true"/>
<script
location="component://common/webcommon/WEB-INF/actions/includes/GetParentPortalPageId.groovy"/>
</actions>
Modified:
ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml?rev=895182&r1=895181&r2=895182&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml
(original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml
Sat Jan 2 12:27:53 2010
@@ -115,8 +115,6 @@
<screen name="showAllPromotions">
<section>
<actions>
- <set field="leftbarScreenName" value="leftbar"/>
- <set field="leftbarScreenLocation"
value="component://order/widget/ordermgr/OrderEntryCommonScreens.xml"/>
<set field="titleProperty" value="PageTitleShowAllPromotions"/>
<set field="promoUseDetailsInlineScreen"
value="component://order/widget/ordermgr/OrderEntryCartScreens.xml#promoUseDetailsInline"/>
<script
location="component://order/webapp/ordermgr/WEB-INF/actions/entry/ShowCart.groovy"/>
@@ -134,9 +132,6 @@
<screen name="showPromotionDetails">
<section>
<actions>
- <set field="leftbarScreenName" value="leftbar"/>
- <set field="leftbarScreenLocation"
value="component://order/widget/ordermgr/OrderEntryCommonScreens.xml"/>
-
<set field="titleProperty"
value="PageTitleShowPromotionDetails"/>
<set field="productsummaryScreen"
value="component://order/widget/ordermgr/OrderEntryCatalogScreens.xml#productsummary"/>
<script
location="component://order/webapp/ordermgr/WEB-INF/actions/entry/cart/ShowPromotionDetails.groovy"/>
Modified:
ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml?rev=895182&r1=895181&r2=895182&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml
(original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml
Sat Jan 2 12:27:53 2010
@@ -208,9 +208,6 @@
<screen name="keywordsearch">
<section>
<actions>
- <!--<set field="leftbarScreenName" value="leftbar"/>
- <set field="MainColumnStyle" value="center"/>-->
-
<set field="title-property" value="PageTitleSearchResults"/>
<set field="productsummaryScreen"
value="component://order/widget/ordermgr/OrderEntryCatalogScreens.xml#productsummary"/>
<script
location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/KeywordSearch.groovy"/>
Modified:
ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml?rev=895182&r1=895181&r2=895182&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml
(original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml
Sat Jan 2 12:27:53 2010
@@ -76,26 +76,22 @@
<screen name="leftbar">
<section>
<widgets>
- <container style="left">
- <include-screen name="orderHeaderInfo"
location="component://order/widget/ordermgr/OrderEntryCartScreens.xml"/>
- <include-screen name="orderShortcuts"
location="component://order/widget/ordermgr/OrderEntryCartScreens.xml"/>
- <include-screen name="choosecatalog"
location="component://order/widget/ordermgr/OrderEntryCatalogScreens.xml"/>
- <include-screen name="keywordsearchbox"
location="component://order/widget/ordermgr/OrderEntryCatalogScreens.xml"/>
- <include-screen name="sidedeepcategory"
location="component://order/widget/ordermgr/OrderEntryCatalogScreens.xml"/>
- <include-screen name="compareproductslist"
location="component://order/widget/ordermgr/OrderEntryCatalogScreens.xml"/>
- </container>
+ <include-screen name="orderHeaderInfo"
location="component://order/widget/ordermgr/OrderEntryCartScreens.xml"/>
+ <include-screen name="orderShortcuts"
location="component://order/widget/ordermgr/OrderEntryCartScreens.xml"/>
+ <include-screen name="choosecatalog"
location="component://order/widget/ordermgr/OrderEntryCatalogScreens.xml"/>
+ <include-screen name="keywordsearchbox"
location="component://order/widget/ordermgr/OrderEntryCatalogScreens.xml"/>
+ <include-screen name="sidedeepcategory"
location="component://order/widget/ordermgr/OrderEntryCatalogScreens.xml"/>
+ <include-screen name="compareproductslist"
location="component://order/widget/ordermgr/OrderEntryCatalogScreens.xml"/>
</widgets>
</section>
</screen>
<screen name="leftbarCatalog">
<section>
<widgets>
- <container style="left">
- <include-screen name="orderHeaderInfo"
location="component://order/widget/ordermgr/OrderEntryCartScreens.xml"/>
- <include-screen name="minicart"
location="component://order/widget/ordermgr/OrderEntryCartScreens.xml"/>
- <include-screen name="sidedeepcategory"
location="component://order/widget/ordermgr/OrderEntryCatalogScreens.xml"/>
- <include-screen name="compareproductslist"
location="component://order/widget/ordermgr/OrderEntryCatalogScreens.xml"/>
- </container>
+ <include-screen name="orderHeaderInfo"
location="component://order/widget/ordermgr/OrderEntryCartScreens.xml"/>
+ <include-screen name="minicart"
location="component://order/widget/ordermgr/OrderEntryCartScreens.xml"/>
+ <include-screen name="sidedeepcategory"
location="component://order/widget/ordermgr/OrderEntryCatalogScreens.xml"/>
+ <include-screen name="compareproductslist"
location="component://order/widget/ordermgr/OrderEntryCatalogScreens.xml"/>
</widgets>
</section>
</screen>
Modified: ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml?rev=895182&r1=895181&r2=895182&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml Sat Jan
2 12:27:53 2010
@@ -272,12 +272,10 @@
<screen name="leftbar">
<section>
<widgets>
- <container style="left" id="leftSection">
- <include-screen name="keywordsearchbox"/>
- <include-screen name="sidecatalogs"/>
- <include-screen name="sidedeepcategory"/>
- <include-screen name="miniproductlist"/>
- </container>
+ <include-screen name="keywordsearchbox"/>
+ <include-screen name="sidecatalogs"/>
+ <include-screen name="sidedeepcategory"/>
+ <include-screen name="miniproductlist"/>
</widgets>
</section>
</screen>
@@ -333,15 +331,14 @@
<screen name="ChooseTopCategory">
<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"/>
<script
location="component://product/webapp/catalog/WEB-INF/actions/ChooseTopCategory.groovy"/>
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="left-column">
+ <include-screen name="leftbar"/>
+ </decorator-section>
<decorator-section name="body">
<container>
<link target="EditCategory"
text="${uiLabelMap.ProductNewCategory}" style="buttontext"/>
@@ -355,15 +352,14 @@
<screen name="FastLoadCache">
<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="ProductFastLoadCatalogIntoCache"/>
<script
location="component://product/webapp/catalog/WEB-INF/actions/FastLoadCache.groovy"/>
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="left-column">
+ <include-screen name="leftbar"/>
+ </decorator-section>
<decorator-section name="body">
<platform-specific><html><html-template
location="component://product/webapp/catalog/FastLoadCache.ftl"/></html></platform-specific>
</decorator-section>
