Author: jacopoc
Date: Tue Oct 9 08:23:59 2007
New Revision: 583193
URL: http://svn.apache.org/viewvc?rev=583193&view=rev
Log:
Converted product promo ftl to widgets.
Removed:
ofbiz/trunk/applications/product/webapp/catalog/promo/FindProductPromo.ftl
Modified:
ofbiz/trunk/applications/product/config/ProductUiLabels.properties
ofbiz/trunk/applications/product/webapp/catalog/promo/PromoForms.xml
ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml
Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.properties
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.properties?rev=583193&r1=583192&r2=583193&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.properties
(original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.properties Tue Oct
9 08:23:59 2007
@@ -1074,8 +1074,8 @@
ProductPromotionCode=Promotion Code
ProductPromotionPerCode=Per Code
ProductPromotionPerCustomer=Per Customer
-ProductPromotionManualImported=View Manual and Imported
-ProductPromotionManual=View Manual Only
+ProductPromotionImported=Imported Only
+ProductPromotionManual=Manual Only
ProductPromotionProducts=Promotion Products
ProductPromotionReqCode=Req. Code
ProductPromotionReqEmailOrParty=Req. Email or Party
Modified: ofbiz/trunk/applications/product/webapp/catalog/promo/PromoForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/promo/PromoForms.xml?rev=583193&r1=583192&r2=583193&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/promo/PromoForms.xml
(original)
+++ ofbiz/trunk/applications/product/webapp/catalog/promo/PromoForms.xml Tue
Oct 9 08:23:59 2007
@@ -20,9 +20,21 @@
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd";>
- <form name="EditProductPromo" type="single" target="updateProductPromo"
title="" default-map-name="productPromo"
- default-title-style="tableheadtext" default-widget-style="inputBox"
default-tooltip-style="tabletext">
-
+ <form name="ListProductPromos" type="list" title=""
list-name="productPromos">
+ <field name="productPromoId" widget-style="buttontext">
+ <hyperlink
target="EditProductPromo?productPromoId=${productPromoId}"
+ description="${productPromoId}" also-hidden="false"/>
+ </field>
+ <field name="promoName"><display/></field>
+ <field name="promoText"><display/></field>
+ <field name="requireCode"><display/></field>
+ <field name="createdDate"><display/></field>
+ </form>
+ <form name="GoToProductPromoCode" type="single"
target="EditProductPromoCode" title="">
+ <field name="productPromoCodeId"><text/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonEdit}"><submit
button-type="button"/></field>
+ </form>
+ <form name="EditProductPromo" type="single" target="updateProductPromo"
title="" default-map-name="productPromo">
<alt-target use-when="productPromo==null" target="createProductPromo"/>
<auto-fields-service service-name="updateProductPromo" map-name=""/>
Modified: ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml?rev=583193&r1=583192&r2=583193&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml Tue Oct 9
08:23:59 2007
@@ -70,18 +70,29 @@
<set field="headerItem" value="promos"/>
<set field="tabButtonItem" value="ProductPromo"/>
- <set field="manualOnly" from-field="parameters.manualOnly"
default-value="Y"/>
+ <set field="userEntered" from-field="parameters.userEntered"/>
<entity-condition entity-name="ProductPromo"
list-name="productPromos">
- <condition-expr field-name="userEntered"
env-name="manualOnly"/>
+ <condition-expr field-name="userEntered"
env-name="userEntered" ignore-if-empty="true"/>
<order-by field-name="-createdDate"/>
</entity-condition>
</actions>
<widgets>
<decorator-screen name="CommonPromoDecorator">
<decorator-section name="body">
- <platform-specific>
- <html><html-template
location="component://product/webapp/catalog/promo/FindProductPromo.ftl"/></html>
- </platform-specific>
+ <container>
+ <label
style="head1">${uiLabelMap.ProductProductPromotionsList}</label>
+ </container>
+ <container>
+ <link target="EditProductPromo"
text="${uiLabelMap.ProductNewProductPromo}" style="buttontext"/>
+ </container>
+ <container>
+ <label
style="head3">${uiLabelMap.CommonView}</label>
+ <link target="FindProductPromo"
text="${uiLabelMap.CommonAll}" style="buttontext"/>
+ <link target="FindProductPromo?userEntered=Y"
text="${uiLabelMap.ProductPromotionManual}" style="buttontext"/>
+ <link target="FindProductPromo?userEntered=N"
text="${uiLabelMap.ProductPromotionImported}" style="buttontext"/>
+ </container>
+ <include-form name="GoToProductPromoCode"
location="component://product/webapp/catalog/promo/PromoForms.xml"/>
+ <include-form name="ListProductPromos"
location="component://product/webapp/catalog/promo/PromoForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
