You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mr...@apache.org on 2007/12/29 00:13:53 UTC

svn commit: r607355 [1/2] - in /ofbiz/trunk/applications/product: config/ webapp/catalog/promo/ widget/catalog/

Author: mrisaliti
Date: Fri Dec 28 15:13:52 2007
New Revision: 607355

URL: http://svn.apache.org/viewvc?rev=607355&view=rev
Log:
Product Promo forms (ftl/widgets screen) has now the same look and feel (Part of issue OFBIZ-1544)

Modified:
    ofbiz/trunk/applications/product/config/ProductUiLabels.properties
    ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties
    ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoCode.ftl
    ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl
    ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl
    ofbiz/trunk/applications/product/webapp/catalog/promo/FindProductPromoCode.ftl
    ofbiz/trunk/applications/product/webapp/catalog/promo/PromoForms.xml
    ofbiz/trunk/applications/product/webapp/catalog/promo/PromoTabBar.ftl
    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=607355&r1=607354&r2=607355&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.properties (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.properties Fri Dec 28 15:13:52 2007
@@ -947,7 +947,7 @@
 ProductNoteOnPartyId=NOTE on Party ID
 ProductNoteOrderStatus=NOTE: Order Status is
 ProductNoteOrderType=NOTE: Order Type is
-ProductNoteRequireEmailParty=NOTE: The Require Email Or Party flag is set to N (No), so any email addresses or parties listed here will be ignored. To require an email address or party from these lists, set the flag to Y (Yes).
+ProductNoteRequireEmailParty=<p>NOTE: The Require Email Or Party flag is set to N (No), so any email addresses or parties listed here will be ignored.</p><p>To require an email address or party from these lists, set the flag to Y (Yes).</p>
 ProductNotifySale=Sale Price
 ProductNtWt=Nt. Wt.
 ProductNumberQuantity=Number / Quantity
@@ -1743,10 +1743,13 @@
 FormFieldTitle_shipmentPackageSeqId=Shipment Package Seq Id
 FormFieldTitle_shipmentRouteSegmentId=Shipment Route Segment Id
 FormFieldTitle_promoName=Promo Name
+FormFieldTitle_promoText=Promo Text
+FormFieldTitle_requireCode=Require Code
 FormFieldTitle_useLimitPerOrder=Use Limit Per Order
 FormFieldTitle_useLimitPerCustomer=Use Limit Per Customer
 FormFieldTitle_useLimitPerPromotion=Use Limit Per Promotion
 FormFieldTitle_billbackFactor=Billback Factor
+FormFieldTitle_overrideOrgPartyId=Override Org Party Id
 FormFieldTitle_ccAddress=Cc Address
 FormFieldTitle_bccAddress=Bcc Address
 FormFieldTitle_contentType=Content Type

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties?rev=607355&r1=607354&r2=607355&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties Fri Dec 28 15:13:52 2007
@@ -926,7 +926,7 @@
 ProductNoteOnPartyId=NOTA su Codice Soggetto
 ProductNoteOrderStatus=NOTA: Stato Ordine \u00e8
 ProductNoteOrderType=NOTA: Tipo Ordine \u00e8
-ProductNoteRequireEmailParty=NOTA: L'Email richiesta O se il flag Soggetto \u00e8 impostato a N (No), cos\u00ec qualsiasi indirizzo email o Soggetti listati qui saranno ignorati. Per richiedere un'indirizzo email o il Soggetto da queste liste, imposta il flag a Y (Si).
+ProductNoteRequireEmailParty=<p>NOTA: L'Email richiesta O se il flag Soggetto \u00e8 impostato a N (No), cos\u00ec qualsiasi indirizzo email o Soggetti listati qui saranno ignorati.</p><p>Per richiedere un'indirizzo email o il Soggetto da queste liste, imposta il flag a Y (Si).</p>
 ProductNotifySale=Prezzo di Vendita
 ProductNtWt=Peso Netto
 ProductNumberQuantity=Numero / Quantit\u00e0
@@ -1076,6 +1076,7 @@
 ProductProductType=Tipo Prodotto
 ProductProductWidth=Larghezza Prodotto
 ProductProducts=Prodotti
+ProductPromoCodeBlank=Lasciare vuoto per generazione automatica di un codice promozione univoco
 ProductPromoCodeEmails=Codice Promozione Emails
 ProductPromoCodeParties=Codice Promozione Soggetto
 ProductPromoNameId=Nome Promozione [Codice]
@@ -1088,11 +1089,13 @@
 ProductPromotionCode=Codice Promozione
 ProductPromotionPerCode=Per Codice
 ProductPromotionPerCustomer=Per Cliente
+ProductPromotionImported=Solo Importate
 ProductPromotionManualImported=Mostra Manuali e Importate
 ProductPromotionManual=Mostra Solo Manuali
 ProductPromotionProducts=Promozione Prodotti
 ProductPromotionReqCode=Codice Richiesto
 ProductPromotionReqEmailOrParty=Rich. Email o Soggetto
+ProductPromotionUploadSetOfPromotionCodes=Carica Insieme di Codici Promozioni
 ProductPromotionUseLimits=Usa Limiti
 ProductPromotions=Promozioni
 ProductPurchases=Acquisti
@@ -1707,10 +1710,13 @@
 FormFieldTitle_shipmentPackageSeqId=Numero Sequenza Pacco Spedizione
 FormFieldTitle_shipmentRouteSegmentId=Codice Segmento Percorso Spedizione
 FormFieldTitle_promoName=Nome Promozione
+FormFieldTitle_promoText=Testo Promozione
+FormFieldTitle_requireCode=Codice Richiesto
 FormFieldTitle_useLimitPerOrder=Usa Limite Per Ordine
 FormFieldTitle_useLimitPerCustomer=Usa Limite Per Cliente
 FormFieldTitle_useLimitPerPromotion=Usa Limite Per Promozione
 FormFieldTitle_billbackFactor=Fattore Di Billback
+FormFieldTitle_overrideOrgPartyId=Sostituisce Organizzazione
 FormFieldTitle_ccAddress=Indirizzo Cc
 FormFieldTitle_bccAddress=Indirizzo Cn
 FormFieldTitle_contentType=Tipo Contenuto

Modified: ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoCode.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoCode.ftl?rev=607355&r1=607354&r2=607355&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoCode.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoCode.ftl Fri Dec 28 15:13:52 2007
@@ -16,41 +16,50 @@
 specific language governing permissions and limitations
 under the License.
 -->
-
-<br/>
 <#if productPromoCode?exists>
-    <#if productPromoCode.requireEmailOrParty?if_exists == "N">
-        <div class="tableheadtext">${uiLabelMap.ProductNoteRequireEmailParty}</div>
-    </#if>
-    <h3>${uiLabelMap.ProductPromoCodeEmails}</h3>
-    <#list productPromoCodeEmails as productPromoCodeEmail>
-        <div class="tabletext"><a href="<@o...@ofbizUrl>" class="buttontext">[X]</a>&nbsp;${productPromoCodeEmail.emailAddress}</div>
-    </#list>
-    <div class="tabletext">
-        <form method="post" action="<@o...@ofbizUrl>" style="margin: 0;">
-            <input type="hidden" name="productPromoCodeId" value="${productPromoCodeId?if_exists}"/>
-            <input type="hidden" name="productPromoId" value="${productPromoId}"/>
-            ${uiLabelMap.ProductAddEmail} : <input type="text" size="40" name="emailAddress" class="inputBox">
-            <input type="submit" value="${uiLabelMap.CommonAdd}">
-        </form>
-        <form method="post" action="<@o...@ofbizUrl>" enctype="multipart/form-data" style="margin: 0;">
-            <input type="hidden" name="productPromoCodeId" value="${productPromoCodeId?if_exists}"/>
-            <input type="hidden" name="productPromoId" value="${productPromoId}"/>            
-            <input type="file" size="40" name="uploadedFile" class="inputBox">
-            <input type="submit" value="${uiLabelMap.CommonUpload}">
-        </form>
+    <div class="screenlet">
+        <div class="screenlet-title-bar">
+            <h3>${uiLabelMap.ProductPromoCodeEmails}</h3>
+        </div>
+        <div class="screenlet-body">
+            <#list productPromoCodeEmails as productPromoCodeEmail>
+                <div><a href="<@o...@ofbizUrl>" class="buttontext">X</a>&nbsp;${productPromoCodeEmail.emailAddress}</div>
+            </#list>
+            <div>
+                <form method="post" action="<@o...@ofbizUrl>" style="margin: 0;">
+                    <input type="hidden" name="productPromoCodeId" value="${productPromoCodeId?if_exists}"/>
+                    <input type="hidden" name="productPromoId" value="${productPromoId}"/>
+                    <span class="label">${uiLabelMap.ProductAddEmail}:</span><input type="text" size="40" name="emailAddress">
+                    <input type="submit" value="${uiLabelMap.CommonAdd}">
+                </form>
+                <#if productPromoCode.requireEmailOrParty?if_exists == "N">
+                    <div class="tooltip">${uiLabelMap.ProductNoteRequireEmailParty}</div>
+                </#if>
+                <form method="post" action="<@o...@ofbizUrl>" enctype="multipart/form-data" style="margin: 0;">
+                    <input type="hidden" name="productPromoCodeId" value="${productPromoCodeId?if_exists}"/>
+                    <input type="hidden" name="productPromoId" value="${productPromoId}"/>            
+                    <input type="file" size="40" name="uploadedFile" class="inputBox">
+                    <input type="submit" value="${uiLabelMap.CommonUpload}">
+                </form>
+            </div>
+        </div>
     </div>
-
-    <h3>${uiLabelMap.ProductPromoCodeParties}</h3>
-    <#list productPromoCodeParties as productPromoCodeParty>
-        <div class="tabletext"><a href="<@o...@ofbizUrl>" class="buttontext">[X]</a>&nbsp;${productPromoCodeParty.partyId}</div>
-    </#list>
-    <div class="tabletext">
-        <form method="post" action="<@o...@ofbizUrl>" style="margin: 0;">
-            <input type="hidden" name="productPromoCodeId" value="${productPromoCodeId?if_exists}"/>
-            <input type="hidden" name="productPromoId" value="${productPromoId}"/>
-            ${uiLabelMap.ProductAddPartyId} : <input type="text" size="10" name="partyId" class="inputBox">
-            <input type="submit" value="${uiLabelMap.CommonAdd}">
-        </form>
+    <div class="screenlet">
+        <div class="screenlet-title-bar">
+            <h3>${uiLabelMap.ProductPromoCodeParties}</h3>
+        </div>
+        <div class="screenlet-body">
+            <#list productPromoCodeParties as productPromoCodeParty>
+                <div><a href="<@o...@ofbizUrl>" class="buttontext">X</a>&nbsp;${productPromoCodeParty.partyId}</div>
+            </#list>
+            <div>
+                <form method="post" action="<@o...@ofbizUrl>">
+                    <input type="hidden" name="productPromoCodeId" value="${productPromoCodeId?if_exists}"/>
+                    <input type="hidden" name="productPromoId" value="${productPromoId}"/>
+                    <span class="label">${uiLabelMap.ProductAddPartyId}:</span><input type="text" size="10" name="partyId">
+                    <input type="submit" value="${uiLabelMap.CommonAdd}">
+                </form>
+            </div>
+        </div>
     </div>
 </#if>

Modified: ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl?rev=607355&r1=607354&r2=607355&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl Fri Dec 28 15:13:52 2007
@@ -16,406 +16,403 @@
 specific language governing permissions and limitations
 under the License.
 -->
-    <#if productPromoId?exists && productPromo?exists>
-
+<#if productPromoId?exists && productPromo?exists>
+    <div class="screenlet">
+        <div class="screenlet-title-bar">
+            <h3>${uiLabelMap.ProductPromoCodeEmails}</h3>
+        </div>
         <#-- ======================= Rules ======================== -->
-
-        <table border="1" cellpadding="2" cellspacing="0">
-        <tr>
-            <td width="10%"><div class="tabletext"><b>${uiLabelMap.ProductRuleId}</b></div></td>
-            <td width="80%"><div class="tabletext"><b>${uiLabelMap.ProductRuleName}</b></div></td>
-            <td width="10%"><div class="tabletext"><b>&nbsp;</b></div></td>
-        </tr>
-        <#list productPromoRules as productPromoRule>
-        <#assign productPromoConds = productPromoRule.getRelated("ProductPromoCond")>
-        <#assign productPromoActions = productPromoRule.getRelated("ProductPromoAction")>
-        <tr valign="middle">
-            <td><div class="tabletext"><b>${(productPromoRule.productPromoRuleId)?if_exists}</b></div></td>
-            <td align="left">
-                <form method="post" action="<@o...@ofbizUrl>">
-                    <input type="hidden" name="productPromoId" value="${(productPromoRule.productPromoId)?if_exists}">
-                    <input type="hidden" name="productPromoRuleId" value="${(productPromoRule.productPromoRuleId)?if_exists}">
-                    <input type="text" size="30" name="ruleName" value="${(productPromoRule.ruleName)?if_exists}" class="inputBox">
-                    <input type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;">
-                </form>
-            </td>
-            <td align="center">&nbsp;
-            <#if (productPromoConds.size() == 0 && productPromoActions.size() == 0)>
-                <a href="<@o...@ofbizUrl>" class="buttontext">
-                [${uiLabelMap.CommonDelete}]</a>
-            </#if>
-            </td>
-        </tr>
-        <tr valign="top">
-            <td align="right"><div class="tabletext">${uiLabelMap.ProductConditions}:</div></td>
-            <td align="left" colspan="2">
-                <table border="1" cellpadding="2" cellspacing="0">
-                <#assign maxCondSeqId = 1>
-                <#list productPromoConds as productPromoCond>
-                    <tr>
-                        <!-- if cur seq id is a number and is greater than max, set new max for input box prefill below -->
-                        <#if (productPromoCond.productPromoCondSeqId)?exists>
-                            <#assign curCondSeqId = Static["java.lang.Integer"].valueOf(productPromoCond.getString("productPromoCondSeqId"))>
-                            <#if (curCondSeqId >= maxCondSeqId)>
-                                <#assign maxCondSeqId = curCondSeqId + 1>
-                            </#if>
-                        </#if>
-                        <td><div class="tabletext"><b>${(productPromoCond.productPromoCondSeqId)?if_exists}</b></div></td>
-                        <td align="left">
-                            <form method="post" action="<@o...@ofbizUrl>">
-                                <input type="hidden" name="productPromoId" value="${(productPromoCond.productPromoId)?if_exists}"/>
-                                <input type="hidden" name="productPromoRuleId" value="${(productPromoCond.productPromoRuleId)?if_exists}"/>
-                                <input type="hidden" name="productPromoCondSeqId" value="${(productPromoCond.productPromoCondSeqId)?if_exists}"/>
-                                <select name="inputParamEnumId" size="1" class="selectBox">
-                                    <#if (productPromoCond.inputParamEnumId)?exists>
-                                        <#assign inputParamEnum = productPromoCond.getRelatedOneCache("InputParamEnumeration")>
-                                        <option value="${productPromoCond.inputParamEnumId}"><#if inputParamEnum?exists>${(inputParamEnum.get("description",locale))?if_exists}<#else>[${(productPromoCond.inputParamEnumId)?if_exists}]</#if></option>
-                                        <option value="${(productPromoCond.inputParamEnumId)?if_exists}">&nbsp;</option>
-                                    <#else>
-                                        <option value="">&nbsp;</option>
-                                    </#if>
-                                    <#list inputParamEnums as inputParamEnum>
-                                        <option value="${(inputParamEnum.enumId)?if_exists}">${(inputParamEnum.get("description",locale))?if_exists}</option>
-                                    </#list>
-                                </select>
-                                <select name="operatorEnumId" size="1" class="selectBox">
-                                    <#if (productPromoCond.operatorEnumId)?exists>
-                                        <#assign operatorEnum = productPromoCond.getRelatedOneCache("OperatorEnumeration")>
-                                        <option value="${(productPromoCond.operatorEnumId)?if_exists}"><#if operatorEnum?exists>${(operatorEnum.get("description",locale))?if_exists}<#else>[${(productPromoCond.operatorEnumId)?if_exists}]</#if></option>
-                                        <option value="${(productPromoCond.operatorEnumId)?if_exists}">&nbsp;</option>
-                                    <#else>
-                                        <option value="">&nbsp;</option>
-                                    </#if>
-                                    <#list condOperEnums as condOperEnum>
-                                    <option value="${(condOperEnum.enumId)?if_exists}">${(condOperEnum.get("description",locale))?if_exists}</option>
-                                    </#list>
-                                </select>
-                                <input type="text" size="25" name="condValue" value="${(productPromoCond.condValue)?if_exists}" class="inputBox">
-                                ${uiLabelMap.CommonOther}:<input type="text" size="10" name="otherValue" value="${(productPromoCond.otherValue)?if_exists}" class="inputBox">
-                                <input type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;">
-                            </form>
-                            <#-- ======================= Categories ======================== -->
-                            <div class="tableheadtext">${uiLabelMap.ProductConditions} ${uiLabelMap.ProductCategories}:</div>
-                            <#assign condProductPromoCategories = productPromoCond.getRelated("ProductPromoCategory")>
-                            <#list condProductPromoCategories as condProductPromoCategory>
-                                <#assign condProductCategory = condProductPromoCategory.getRelatedOneCache("ProductCategory")>
-                                <#assign condApplEnumeration = condProductPromoCategory.getRelatedOneCache("ApplEnumeration")>
-                                <div class="tabletext">
-                                    ${(condProductCategory.get("description",locale))?if_exists} [${condProductPromoCategory.productCategoryId}]
-                                    - ${(condApplEnumeration.get("description",locale))?default(condProductPromoCategory.productPromoApplEnumId)}
-                                    - ${uiLabelMap.ProductSubCats}? ${condProductPromoCategory.includeSubCategories?default("N")}
-                                    - ${uiLabelMap.CommonAnd} ${uiLabelMap.CommonGroup}: ${condProductPromoCategory.andGroupId}
-                                    <a href="<@o...@ofbizUrl>" class="buttontext">
-                                    [${uiLabelMap.CommonDelete}]</a>
-                                </div>
-                            </#list>
-                            <div class="tabletext">
-                                <form method="post" action="<@o...@ofbizUrl>" name="createProductPromoCategoryConditions">
-                                    <input type="hidden" name="productPromoId" value="${productPromoId}">
-                                    <input type="hidden" name="productPromoRuleId" value="${productPromoCond.productPromoRuleId}">
-                                    <input type="hidden" name="productPromoActionSeqId" value="_NA_">
-                                    <input type="hidden" name="productPromoCondSeqId" value="${productPromoCond.productPromoCondSeqId}">
-                                    <input type="text" class="inputBox" name="productCategoryId" size="20" maxlength="20"/>
-                                    <a href="javascript:call_fieldlookup2(document.createProductPromoCategoryConditions.productCategoryId,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a>
-                                    <select name="productPromoApplEnumId" class="selectBox">
-                                        <#list productPromoApplEnums as productPromoApplEnum>
-                                            <option value="${productPromoApplEnum.enumId}">${productPromoApplEnum.get("description",locale)}</option>
-                                        </#list>
-                                    </select>
-                                    <select name="includeSubCategories" class="selectBox">
-                                        <option value="N">${uiLabelMap.CommonN}</option>
-                                        <option value="Y">${uiLabelMap.CommonY}</option>
-                                    </select>
-                                    ${uiLabelMap.CommonAnd} ${uiLabelMap.CommonGroup}: <input type="text" size="10" maxlength="20" name="andGroupId" value="_NA_" class="inputBox"/>*
-                                    <input type="submit" value="${uiLabelMap.CommonAdd}" style="font-size: x-small;">
-                                </form>
-                            </div>
-                            <#-- ======================= Products ======================== -->
-                            <div class="tableheadtext">${uiLabelMap.ProductConditions} ${uiLabelMap.ProductProducts}:</div>
-                            <#assign condProductPromoProducts = productPromoCond.getRelated("ProductPromoProduct")>
-                            <#list condProductPromoProducts as condProductPromoProduct>
-                                <#assign condProduct = condProductPromoProduct.getRelatedOneCache("Product")?if_exists>
-                                <#assign condApplEnumeration = condProductPromoProduct.getRelatedOneCache("ApplEnumeration")>
-                                <div class="tabletext">
-                                    ${(condProduct.internalName)?if_exists} [${condProductPromoProduct.productId}]
-                                    - ${(condApplEnumeration.get("description",locale))?default(condProductPromoProduct.productPromoApplEnumId)}
-                                    <a href="<@o...@ofbizUrl>" class="buttontext">
-                                    [${uiLabelMap.CommonDelete}]</a>
-                                </div>
-                            </#list>
-                            <div class="tabletext">
-                                <form method="post" action="<@o...@ofbizUrl>">
-                                    <input type="hidden" name="productPromoId" value="${productPromoId}">
-                                    <input type="hidden" name="productPromoRuleId" value="${productPromoCond.productPromoRuleId}">
-                                    <input type="hidden" name="productPromoActionSeqId" value="_NA_">
-                                    <input type="hidden" name="productPromoCondSeqId" value="${productPromoCond.productPromoCondSeqId}">
-                                    ${uiLabelMap.ProductProductId}: <input type="text" size="20" maxlength="20" name="productId" value="" class="inputBox"/>
-                                    <select name="productPromoApplEnumId" class="selectBox">
-                                        <#list productPromoApplEnums as productPromoApplEnum>
-                                            <option value="${productPromoApplEnum.enumId}">${productPromoApplEnum.get("description",locale)}</option>
-                                        </#list>
-                                    </select>
-                                    <input type="submit" value="${uiLabelMap.CommonAdd}" style="font-size: x-small;">
-                                </form>
-                            </div>
-                        </td>
-                        <td align="center">
-                        <a href="<@o...@ofbizUrl>" class="buttontext">
-                        [${uiLabelMap.CommonDelete}]</a>
-                        </td>
-                    </tr>
-                </#list>
-                <tr>
-                    <td align="left" colspan="3">
-                        <form method="post" action="<@o...@ofbizUrl>">
+        <div class="screenlet-body">
+            <table cellspacing="0" class="basic-table">
+                <tr class="header-row">
+                    <td width="10%"><b>${uiLabelMap.ProductRuleId}</b></td>
+                    <td width="80%"><b>${uiLabelMap.ProductRuleName}</b></td>
+                    <td width="10%"><b>&nbsp;</b></td>
+                </tr>
+                <#assign rowClass = "2">     
+                <#list productPromoRules as productPromoRule>
+                <#assign productPromoConds = productPromoRule.getRelated("ProductPromoCond")>
+                <#assign productPromoActions = productPromoRule.getRelated("ProductPromoAction")>
+                <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+                    <td class="label"><b>${(productPromoRule.productPromoRuleId)?if_exists}</b></td>
+                    <td align="left">
+                        <form method="post" action="<@o...@ofbizUrl>">
                             <input type="hidden" name="productPromoId" value="${(productPromoRule.productPromoId)?if_exists}">
                             <input type="hidden" name="productPromoRuleId" value="${(productPromoRule.productPromoRuleId)?if_exists}">
-                            <span class="tabletext"><b>${uiLabelMap.CommonNew} :</b>&nbsp;</span>
-                            <#-- <input type="text" size="5" name="productPromoCondSeqId" value="${maxCondSeqId?if_exists}" class="inputBox"> -->
-                            <select name="inputParamEnumId" size="1" class="selectBox">
-                                <#list inputParamEnums as inputParamEnum>
-                                    <option value="${(inputParamEnum.enumId)?if_exists}">${(inputParamEnum.get("description",locale))?if_exists}</option>
-                                </#list>
-                            </select>
-                            <select name="operatorEnumId" size="1" class="selectBox">
-                                <#list condOperEnums as condOperEnum>
-                                <option value="${(condOperEnum.enumId)?if_exists}">${(condOperEnum.get("description",locale))?if_exists}</option>
-                                </#list>
-                            </select>
-                            <input type="text" size="25" name="condValue" class="inputBox">
-                            ${uiLabelMap.CommonOther}:<input type="text" size="10" name="otherValue" class="inputBox">
-                            <input type="submit" value="${uiLabelMap.CommonCreate}" style="font-size: x-small;">
+                            <input type="text" size="30" name="ruleName" value="${(productPromoRule.ruleName)?if_exists}">
+                            <input type="submit" value="${uiLabelMap.CommonUpdate}">
                         </form>
                     </td>
+                    <td align="center">&nbsp;
+                        <#if (productPromoConds.size() == 0 && productPromoActions.size() == 0)>
+                            <a href="<@o...@ofbizUrl>" class="buttontext">
+                            ${uiLabelMap.CommonDelete}</a>
+                        </#if>
+                    </td>
                 </tr>
-                </table>
-            </td>
-        </tr>
-        <tr valign="top">
-            <td align="right"><div class="tabletext">${uiLabelMap.ProductActions} :</div></td>
-            <td align="left" colspan="2">
-                <table border="1" cellpadding="2" cellspacing="0">
-                <#list productPromoActions as productPromoAction>
-                    <tr>
-                        <td><div class="tabletext"><b>${(productPromoAction.productPromoActionSeqId)?if_exists}</b></div></td>
-                        <td align="left">
-                            <div class="tabletext">
-                            <form method="post" action="<@o...@ofbizUrl>">
-                                <input type="hidden" name="productPromoId" value="${(productPromoAction.productPromoId)?if_exists}">
-                                <input type="hidden" name="productPromoRuleId" value="${(productPromoAction.productPromoRuleId)?if_exists}">
-                                <input type="hidden" name="productPromoActionSeqId" value="${(productPromoAction.productPromoActionSeqId)?if_exists}">
-                                <select name="productPromoActionEnumId" size="1" class="selectBox">
-                                    <#if (productPromoAction.productPromoActionEnumId)?exists>
-                                        <#assign productPromoActionCurEnum = productPromoAction.getRelatedOneCache("ActionEnumeration")>
-                                        <option value="${(productPromoAction.productPromoActionEnumId)?if_exists}"><#if productPromoActionCurEnum?exists>${(productPromoActionCurEnum.get("description",locale))?if_exists}<#else>[${(productPromoAction.productPromoActionEnumId)?if_exists}]</#if></option>
-                                        <option value="${(productPromoAction.productPromoActionEnumId)?if_exists}">&nbsp;</option>
-                                    <#else>
-                                        <option value="">&nbsp;</option>
+                <tr valign="top">
+                    <td align="right" class="label">${uiLabelMap.ProductConditions}</td>
+                    <td align="left" colspan="2">
+                        <table cellspacing="0" class="basic-table">
+                        <#assign maxCondSeqId = 1>
+                        <#list productPromoConds as productPromoCond>
+                            <tr>
+                                <!-- if cur seq id is a number and is greater than max, set new max for input box prefill below -->
+                                <#if (productPromoCond.productPromoCondSeqId)?exists>
+                                    <#assign curCondSeqId = Static["java.lang.Integer"].valueOf(productPromoCond.getString("productPromoCondSeqId"))>
+                                    <#if (curCondSeqId >= maxCondSeqId)>
+                                        <#assign maxCondSeqId = curCondSeqId + 1>
                                     </#if>
-                                    <#list productPromoActionEnums as productPromoActionEnum>
-                                        <option value="${(productPromoActionEnum.enumId)?if_exists}">${(productPromoActionEnum.get("description",locale))?if_exists}</option>
+                                </#if>
+                                <td class="label"><b>${(productPromoCond.productPromoCondSeqId)?if_exists}</b></td>
+                                <td align="left">
+                                    <form method="post" action="<@o...@ofbizUrl>">
+                                        <input type="hidden" name="productPromoId" value="${(productPromoCond.productPromoId)?if_exists}"/>
+                                        <input type="hidden" name="productPromoRuleId" value="${(productPromoCond.productPromoRuleId)?if_exists}"/>
+                                        <input type="hidden" name="productPromoCondSeqId" value="${(productPromoCond.productPromoCondSeqId)?if_exists}"/>
+                                        <select name="inputParamEnumId" size="1">
+                                            <#if (productPromoCond.inputParamEnumId)?exists>
+                                                <#assign inputParamEnum = productPromoCond.getRelatedOneCache("InputParamEnumeration")>
+                                                <option value="${productPromoCond.inputParamEnumId}"><#if inputParamEnum?exists>${(inputParamEnum.get("description",locale))?if_exists}<#else>[${(productPromoCond.inputParamEnumId)?if_exists}]</#if></option>
+                                                <option value="${(productPromoCond.inputParamEnumId)?if_exists}">&nbsp;</option>
+                                            <#else>
+                                                <option value="">&nbsp;</option>
+                                            </#if>
+                                            <#list inputParamEnums as inputParamEnum>
+                                                <option value="${(inputParamEnum.enumId)?if_exists}">${(inputParamEnum.get("description",locale))?if_exists}</option>
+                                            </#list>
+                                        </select>
+                                        <select name="operatorEnumId" size="1">
+                                            <#if (productPromoCond.operatorEnumId)?exists>
+                                                <#assign operatorEnum = productPromoCond.getRelatedOneCache("OperatorEnumeration")>
+                                                <option value="${(productPromoCond.operatorEnumId)?if_exists}"><#if operatorEnum?exists>${(operatorEnum.get("description",locale))?if_exists}<#else>[${(productPromoCond.operatorEnumId)?if_exists}]</#if></option>
+                                                <option value="${(productPromoCond.operatorEnumId)?if_exists}">&nbsp;</option>
+                                            <#else>
+                                                <option value="">&nbsp;</option>
+                                            </#if>
+                                            <#list condOperEnums as condOperEnum>
+                                            <option value="${(condOperEnum.enumId)?if_exists}">${(condOperEnum.get("description",locale))?if_exists}</option>
+                                            </#list>
+                                        </select>
+                                        <input type="text" size="25" name="condValue" value="${(productPromoCond.condValue)?if_exists}">
+                                        ${uiLabelMap.CommonOther}:<input type="text" size="10" name="otherValue" value="${(productPromoCond.otherValue)?if_exists}">
+                                        <input type="submit" value="${uiLabelMap.CommonUpdate}">
+                                    </form>
+                                    <#-- ======================= Categories ======================== -->
+                                    <div class="label">${uiLabelMap.ProductConditions} ${uiLabelMap.ProductCategories}:</div>
+                                    <#assign condProductPromoCategories = productPromoCond.getRelated("ProductPromoCategory")>
+                                    <#list condProductPromoCategories as condProductPromoCategory>
+                                        <#assign condProductCategory = condProductPromoCategory.getRelatedOneCache("ProductCategory")>
+                                        <#assign condApplEnumeration = condProductPromoCategory.getRelatedOneCache("ApplEnumeration")>
+                                        <div>
+                                            ${(condProductCategory.get("description",locale))?if_exists} [${condProductPromoCategory.productCategoryId}]
+                                            - ${(condApplEnumeration.get("description",locale))?default(condProductPromoCategory.productPromoApplEnumId)}
+                                            - ${uiLabelMap.ProductSubCats}? ${condProductPromoCategory.includeSubCategories?default("N")}
+                                            - ${uiLabelMap.CommonAnd} ${uiLabelMap.CommonGroup}: ${condProductPromoCategory.andGroupId}
+                                            <a href="<@o...@ofbizUrl>" class="buttontext">
+                                            ${uiLabelMap.CommonDelete}</a>
+                                        </div>
                                     </#list>
-                                </select>
-                                <input type="hidden" name="orderAdjustmentTypeId" value="${(productPromoAction.orderAdjustmentTypeId)?if_exists}">
-                                <#-- <select name="orderAdjustmentTypeId" size="1" class="selectBox">
-                                    <#if (productPromoAction.orderAdjustmentTypeId)?exists>
-                                        <#assign orderAdjustmentType = productPromoAction.getRelatedOneCache("OrderAdjustmentType")>
-                                        <option value="${(productPromoAction.orderAdjustmentTypeId)?if_exists}"><#if orderAdjustmentType?exists>${(orderAdjustmentType.get("description",locale))?if_exists}<#else>[${(productPromoAction.orderAdjustmentTypeId)?if_exists}]</#if></option>
-                                        <option value="${(productPromoAction.orderAdjustmentTypeId)?if_exists}">&nbsp;</option>
-                                    <#else>
-                                        <option value="">&nbsp;</option>
-                                    </#if>
-                                    <#list orderAdjustmentTypes as orderAdjustmentType>
-                                    <option value="${(orderAdjustmentType.orderAdjustmentTypeId)?if_exists}">${(orderAdjustmentType.get("description",locale))?if_exists}</option>
+                                    <div>
+                                        <form method="post" action="<@o...@ofbizUrl>" name="createProductPromoCategoryConditions">
+                                            <input type="hidden" name="productPromoId" value="${productPromoId}">
+                                            <input type="hidden" name="productPromoRuleId" value="${productPromoCond.productPromoRuleId}">
+                                            <input type="hidden" name="productPromoActionSeqId" value="_NA_">
+                                            <input type="hidden" name="productPromoCondSeqId" value="${productPromoCond.productPromoCondSeqId}">
+                                            <input type="text" name="productCategoryId" size="20" maxlength="20"/>
+                                            <a href="javascript:call_fieldlookup2(document.createProductPromoCategoryConditions.productCategoryId,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a>
+                                            <select name="productPromoApplEnumId">
+                                                <#list productPromoApplEnums as productPromoApplEnum>
+                                                    <option value="${productPromoApplEnum.enumId}">${productPromoApplEnum.get("description",locale)}</option>
+                                                </#list>
+                                            </select>
+                                            <select name="includeSubCategories">
+                                                <option value="N">${uiLabelMap.CommonN}</option>
+                                                <option value="Y">${uiLabelMap.CommonY}</option>
+                                            </select>
+                                            ${uiLabelMap.CommonAnd} ${uiLabelMap.CommonGroup}: <input type="text" size="10" maxlength="20" name="andGroupId" value="_NA_"/>*
+                                            <input type="submit" value="${uiLabelMap.CommonAdd}">
+                                        </form>
+                                    </div>
+                                    <#-- ======================= Products ======================== -->
+                                    <div class="label">${uiLabelMap.ProductConditions} ${uiLabelMap.ProductProducts}:</div>
+                                    <#assign condProductPromoProducts = productPromoCond.getRelated("ProductPromoProduct")>
+                                    <#list condProductPromoProducts as condProductPromoProduct>
+                                        <#assign condProduct = condProductPromoProduct.getRelatedOneCache("Product")?if_exists>
+                                        <#assign condApplEnumeration = condProductPromoProduct.getRelatedOneCache("ApplEnumeration")>
+                                        <div>
+                                            ${(condProduct.internalName)?if_exists} [${condProductPromoProduct.productId}]
+                                            - ${(condApplEnumeration.get("description",locale))?default(condProductPromoProduct.productPromoApplEnumId)}
+                                            <a href="<@o...@ofbizUrl>" class="buttontext">
+                                            ${uiLabelMap.CommonDelete}</a>
+                                        </div>
                                     </#list>
-                                </select> -->
-                                ${uiLabelMap.ProductQuantity}:&nbsp;<input type="text" size="5" name="quantity" value="${(productPromoAction.quantity)?if_exists}" class="inputBox">
-                                ${uiLabelMap.ProductAmount}:&nbsp;<input type="text" size="5" name="amount" value="${(productPromoAction.amount)?if_exists}" class="inputBox">
-                                ${uiLabelMap.ProductItem}:&nbsp;<input type="text" size="15" name="productId" value="${(productPromoAction.productId)?if_exists}" class="inputBox">
-                                ${uiLabelMap.PartyParty}:&nbsp;<input type="text" size="10" name="partyId" value="${(productPromoAction.partyId)?if_exists}" class="inputBox">
-                                <input type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;">
-                            </form>
-                            </div>
-                            <#-- ======================= Categories ======================== -->
-                            <div class="tableheadtext">${uiLabelMap.ProductActions} ${uiLabelMap.ProductCategories}:</div>
-                            <#assign actionProductPromoCategories = productPromoAction.getRelated("ProductPromoCategory")>
-                            <#list actionProductPromoCategories as actionProductPromoCategory>
-                                <#assign actionProductCategory = actionProductPromoCategory.getRelatedOneCache("ProductCategory")>
-                                <#assign actionApplEnumeration = actionProductPromoCategory.getRelatedOneCache("ApplEnumeration")>
-                                <div class="tabletext">
-                                    ${(actionProductCategory.description)?if_exists} [${actionProductPromoCategory.productCategoryId}]
-                                    - ${(actionApplEnumeration.get("description",locale))?default(actionProductPromoCategory.productPromoApplEnumId)}
-                                    - ${uiLabelMap.ProductSubCats}? ${actionProductPromoCategory.includeSubCategories?default("N")}
-                                    - ${uiLabelMap.CommonAnd} ${uiLabelMap.CommonGroup}: ${actionProductPromoCategory.andGroupId}
-                                    <a href="<@o...@ofbizUrl>" class="buttontext">
-                                    [${uiLabelMap.CommonDelete}]</a>
-                                </div>
-                            </#list>
-                            <div class="tabletext">
-                                <form method="post" action="<@o...@ofbizUrl>" name="createProductPromoCategoryActions">
-                                    <input type="hidden" name="productPromoId" value="${productPromoId}">
-                                    <input type="hidden" name="productPromoRuleId" value="${productPromoAction.productPromoRuleId}">
-                                    <input type="hidden" name="productPromoActionSeqId" value="${productPromoAction.productPromoActionSeqId}">
-                                    <input type="hidden" name="productPromoCondSeqId" value="_NA_">
-                                    <input type="text" class="inputBox" name="productCategoryId" size="20" maxlength="20"/>
-                                    <a href="javascript:call_fieldlookup2(document.createProductPromoCategoryActions.productCategoryId,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a>
-                                    <select name="productPromoApplEnumId" class="selectBox">
-                                        <#list productPromoApplEnums as productPromoApplEnum>
-                                            <option value="${productPromoApplEnum.enumId}">${productPromoApplEnum.get("description",locale)}</option>
-                                        </#list>
-                                    </select>
-                                    <select name="includeSubCategories" class="selectBox">
-                                        <option value="N">${uiLabelMap.CommonN}</option>
-                                        <option value="Y">${uiLabelMap.CommonY}</option>
-                                    </select>
-                                    ${uiLabelMap.CommonAnd} ${uiLabelMap.CommonGroup}: <input type="text" size="10" maxlength="20" name="andGroupId" value="_NA_" class="inputBox"/>*
-                                    <input type="submit" value="${uiLabelMap.CommonAdd}" style="font-size: x-small;">
-                                </form>
-                            </div>
-                            <#-- ======================= Products ======================== -->
-                            <div class="tableheadtext">${uiLabelMap.ProductActions} ${uiLabelMap.ProductProducts}:</div>
-                            <#assign actionProductPromoProducts = productPromoAction.getRelated("ProductPromoProduct")>
-                            <#list actionProductPromoProducts as actionProductPromoProduct>
-                                <#assign actionProduct = actionProductPromoProduct.getRelatedOneCache("Product")?if_exists>
-                                <#assign actionApplEnumeration = actionProductPromoProduct.getRelatedOneCache("ApplEnumeration")>
-                                <div class="tabletext">
-                                    ${(actionProduct.internalName)?if_exists} [${actionProductPromoProduct.productId}]
-                                    - ${(actionApplEnumeration.get("description",locale))?default(actionProductPromoProduct.productPromoApplEnumId)}
-                                    <a href="<@o...@ofbizUrl>" class="buttontext">
-                                    [${uiLabelMap.CommonDelete}]</a>
-                                </div>
-                            </#list>
-                            <div class="tabletext">
-                                <form method="post" action="<@o...@ofbizUrl>">
-                                    <input type="hidden" name="productPromoId" value="${productPromoId}">
-                                    <input type="hidden" name="productPromoRuleId" value="${productPromoAction.productPromoRuleId}">
-                                    <input type="hidden" name="productPromoActionSeqId" value="${productPromoAction.productPromoActionSeqId}">
-                                    <input type="hidden" name="productPromoCondSeqId" value="_NA_">
-                                    ${uiLabelMap.ProductProductId}: <input type="text" size="20" maxlength="20" name="productId" value="" class="inputBox"/>
-                                    <select name="productPromoApplEnumId" class="selectBox">
-                                        <#list productPromoApplEnums as productPromoApplEnum>
-                                            <option value="${productPromoApplEnum.enumId}">${productPromoApplEnum.get("description",locale)}</option>
-                                        </#list>
-                                    </select>
-                                    <input type="submit" value="${uiLabelMap.CommonAdd}" style="font-size: x-small;">
-                                </form>
-                            </div>
-                        </td>
-                        <td align="center">
-                        <a href="<@o...@ofbizUrl>" class="buttontext">
-                        [${uiLabelMap.CommonDelete}]</a>
-                        </td>
-                    </tr>
-                </#list>
-                <tr>
-                    <td align="left" colspan="3">
-                        <div class="tabletext">
-                        <form method="post" action="<@o...@ofbizUrl>">
-                            <input type="hidden" name="productPromoId" value="${(productPromoRule.productPromoId)?if_exists}">
-                            <input type="hidden" name="productPromoRuleId" value="${(productPromoRule.productPromoRuleId)?if_exists}">
-                            <span class="tabletext"><b>${uiLabelMap.CommonNew}:</b>&nbsp;</span>
-                            <select name="productPromoActionEnumId" size="1" class="selectBox">
-                                <#list productPromoActionEnums as productPromoActionEnum>
-                                <option value="${(productPromoActionEnum.enumId)?if_exists}">${(productPromoActionEnum.get("description",locale))?if_exists}</option>
-                                </#list>
-                            </select>
-                            <input type="hidden" name="orderAdjustmentTypeId" value="PROMOTION_ADJUSTMENT">
-                            <#-- <select name="orderAdjustmentTypeId" size="1" class="selectBox">
-                                <#list orderAdjustmentTypes as orderAdjustmentType>
-                                <option value="${(orderAdjustmentType.orderAdjustmentTypeId)?if_exists}">${(orderAdjustmentType.get("description",locale))?if_exists}</option>
-                                </#list>
-                            </select> -->                                              
-                            ${uiLabelMap.ProductQuantity}:&nbsp;<input type="text" size="5" name="quantity" class="inputBox">
-                            ${uiLabelMap.ProductAmount}:&nbsp;<input type="text" size="5" name="amount" class="inputBox">
-                            ${uiLabelMap.ProductItem}:&nbsp;<input type="text" size="15" name="productId" class="inputBox">
-                            ${uiLabelMap.PartyParty}:&nbsp;<input type="text" size="10" name="partyId" class="inputBox">
-                            <input type="submit" value="${uiLabelMap.CommonCreate}" style="font-size: x-small;">
-                        </form>
-                        </div>
+                                    <div>
+                                        <form method="post" action="<@o...@ofbizUrl>">
+                                            <input type="hidden" name="productPromoId" value="${productPromoId}">
+                                            <input type="hidden" name="productPromoRuleId" value="${productPromoCond.productPromoRuleId}">
+                                            <input type="hidden" name="productPromoActionSeqId" value="_NA_">
+                                            <input type="hidden" name="productPromoCondSeqId" value="${productPromoCond.productPromoCondSeqId}">
+                                            ${uiLabelMap.ProductProductId}: <input type="text" size="20" maxlength="20" name="productId" value=""/>
+                                            <select name="productPromoApplEnumId">
+                                                <#list productPromoApplEnums as productPromoApplEnum>
+                                                    <option value="${productPromoApplEnum.enumId}">${productPromoApplEnum.get("description",locale)}</option>
+                                                </#list>
+                                            </select>
+                                            <input type="submit" value="${uiLabelMap.CommonAdd}">
+                                        </form>
+                                    </div>
+                                </td>
+                                <td align="center">
+                                    <a href="<@o...@ofbizUrl>" class="buttontext">
+                                    ${uiLabelMap.CommonDelete}</a>
+                                </td>
+                            </tr>
+                        </#list>
+                            <tr>
+                                <td align="left" colspan="3">
+                                    <form method="post" action="<@o...@ofbizUrl>">
+                                        <input type="hidden" name="productPromoId" value="${(productPromoRule.productPromoId)?if_exists}">
+                                        <input type="hidden" name="productPromoRuleId" value="${(productPromoRule.productPromoRuleId)?if_exists}">
+                                        <span class="label"><b>${uiLabelMap.CommonNew}</b>&nbsp;</span>
+                                        <select name="inputParamEnumId" size="1">
+                                            <#list inputParamEnums as inputParamEnum>
+                                                <option value="${(inputParamEnum.enumId)?if_exists}">${(inputParamEnum.get("description",locale))?if_exists}</option>
+                                            </#list>
+                                        </select>
+                                        <select name="operatorEnumId" size="1">
+                                            <#list condOperEnums as condOperEnum>
+                                            <option value="${(condOperEnum.enumId)?if_exists}">${(condOperEnum.get("description",locale))?if_exists}</option>
+                                            </#list>
+                                        </select>
+                                        <input type="text" size="25" name="condValue">
+                                        ${uiLabelMap.CommonOther}:<input type="text" size="10" name="otherValue">
+                                        <input type="submit" value="${uiLabelMap.CommonCreate}">
+                                    </form>
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+                <tr valign="top">
+                    <td align="right" class="label">${uiLabelMap.ProductActions} :</td>
+                    <td align="left" colspan="2">
+                        <table cellspacing="0" class="basic-table">
+                        <#list productPromoActions as productPromoAction>
+                            <tr>
+                                <td class="label"><b>${(productPromoAction.productPromoActionSeqId)?if_exists}</b></td>
+                                <td align="left">
+                                    <div>
+                                    <form method="post" action="<@o...@ofbizUrl>">
+                                        <input type="hidden" name="productPromoId" value="${(productPromoAction.productPromoId)?if_exists}">
+                                        <input type="hidden" name="productPromoRuleId" value="${(productPromoAction.productPromoRuleId)?if_exists}">
+                                        <input type="hidden" name="productPromoActionSeqId" value="${(productPromoAction.productPromoActionSeqId)?if_exists}">
+                                        <select name="productPromoActionEnumId" size="1">
+                                            <#if (productPromoAction.productPromoActionEnumId)?exists>
+                                                <#assign productPromoActionCurEnum = productPromoAction.getRelatedOneCache("ActionEnumeration")>
+                                                <option value="${(productPromoAction.productPromoActionEnumId)?if_exists}"><#if productPromoActionCurEnum?exists>${(productPromoActionCurEnum.get("description",locale))?if_exists}<#else>[${(productPromoAction.productPromoActionEnumId)?if_exists}]</#if></option>
+                                                <option value="${(productPromoAction.productPromoActionEnumId)?if_exists}">&nbsp;</option>
+                                            <#else>
+                                                <option value="">&nbsp;</option>
+                                            </#if>
+                                            <#list productPromoActionEnums as productPromoActionEnum>
+                                                <option value="${(productPromoActionEnum.enumId)?if_exists}">${(productPromoActionEnum.get("description",locale))?if_exists}</option>
+                                            </#list>
+                                        </select>
+                                        <input type="hidden" name="orderAdjustmentTypeId" value="${(productPromoAction.orderAdjustmentTypeId)?if_exists}">
+                                        ${uiLabelMap.ProductQuantity}:&nbsp;<input type="text" size="5" name="quantity" value="${(productPromoAction.quantity)?if_exists}">
+                                        ${uiLabelMap.ProductAmount}:&nbsp;<input type="text" size="5" name="amount" value="${(productPromoAction.amount)?if_exists}">
+                                        ${uiLabelMap.ProductItem}:&nbsp;<input type="text" size="15" name="productId" value="${(productPromoAction.productId)?if_exists}">
+                                        ${uiLabelMap.PartyParty}:&nbsp;<input type="text" size="10" name="partyId" value="${(productPromoAction.partyId)?if_exists}">
+                                        <input type="submit" value="${uiLabelMap.CommonUpdate}">
+                                    </form>
+                                    </div>
+                                    <#-- ======================= Categories ======================== -->
+                                    <div class="label">${uiLabelMap.ProductActions} ${uiLabelMap.ProductCategories}:</div>
+                                    <#assign actionProductPromoCategories = productPromoAction.getRelated("ProductPromoCategory")>
+                                    <#list actionProductPromoCategories as actionProductPromoCategory>
+                                        <#assign actionProductCategory = actionProductPromoCategory.getRelatedOneCache("ProductCategory")>
+                                        <#assign actionApplEnumeration = actionProductPromoCategory.getRelatedOneCache("ApplEnumeration")>
+                                        <div>
+                                            ${(actionProductCategory.description)?if_exists} [${actionProductPromoCategory.productCategoryId}]
+                                            - ${(actionApplEnumeration.get("description",locale))?default(actionProductPromoCategory.productPromoApplEnumId)}
+                                            - ${uiLabelMap.ProductSubCats}? ${actionProductPromoCategory.includeSubCategories?default("N")}
+                                            - ${uiLabelMap.CommonAnd} ${uiLabelMap.CommonGroup}: ${actionProductPromoCategory.andGroupId}
+                                            <a href="<@o...@ofbizUrl>" class="buttontext">
+                                            ${uiLabelMap.CommonDelete}</a>
+                                        </div>
+                                    </#list>
+                                    <div>
+                                        <form method="post" action="<@o...@ofbizUrl>" name="createProductPromoCategoryActions">
+                                            <input type="hidden" name="productPromoId" value="${productPromoId}">
+                                            <input type="hidden" name="productPromoRuleId" value="${productPromoAction.productPromoRuleId}">
+                                            <input type="hidden" name="productPromoActionSeqId" value="${productPromoAction.productPromoActionSeqId}">
+                                            <input type="hidden" name="productPromoCondSeqId" value="_NA_">
+                                            <input type="text" name="productCategoryId" size="20" maxlength="20"/>
+                                            <a href="javascript:call_fieldlookup2(document.createProductPromoCategoryActions.productCategoryId,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a>
+                                            <select name="productPromoApplEnumId">
+                                                <#list productPromoApplEnums as productPromoApplEnum>
+                                                    <option value="${productPromoApplEnum.enumId}">${productPromoApplEnum.get("description",locale)}</option>
+                                                </#list>
+                                            </select>
+                                            <select name="includeSubCategories">
+                                                <option value="N">${uiLabelMap.CommonN}</option>
+                                                <option value="Y">${uiLabelMap.CommonY}</option>
+                                            </select>
+                                            ${uiLabelMap.CommonAnd} ${uiLabelMap.CommonGroup}: <input type="text" size="10" maxlength="20" name="andGroupId" value="_NA_"/>*
+                                            <input type="submit" value="${uiLabelMap.CommonAdd}">
+                                        </form>
+                                    </div>
+                                    <#-- ======================= Products ======================== -->
+                                    <div class="label">${uiLabelMap.ProductActions} ${uiLabelMap.ProductProducts}:</div>
+                                    <#assign actionProductPromoProducts = productPromoAction.getRelated("ProductPromoProduct")>
+                                    <#list actionProductPromoProducts as actionProductPromoProduct>
+                                        <#assign actionProduct = actionProductPromoProduct.getRelatedOneCache("Product")?if_exists>
+                                        <#assign actionApplEnumeration = actionProductPromoProduct.getRelatedOneCache("ApplEnumeration")>
+                                        <div>
+                                            ${(actionProduct.internalName)?if_exists} [${actionProductPromoProduct.productId}]
+                                            - ${(actionApplEnumeration.get("description",locale))?default(actionProductPromoProduct.productPromoApplEnumId)}
+                                            <a href="<@o...@ofbizUrl>" class="buttontext">
+                                            ${uiLabelMap.CommonDelete}</a>
+                                        </div>
+                                    </#list>
+                                    <div>
+                                        <form method="post" action="<@o...@ofbizUrl>">
+                                            <input type="hidden" name="productPromoId" value="${productPromoId}">
+                                            <input type="hidden" name="productPromoRuleId" value="${productPromoAction.productPromoRuleId}">
+                                            <input type="hidden" name="productPromoActionSeqId" value="${productPromoAction.productPromoActionSeqId}">
+                                            <input type="hidden" name="productPromoCondSeqId" value="_NA_">
+                                            ${uiLabelMap.ProductProductId}: <input type="text" size="20" maxlength="20" name="productId" value=""/>
+                                            <select name="productPromoApplEnumId">
+                                                <#list productPromoApplEnums as productPromoApplEnum>
+                                                    <option value="${productPromoApplEnum.enumId}">${productPromoApplEnum.get("description",locale)}</option>
+                                                </#list>
+                                            </select>
+                                            <input type="submit" value="${uiLabelMap.CommonAdd}">
+                                        </form>
+                                    </div>
+                                </td>
+                                <td align="center">
+                                    <a href="<@o...@ofbizUrl>" class="buttontext">
+                                    ${uiLabelMap.CommonDelete}</a>
+                                </td>
+                            </tr>
+                        </#list>
+                            <tr>
+                                <td align="left" colspan="3">
+                                    <div>
+                                    <form method="post" action="<@o...@ofbizUrl>">
+                                        <input type="hidden" name="productPromoId" value="${(productPromoRule.productPromoId)?if_exists}">
+                                        <input type="hidden" name="productPromoRuleId" value="${(productPromoRule.productPromoRuleId)?if_exists}">
+                                        <span class="label"><b>${uiLabelMap.CommonNew}:</b>&nbsp;</span>
+                                        <select name="productPromoActionEnumId" size="1">
+                                            <#list productPromoActionEnums as productPromoActionEnum>
+                                            <option value="${(productPromoActionEnum.enumId)?if_exists}">${(productPromoActionEnum.get("description",locale))?if_exists}</option>
+                                            </#list>
+                                        </select>
+                                        <input type="hidden" name="orderAdjustmentTypeId" value="PROMOTION_ADJUSTMENT">
+                                        ${uiLabelMap.ProductQuantity}:&nbsp;<input type="text" size="5" name="quantity">
+                                        ${uiLabelMap.ProductAmount}:&nbsp;<input type="text" size="5" name="amount">
+                                        ${uiLabelMap.ProductItem}:&nbsp;<input type="text" size="15" name="productId">
+                                        ${uiLabelMap.PartyParty}:&nbsp;<input type="text" size="10" name="partyId">
+                                        <input type="submit" value="${uiLabelMap.CommonCreate}">
+                                    </form>
+                                    </div>
+                                </td>
+                            </tr>
+                        </table>
                     </td>
                 </tr>
-                </table>
-            </td>
-        </tr>
-        </#list>
-        </table>
-        <div class="tabletext"><b>${uiLabelMap.ProductNoteOnItemId} :</b> ${uiLabelMap.ProductItemIdGiftPurchaseFreeShipping}</div>
-        <div class="tabletext"><b>${uiLabelMap.ProductNoteOnPartyId} :</b> ${uiLabelMap.ProductPartyFreeShipping}</div>
-
-        <br/>
-
-        <h3>${uiLabelMap.ProductAddPromoRule}:</h3>
-        <div class="tabletext">
-            <form method="post" action="<@o...@ofbizUrl>" style="margin: 0;">
+                </#list>
+            </table>
+        </div>
+        <div class="tooltip"><b>${uiLabelMap.ProductNoteOnItemId} :</b> ${uiLabelMap.ProductItemIdGiftPurchaseFreeShipping}</div>
+        <div class="tooltip"><b>${uiLabelMap.ProductNoteOnPartyId} :</b> ${uiLabelMap.ProductPartyFreeShipping}</div>
+    </div>
+    <div class="screenlet">
+        <div class="screenlet-title-bar">
+            <h3>${uiLabelMap.ProductAddPromoRule}</h3>
+        </div>
+        <div class="screenlet-body">
+            <form method="post" action="<@o...@ofbizUrl>">
                 <input type="hidden" name="productPromoId" value="${productPromoId?if_exists}">
-                ${uiLabelMap.ProductName} : <input type="text" size="30" name="ruleName" class="inputBox">
+                <span class="label">${uiLabelMap.ProductName}</span><input type="text" size="30" name="ruleName">
                 <input type="submit" value="${uiLabelMap.CommonAdd}">
             </form>
         </div>
-
-        <br/>
-
+    </div>
+    <div class="screenlet">
+        <div class="screenlet-title-bar">
+            <h3>${uiLabelMap.ProductPromotion} ${uiLabelMap.ProductCategories}</h3>
+        </div>
         <#-- ======================= Categories ======================== -->
-        <h3>${uiLabelMap.ProductPromotion} ${uiLabelMap.ProductCategories}:</h3>
-        <#list promoProductPromoCategories as promoProductPromoCategory>
+        <div class="screenlet-body">
+            <#list promoProductPromoCategories as promoProductPromoCategory>
             <#assign promoProductCategory = promoProductPromoCategory.getRelatedOneCache("ProductCategory")>
             <#assign promoApplEnumeration = promoProductPromoCategory.getRelatedOneCache("ApplEnumeration")>
-            <div class="tabletext">
+            <div>
                 ${(promoProductCategory.description)?if_exists} [${promoProductPromoCategory.productCategoryId}]
                 - ${(promoApplEnumeration.get("description",locale))?default(promoProductPromoCategory.productPromoApplEnumId)}
                 - ${uiLabelMap.ProductSubCats}? ${promoProductPromoCategory.includeSubCategories?default("N")}
                 - ${uiLabelMap.CommonAnd} ${uiLabelMap.CommonGroup}: ${promoProductPromoCategory.andGroupId}
                 <a href="<@o...@ofbizUrl>" class="buttontext">
-                [${uiLabelMap.CommonDelete}]</a>
+                ${uiLabelMap.CommonDelete}</a>
+            </div>
+            </#list>
+            <div>
+                <form method="post" action="<@o...@ofbizUrl>" name="createProductPromoCategoryPromotions">
+                    <input type="hidden" name="productPromoId" value="${productPromoId}">
+                    <input type="hidden" name="productPromoRuleId" value="_NA_">
+                    <input type="hidden" name="productPromoActionSeqId" value="_NA_">
+                    <input type="hidden" name="productPromoCondSeqId" value="_NA_">
+                    <input type="text" class="inputBox" name="productCategoryId" size="20" maxlength="20"/>
+                    <a href="javascript:call_fieldlookup2(document.createProductPromoCategoryPromotions.productCategoryId,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a>
+                    <select name="productPromoApplEnumId">
+                        <#list productPromoApplEnums as productPromoApplEnum>
+                            <option value="${productPromoApplEnum.enumId}">${productPromoApplEnum.get("description",locale)}</option>
+                        </#list>
+                    </select>
+                    <select name="includeSubCategories">
+                        <option value="N">${uiLabelMap.CommonN}</option>
+                        <option value="Y">${uiLabelMap.CommonY}</option>
+                    </select>
+                    ${uiLabelMap.CommonAnd} ${uiLabelMap.CommonGroup}: <input type="text" size="10" maxlength="20" name="andGroupId" value="_NA_"/>*
+                    <input type="submit" value="${uiLabelMap.CommonAdd}">
+                </form>
             </div>
-        </#list>
-        <div class="tabletext">
-            <form method="post" action="<@o...@ofbizUrl>" name="createProductPromoCategoryPromotions">
-                <input type="hidden" name="productPromoId" value="${productPromoId}">
-                <input type="hidden" name="productPromoRuleId" value="_NA_">
-                <input type="hidden" name="productPromoActionSeqId" value="_NA_">
-                <input type="hidden" name="productPromoCondSeqId" value="_NA_">
-                <input type="text" class="inputBox" name="productCategoryId" size="20" maxlength="20"/>
-                <a href="javascript:call_fieldlookup2(document.createProductPromoCategoryPromotions.productCategoryId,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a>
-                <select name="productPromoApplEnumId" class="selectBox">
-                    <#list productPromoApplEnums as productPromoApplEnum>
-                        <option value="${productPromoApplEnum.enumId}">${productPromoApplEnum.get("description",locale)}</option>
-                    </#list>
-                </select>
-                <select name="includeSubCategories" class="selectBox">
-                    <option value="N">${uiLabelMap.CommonN}</option>
-                    <option value="Y">${uiLabelMap.CommonY}</option>
-                </select>
-                ${uiLabelMap.CommonAnd} ${uiLabelMap.CommonGroup}: <input type="text" size="10" maxlength="20" name="andGroupId" value="_NA_" class="inputBox"/>*
-                <input type="submit" value="${uiLabelMap.CommonAdd}" style="font-size: x-small;">
-            </form>
         </div>
-        <br/>
+    </div>
+    <div class="screenlet">
+        <div class="screenlet-title-bar">
+            <h3>${uiLabelMap.ProductPromotionProducts}</h3>
+        </div>
         <#-- ======================= Products ======================== -->
-        <h3>${uiLabelMap.ProductPromotionProducts} :</h3>
-        <#list promoProductPromoProducts as promoProductPromoProduct>
-            <#assign promoProduct = promoProductPromoProduct.getRelatedOneCache("Product")?if_exists>
-            <#assign promoApplEnumeration = promoProductPromoProduct.getRelatedOneCache("ApplEnumeration")>
-            <div class="tabletext">
-                ${(promoProduct.internalName)?if_exists} [${promoProductPromoProduct.productId}]
-                - ${(promoApplEnumeration.get("description",locale))?default(promoProductPromoProduct.productPromoApplEnumId)}
-                <a href="<@o...@ofbizUrl>" class="buttontext">
-                [${uiLabelMap.CommonDelete}]</a>
+        <div class="screenlet-body">
+            <#list promoProductPromoProducts as promoProductPromoProduct>
+                <#assign promoProduct = promoProductPromoProduct.getRelatedOneCache("Product")?if_exists>
+                <#assign promoApplEnumeration = promoProductPromoProduct.getRelatedOneCache("ApplEnumeration")>
+                <div>
+                    ${(promoProduct.internalName)?if_exists} [${promoProductPromoProduct.productId}]
+                    - ${(promoApplEnumeration.get("description",locale))?default(promoProductPromoProduct.productPromoApplEnumId)}
+                    <a href="<@o...@ofbizUrl>" class="buttontext">
+                    ${uiLabelMap.CommonDelete}</a>
+                </div>
+            </#list>
+            <div>
+                <form method="post" name="createpromoproductform" action="<@o...@ofbizUrl>">
+                    <input type="hidden" name="productPromoId" value="${productPromoId}">
+                    <input type="hidden" name="productPromoRuleId" value="_NA_">
+                    <input type="hidden" name="productPromoActionSeqId" value="_NA_">
+                    <input type="hidden" name="productPromoCondSeqId" value="_NA_">
+                    <span class="label">${uiLabelMap.ProductProductId}</span><input type="text" size="20" maxlength="20" name="productId" value=""/>*<a href="javascript:call_fieldlookup2(document.createpromoproductform.productId,'LookupProduct');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a>
+                    <select name="productPromoApplEnumId">
+                        <#list productPromoApplEnums as productPromoApplEnum>
+                            <option value="${productPromoApplEnum.enumId}">${productPromoApplEnum.get("description",locale)}</option>
+                        </#list>
+                    </select>
+                    <input type="submit" value="${uiLabelMap.CommonAdd}">
+                </form>
             </div>
-        </#list>
-        <div class="tabletext">
-            <form method="post" name="createpromoproductform" action="<@o...@ofbizUrl>">
-                <input type="hidden" name="productPromoId" value="${productPromoId}">
-                <input type="hidden" name="productPromoRuleId" value="_NA_">
-                <input type="hidden" name="productPromoActionSeqId" value="_NA_">
-                <input type="hidden" name="productPromoCondSeqId" value="_NA_">
-                ${uiLabelMap.ProductProductId}: <input type="text" size="20" maxlength="20" name="productId" value="" class="inputBox"/>*<a href="javascript:call_fieldlookup2(document.createpromoproductform.productId,'LookupProduct');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a>
-                <select name="productPromoApplEnumId" class="selectBox">
-                    <#list productPromoApplEnums as productPromoApplEnum>
-                        <option value="${productPromoApplEnum.enumId}">${productPromoApplEnum.get("description",locale)}</option>
-                    </#list>
-                </select>
-                <input type="submit" value="${uiLabelMap.CommonAdd}" style="font-size: x-small;">
-            </form>
         </div>
-    </#if>
+    </div>
+</#if>
\ No newline at end of file