Author: buscob
Date: Tue Oct 13 21:15:55 2009
New Revision: 824929
URL: http://svn.apache.org/viewvc?rev=824929&view=rev
Log:
Changed <container style="screenlet"> pattern to <screenlet...>.
Modified:
ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml
ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml
Modified: ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml?rev=824929&r1=824928&r2=824929&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml
(original)
+++ ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml Tue Oct
13 21:15:55 2009
@@ -68,76 +68,21 @@
<widgets>
<decorator-screen name="CommonFeatureDecorator">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.ProductEditFeature} : ${productFeature.description}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form
name="EditProductFeature"
location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.PageTitleEditFeaturePrice}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListFeaturePrice"
location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.PageTitleAddFeaturePrice}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form
name="CreateFeaturePrice"
location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.ProductSupplierSpecificFeatureInformation}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form
name="EditSupplierProductFeatures"
location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.ProductCreateInformationNewSupplier}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form
name="CreateSupplierProductFeature"
location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.ProductEditFeature} :
${productFeature.description}">
+ <include-form name="EditProductFeature"
location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
+ </screenlet>
+ <screenlet
title="${uiLabelMap.PageTitleEditFeaturePrice}">
+ <include-form name="ListFeaturePrice"
location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
+ </screenlet>
+ <screenlet
title="${uiLabelMap.PageTitleAddFeaturePrice}">
+ <include-form name="CreateFeaturePrice"
location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
+ </screenlet>
+ <screenlet
title="${uiLabelMap.ProductSupplierSpecificFeatureInformation}">
+ <include-form name="EditSupplierProductFeatures"
location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
+ </screenlet>
+ <screenlet
title="${uiLabelMap.ProductCreateInformationNewSupplier}">
+ <include-form name="CreateSupplierProductFeature"
location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -185,20 +130,9 @@
<widgets>
<decorator-screen name="CommonFeatureDecorator">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.PageTitleEditFeatureType}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="EditFeatureType"
location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet
title="${uiLabelMap.PageTitleEditFeatureType}">
+ <include-form name="EditFeatureType"
location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -249,20 +183,9 @@
<widgets>
<decorator-screen name="CommonFeatureDecorator">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.PageTitleAddFeatureInterAction}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form
name="EditFeatureInterAction"
location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet
title="${uiLabelMap.PageTitleAddFeatureInterAction}">
+ <include-form name="EditFeatureInterAction"
location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -278,20 +201,9 @@
<widgets>
<decorator-screen name="CommonFeatureDecorator">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.PageTitleEditFeatureType}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form
name="CreateProductFeature"
location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet
title="${uiLabelMap.PageTitleEditFeatureType}">
+ <include-form name="CreateProductFeature"
location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -397,49 +309,16 @@
<widgets>
<decorator-screen name="CommonFeatureDecorator">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.ProductEditFeatureGroupAppls}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form
name="ListFeatureGroupAppls"
location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.ProductQuickApplyFeature}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form
name="QuickApplyFeatureToGroup"
location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.ProductApplyFeaturesFromCategory}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form
name="ApplyFeatureCategoryToGroup"
location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
- <include-form
name="ApplyFeaturesFromCategoryToGroup"
location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet
title="${uiLabelMap.ProductEditFeatureGroupAppls}">
+ <include-form name="ListFeatureGroupAppls"
location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
+ </screenlet>
+ <screenlet
title="${uiLabelMap.ProductQuickApplyFeature}">
+ <include-form name="QuickApplyFeatureToGroup"
location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
+ </screenlet>
+ <screenlet
title="${uiLabelMap.ProductApplyFeaturesFromCategory}">
+ <include-form name="ApplyFeatureCategoryToGroup"
location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
+ <include-form
name="ApplyFeaturesFromCategoryToGroup"
location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -476,34 +355,12 @@
<widgets>
<decorator-screen name="CommonFeatureDecorator">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.PageTitleEditFeaturePrice}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListFeaturePrice"
location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.PageTitleAddFeaturePrice}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form
name="CreateFeaturePrice"
location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet
title="${uiLabelMap.PageTitleEditFeaturePrice}">
+ <include-form name="ListFeaturePrice"
location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
+ </screenlet>
+ <screenlet
title="${uiLabelMap.PageTitleAddFeaturePrice}">
+ <include-form name="CreateFeaturePrice"
location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -514,16 +371,9 @@
<widgets>
<decorator-screen name="CommonFeatureDecorator">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.ProductQuickApplyFeature}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <include-form name="CreateFeaturePrice"
location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
- </container>
- </container>
+ <screenlet
title="${uiLabelMap.ProductQuickApplyFeature}">
+ <include-form name="CreateFeaturePrice"
location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -542,20 +392,9 @@
<widgets>
<decorator-screen name="CommonFeatureDecorator">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.ProductEditFeature} : ${productFeature.description}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form
name="EditProductFeature"
location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.ProductEditFeature} :
${productFeature.description}">
+ <include-form name="EditProductFeature"
location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml?rev=824929&r1=824928&r2=824929&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml Tue Oct 13
21:15:55 2009
@@ -50,7 +50,9 @@
</widgets>
</section>
- <decorator-section-include name="body"/>
+ <container style="no-clear">
+ <decorator-section-include name="body"/>
+ </container>
</widgets>
<fail-widgets>
<label
style="h3">${uiLabelMap.ProductCatalogViewPermissionError}</label>
@@ -77,47 +79,30 @@
<widgets>
<decorator-screen name="CommonPromoDecorator">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.PageTitleEditProductPromotionCode}"/>
- </container>
+ <screenlet
title="${uiLabelMap.PageTitleEditProductPromotionCode}">
+ <container>
+ <link target="EditProductPromo"
text="${uiLabelMap.ProductNewProductPromo}" style="buttontext"/>
</container>
- <container style="screenlet-body">
- <container>
- <link target="EditProductPromo"
text="${uiLabelMap.ProductNewProductPromo}" style="buttontext"/>
- </container>
- <container>
- <label
style="label">${uiLabelMap.CommonView}</label>
- <link target="FindProductPromo"
text="${uiLabelMap.CommonAll}" style="buttontext"/>
- <link target="FindProductPromo"
text="${uiLabelMap.CommonUserEnteredOnly}" style="buttontext">
- <parameter param-name="userEntered"
value="Y"/>
- </link>
- <link target="FindProductPromo"
text="${uiLabelMap.ProductPromotionImported}" style="buttontext">
- <parameter param-name="userEntered"
value="N"/>
- </link>
- </container>
- <section>
- <widgets>
- <include-form
name="GoToProductPromoCode"
location="component://product/webapp/catalog/promo/PromoForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.ProductProductPromotionsList}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListProductPromos"
location="component://product/webapp/catalog/promo/PromoForms.xml"/>
- </widgets>
- </section>
+ <container>
+ <label
style="label">${uiLabelMap.CommonView}</label>
+ <link target="FindProductPromo"
text="${uiLabelMap.CommonAll}" style="buttontext"/>
+ <link target="FindProductPromo"
text="${uiLabelMap.CommonUserEnteredOnly}" style="buttontext">
+ <parameter param-name="userEntered"
value="Y"/>
+ </link>
+ <link target="FindProductPromo"
text="${uiLabelMap.ProductPromotionImported}" style="buttontext">
+ <parameter param-name="userEntered"
value="N"/>
+ </link>
</container>
- </container>
+ <section>
+ <widgets>
+ <include-form name="GoToProductPromoCode"
location="component://product/webapp/catalog/promo/PromoForms.xml"/>
+ </widgets>
+ </section>
+ </screenlet>
+
+ <screenlet
title="${uiLabelMap.ProductProductPromotionsList}">
+ <include-form name="ListProductPromos"
location="component://product/webapp/catalog/promo/PromoForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -137,20 +122,9 @@
<widgets>
<decorator-screen name="CommonPromoDecorator">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.PageTitleEditProductPromos}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="EditProductPromo"
location="component://product/webapp/catalog/promo/PromoForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet
title="${uiLabelMap.PageTitleEditProductPromos}">
+ <include-form name="EditProductPromo"
location="component://product/webapp/catalog/promo/PromoForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -348,20 +322,10 @@
<container>
<link target="EditProductPromoCode"
text="${uiLabelMap.ProductNewPromotionCode}" style="buttontext"/>
</container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.PageTitleEditProductPromotionCode}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form
name="EditProductPromoCode"
location="component://product/webapp/catalog/promo/PromoForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+
+ <screenlet
title="${uiLabelMap.PageTitleEditProductPromotionCode}">
+ <include-form name="EditProductPromoCode"
location="component://product/webapp/catalog/promo/PromoForms.xml"/>
+ </screenlet>
<platform-specific>
<html><html-template
location="component://product/webapp/catalog/promo/EditProductPromoCode.ftl"/></html>
</platform-specific>
