svn commit: r931700 [3/5] - in /ofbiz/trunk/applications/prod
Locked
svn commit: r931700 [3/5] - in /ofbiz/trunk/applications/prod
 
|
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=931700&r1=931699&r2=931700&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl Wed Apr 7 21:50:56 2010 @@ -37,17 +37,17 @@ under the License. <td class="label"><b>${(productPromoRule.productPromoRuleId)?if_exists}</b></td> <td> <form method="post" action="<@ofbizUrl>updateProductPromoRule</@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}"> - <input type="submit" value="${uiLabelMap.CommonUpdate}"> + <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}" /> + <input type="submit" value="${uiLabelMap.CommonUpdate}" /> </form> </td> <td align="center"> <#if (productPromoConds.size() == 0 && productPromoActions.size() == 0)> <form name="deleteProductPromoRule_${productPromoRule_index}" method="post" action="<@ofbizUrl>deleteProductPromoRule</@ofbizUrl>"> - <input type="hidden" name="productPromoId" value="${(productPromoRule.productPromoId)?if_exists}"> - <input type="hidden" name="productPromoRuleId" value="${(productPromoRule.productPromoRuleId)?if_exists}"> + <input type="hidden" name="productPromoId" value="${(productPromoRule.productPromoId)?if_exists}" /> + <input type="hidden" name="productPromoRuleId" value="${(productPromoRule.productPromoRuleId)?if_exists}" /> <a href="javascript:document.deleteProductPromoRule_${productPromoRule_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a> </form> </#if> @@ -98,9 +98,9 @@ under the License. <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}"> + <input type="text" size="25" name="condValue" value="${(productPromoCond.condValue)?if_exists}" /> <#assign otherValue = productPromoCond.otherValue?if_exists> - <label>${uiLabelMap.CommonOther}:</label><input type="text" size="10" name="otherValue" <#if otherValue?has_content && !otherValue.contains("@")> value="${(productPromoCond.otherValue)?if_exists}"</#if> > + <label>${uiLabelMap.CommonOther}:</label><input type="text" size="10" name="otherValue" <#if otherValue?has_content && !otherValue.contains("@")> value="${(productPromoCond.otherValue)?if_exists}"</#if> /> <#if otherValue?has_content && otherValue.contains("@")> <#assign carrierShippingMethod = productPromoCond.otherValue?if_exists> </#if> @@ -120,7 +120,7 @@ under the License. <option value = "${carrierShipmentMethod.partyId?if_exists}@${carrierShipmentMethod.shipmentMethodTypeId?if_exists}">${carrierShipmentMethod.partyId?if_exists} ${shipmentMethodType.get("description")?if_exists}</option> </#list> </select> - <input type="submit" value="${uiLabelMap.CommonUpdate}"> + <input type="submit" value="${uiLabelMap.CommonUpdate}" /> </form> <#-- ======================= Categories ======================== --> <div class="label">${uiLabelMap.ProductConditions} ${uiLabelMap.ProductCategories}:</div> @@ -134,22 +134,22 @@ under the License. - ${uiLabelMap.ProductSubCats}? ${condProductPromoCategory.includeSubCategories?default("N")} - ${uiLabelMap.CommonAnd} ${uiLabelMap.CommonGroup}: ${condProductPromoCategory.andGroupId} <form name="deleteProductPromoCategoryCondition_${productPromoRule_index}_${condProductPromoCategory_index}_${productPromoCond_index}" method="post" action="<@ofbizUrl>deleteProductPromoCategory</@ofbizUrl>"> - <input type="hidden" name="productPromoId" value="${(condProductPromoCategory.productPromoId)?if_exists}"> - <input type="hidden" name="productPromoRuleId" value="${(condProductPromoCategory.productPromoRuleId)?if_exists}"> - <input type="hidden" name="productPromoActionSeqId" value="${(condProductPromoCategory.productPromoActionSeqId)?if_exists}"> - <input type="hidden" name="productPromoCondSeqId" value="${(condProductPromoCategory.productPromoCondSeqId)?if_exists}"> - <input type="hidden" name="productCategoryId" value="${(condProductPromoCategory.productCategoryId)?if_exists}"> - <input type="hidden" name="andGroupId" value="${(condProductPromoCategory.andGroupId)?if_exists}"> + <input type="hidden" name="productPromoId" value="${(condProductPromoCategory.productPromoId)?if_exists}" /> + <input type="hidden" name="productPromoRuleId" value="${(condProductPromoCategory.productPromoRuleId)?if_exists}" /> + <input type="hidden" name="productPromoActionSeqId" value="${(condProductPromoCategory.productPromoActionSeqId)?if_exists}" /> + <input type="hidden" name="productPromoCondSeqId" value="${(condProductPromoCategory.productPromoCondSeqId)?if_exists}" /> + <input type="hidden" name="productCategoryId" value="${(condProductPromoCategory.productCategoryId)?if_exists}" /> + <input type="hidden" name="andGroupId" value="${(condProductPromoCategory.andGroupId)?if_exists}" /> <a href="javascript:document.deleteProductPromoCategoryCondition_${productPromoRule_index}_${condProductPromoCategory_index}_${productPromoCond_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a> </form> </div> </#list> <div> <form method="post" action="<@ofbizUrl>createProductPromoCategory</@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="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="${uiLabelMap.CommonClickHereForFieldLookup}"/></a> <select name="productPromoApplEnumId"> @@ -162,7 +162,7 @@ under the License. <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}"> + <input type="submit" value="${uiLabelMap.CommonAdd}" /> </form> </div> <#-- ======================= Products ======================== --> @@ -175,36 +175,36 @@ under the License. ${(condProduct.internalName)?if_exists} [${condProductPromoProduct.productId}] - ${(condApplEnumeration.get("description",locale))?default(condProductPromoProduct.productPromoApplEnumId)} <form name="deleteProductPromoProductCondition_${productPromoRule_index}_${productPromoCond_index}_${condProductPromoProduct_index}" method="post" action="<@ofbizUrl>deleteProductPromoProduct</@ofbizUrl>"> - <input type="hidden" name="productPromoId" value="${(condProductPromoProduct.productPromoId)?if_exists}"> - <input type="hidden" name="productPromoRuleId" value="${(condProductPromoProduct.productPromoRuleId)?if_exists}"> - <input type="hidden" name="productPromoActionSeqId" value="${(condProductPromoProduct.productPromoActionSeqId)?if_exists}"> - <input type="hidden" name="productPromoCondSeqId" value="${(condProductPromoProduct.productPromoCondSeqId)?if_exists}"> - <input type="hidden" name="productId" value="${(condProductPromoProduct.productId)?if_exists}"> + <input type="hidden" name="productPromoId" value="${(condProductPromoProduct.productPromoId)?if_exists}" /> + <input type="hidden" name="productPromoRuleId" value="${(condProductPromoProduct.productPromoRuleId)?if_exists}" /> + <input type="hidden" name="productPromoActionSeqId" value="${(condProductPromoProduct.productPromoActionSeqId)?if_exists}" /> + <input type="hidden" name="productPromoCondSeqId" value="${(condProductPromoProduct.productPromoCondSeqId)?if_exists}" /> + <input type="hidden" name="productId" value="${(condProductPromoProduct.productId)?if_exists}" /> <a href="javascript:document.deleteProductPromoProductCondition_${productPromoRule_index}_${productPromoCond_index}_${condProductPromoProduct_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a> </form> </div> </#list> <div> <form method="post" action="<@ofbizUrl>createProductPromoProduct</@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}"> + <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}"> + <input type="submit" value="${uiLabelMap.CommonAdd}" /> </form> </div> </td> <td align="center"> <form name="deleteProductPromoCondition_${productPromoRule_index}_${productPromoCond_index}" method="post" action="<@ofbizUrl>deleteProductPromoCond</@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}"> + <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}" /> <a href="javascript:document.deleteProductPromoCondition_${productPromoRule_index}_${productPromoCond_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a> </form> </td> @@ -219,8 +219,8 @@ under the License. <tr> <td colspan="3"> <form method="post" action="<@ofbizUrl>createProductPromoCond</@ofbizUrl>"> - <input type="hidden" name="productPromoId" value="${(productPromoRule.productPromoId)?if_exists}"> - <input type="hidden" name="productPromoRuleId" value="${(productPromoRule.productPromoRuleId)?if_exists}"> + <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> </span> <select name="inputParamEnumId" size="1"> <#list inputParamEnums as inputParamEnum> @@ -232,8 +232,8 @@ under the License. <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="text" size="25" name="condValue" /> + ${uiLabelMap.CommonOther}:<input type="text" size="10" name="otherValue" /> <label>${uiLabelMap.OrderSelectShippingMethod}:</label> <select name = "carrierShipmentMethod"> <option value = "">--${uiLabelMap.OrderSelectShippingMethod}--</option> @@ -242,7 +242,7 @@ under the License. <option value = "${carrierShipmentMethod.partyId?if_exists}@${carrierShipmentMethod.shipmentMethodTypeId?if_exists}">${carrierShipmentMethod.partyId?if_exists} ${shipmentMethodType.get("description")?if_exists}</option> </#list> </select> - <input type="submit" value="${uiLabelMap.CommonCreate}"> + <input type="submit" value="${uiLabelMap.CommonCreate}" /> </form> </td> </tr> @@ -260,9 +260,9 @@ under the License. <td> <div> <form method="post" action="<@ofbizUrl>updateProductPromoAction</@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}"> + <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")> @@ -275,12 +275,12 @@ under the License. <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}: <input type="text" size="5" name="quantity" value="${(productPromoAction.quantity)?if_exists}"> - ${uiLabelMap.ProductAmount}: <input type="text" size="5" name="amount" value="${(productPromoAction.amount)?if_exists}"> - ${uiLabelMap.ProductItemId}: <input type="text" size="15" name="productId" value="${(productPromoAction.productId)?if_exists}"> - ${uiLabelMap.PartyParty}: <input type="text" size="10" name="partyId" value="${(productPromoAction.partyId)?if_exists}"> - <input type="submit" value="${uiLabelMap.CommonUpdate}"> + <input type="hidden" name="orderAdjustmentTypeId" value="${(productPromoAction.orderAdjustmentTypeId)?if_exists}" /> + ${uiLabelMap.ProductQuantity}: <input type="text" size="5" name="quantity" value="${(productPromoAction.quantity)?if_exists}" /> + ${uiLabelMap.ProductAmount}: <input type="text" size="5" name="amount" value="${(productPromoAction.amount)?if_exists}" /> + ${uiLabelMap.ProductItemId}: <input type="text" size="15" name="productId" value="${(productPromoAction.productId)?if_exists}" /> + ${uiLabelMap.PartyParty}: <input type="text" size="10" name="partyId" value="${(productPromoAction.partyId)?if_exists}" /> + <input type="submit" value="${uiLabelMap.CommonUpdate}" /> </form> </div> <#-- ======================= Categories ======================== --> @@ -295,22 +295,22 @@ under the License. - ${uiLabelMap.ProductSubCats}? ${actionProductPromoCategory.includeSubCategories?default("N")} - ${uiLabelMap.CommonAnd} ${uiLabelMap.CommonGroup}: ${actionProductPromoCategory.andGroupId} <form name="deleteProductPromoCategoryAction_${productPromoRule_index}_${productPromoAction_index}_${actionProductPromoCategory_index}" action="<@ofbizUrl>deleteProductPromoCategory</@ofbizUrl>" method="post"> - <input type="hidden" name="productPromoId" value="${(actionProductPromoCategory.productPromoId)?if_exists}"> - <input type="hidden" name="productPromoRuleId" value="${(actionProductPromoCategory.productPromoRuleId)?if_exists}"> - <input type="hidden" name="productPromoCondSeqId" value="${(actionProductPromoCategory.productPromoCondSeqId)?if_exists}"> - <input type="hidden" name="productPromoActionSeqId" value="${(actionProductPromoCategory.productPromoActionSeqId)?if_exists}"> - <input type="hidden" name="productCategoryId" value="${(actionProductPromoCategory.productCategoryId)?if_exists}"> - <input type="hidden" name="andGroupId" value="${(actionProductPromoCategory.andGroupId)?if_exists}"> + <input type="hidden" name="productPromoId" value="${(actionProductPromoCategory.productPromoId)?if_exists}" /> + <input type="hidden" name="productPromoRuleId" value="${(actionProductPromoCategory.productPromoRuleId)?if_exists}" /> + <input type="hidden" name="productPromoCondSeqId" value="${(actionProductPromoCategory.productPromoCondSeqId)?if_exists}" /> + <input type="hidden" name="productPromoActionSeqId" value="${(actionProductPromoCategory.productPromoActionSeqId)?if_exists}" /> + <input type="hidden" name="productCategoryId" value="${(actionProductPromoCategory.productCategoryId)?if_exists}" /> + <input type="hidden" name="andGroupId" value="${(actionProductPromoCategory.andGroupId)?if_exists}" /> <a href="javascript:document.deleteProductPromoCategoryAction_${productPromoRule_index}_${productPromoAction_index}_${actionProductPromoCategory_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a> </form> </div> </#list> <div> <form method="post" action="<@ofbizUrl>createProductPromoCategory</@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="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="${uiLabelMap.CommonClickHereForFieldLookup}"/></a> <select name="productPromoApplEnumId"> @@ -323,7 +323,7 @@ under the License. <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}"> + <input type="submit" value="${uiLabelMap.CommonAdd}" /> </form> </div> <#-- ======================= Products ======================== --> @@ -336,36 +336,36 @@ under the License. ${(actionProduct.internalName)?if_exists} [${actionProductPromoProduct.productId}] - ${(actionApplEnumeration.get("description",locale))?default(actionProductPromoProduct.productPromoApplEnumId)} <form name="deleteProductPromoProductAction_${productPromoRule_index}_${productPromoAction_index}_${actionProductPromoProduct_index}" method="post" action="<@ofbizUrl>deleteProductPromoProduct</@ofbizUrl>"> - <input type="hidden" name="productPromoId" value="${(actionProductPromoProduct.productPromoId)?if_exists}"> - <input type="hidden" name="productPromoRuleId" value="${(actionProductPromoProduct.productPromoRuleId)?if_exists}"> - <input type="hidden" name="productPromoCondSeqId" value="${(actionProductPromoProduct.productPromoCondSeqId)?if_exists}"> - <input type="hidden" name="productPromoActionSeqId" value="${(actionProductPromoProduct.productPromoActionSeqId)?if_exists}"> - <input type="hidden" name="productId" value="${(actionProductPromoProduct.productId)?if_exists}"> + <input type="hidden" name="productPromoId" value="${(actionProductPromoProduct.productPromoId)?if_exists}" /> + <input type="hidden" name="productPromoRuleId" value="${(actionProductPromoProduct.productPromoRuleId)?if_exists}" /> + <input type="hidden" name="productPromoCondSeqId" value="${(actionProductPromoProduct.productPromoCondSeqId)?if_exists}" /> + <input type="hidden" name="productPromoActionSeqId" value="${(actionProductPromoProduct.productPromoActionSeqId)?if_exists}" /> + <input type="hidden" name="productId" value="${(actionProductPromoProduct.productId)?if_exists}" /> <a href="javascript:document.deleteProductPromoProductAction_${productPromoRule_index}_${productPromoAction_index}_${actionProductPromoProduct_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a> </form> </div> </#list> <div> <form method="post" action="<@ofbizUrl>createProductPromoProduct</@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_"> + <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}"> + <input type="submit" value="${uiLabelMap.CommonAdd}" /> </form> </div> </td> <td align="center"> <form name="deleteProductPromoAction_${productPromoRule_index}_${productPromoAction_index}" method="post" action="<@ofbizUrl>deleteProductPromoAction</@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}"> + <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}" /> <a href="javascript:document.deleteProductPromoAction_${productPromoRule_index}_${productPromoAction_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a> </form> </td> @@ -381,20 +381,20 @@ under the License. <td colspan="3"> <div> <form method="post" action="<@ofbizUrl>createProductPromoAction</@ofbizUrl>"> - <input type="hidden" name="productPromoId" value="${(productPromoRule.productPromoId)?if_exists}"> - <input type="hidden" name="productPromoRuleId" value="${(productPromoRule.productPromoRuleId)?if_exists}"> + <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> </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}: <input type="text" size="5" name="quantity"> - ${uiLabelMap.ProductAmount}: <input type="text" size="5" name="amount"> - ${uiLabelMap.ProductItemId}: <input type="text" size="15" name="productId"> - ${uiLabelMap.PartyParty}: <input type="text" size="10" name="partyId"> - <input type="submit" value="${uiLabelMap.CommonCreate}"> + <input type="hidden" name="orderAdjustmentTypeId" value="PROMOTION_ADJUSTMENT" /> + ${uiLabelMap.ProductQuantity}: <input type="text" size="5" name="quantity" /> + ${uiLabelMap.ProductAmount}: <input type="text" size="5" name="amount" /> + ${uiLabelMap.ProductItemId}: <input type="text" size="15" name="productId" /> + ${uiLabelMap.PartyParty}: <input type="text" size="10" name="partyId" /> + <input type="submit" value="${uiLabelMap.CommonCreate}" /> </form> </div> </td> @@ -422,9 +422,9 @@ under the License. </div> <div class="screenlet-body"> <form method="post" action="<@ofbizUrl>createProductPromoRule</@ofbizUrl>"> - <input type="hidden" name="productPromoId" value="${productPromoId?if_exists}"> - <span class="label">${uiLabelMap.ProductName}</span><input type="text" size="30" name="ruleName"> - <input type="submit" value="${uiLabelMap.CommonAdd}"> + <input type="hidden" name="productPromoId" value="${productPromoId?if_exists}" /> + <span class="label">${uiLabelMap.ProductName}</span><input type="text" size="30" name="ruleName" /> + <input type="submit" value="${uiLabelMap.CommonAdd}" /> </form> </div> </div> @@ -443,22 +443,22 @@ under the License. - ${uiLabelMap.ProductSubCats}? ${promoProductPromoCategory.includeSubCategories?default("N")} - ${uiLabelMap.CommonAnd} ${uiLabelMap.CommonGroup}: ${promoProductPromoCategory.andGroupId} <form name="deleteProductPromoCategoryAction_${productPromoRule_index}_${promoProductPromoCategory_index}" method="post" action="<@ofbizUrl>deleteProductPromoCategory</@ofbizUrl>"> - <input type="hidden" name="productPromoId" value="${(promoProductPromoCategory.productPromoId)?if_exists}"> - <input type="hidden" name="productPromoRuleId" value="${(promoProductPromoCategory.productPromoRuleId)?if_exists}"> - <input type="hidden" name="productPromoActionSeqId" value="${(promoProductPromoCategory.productPromoActionSeqId)?if_exists}"> - <input type="hidden" name="productPromoCondSeqId" value="${(promoProductPromoCategory.productPromoCondSeqId)?if_exists}"> - <input type="hidden" name="productCategoryId" value="${(promoProductPromoCategory.productCategoryId)?if_exists}"> - <input type="hidden" name="andGroupId" value="${(promoProductPromoCategory.andGroupId)?if_exists}"> + <input type="hidden" name="productPromoId" value="${(promoProductPromoCategory.productPromoId)?if_exists}" /> + <input type="hidden" name="productPromoRuleId" value="${(promoProductPromoCategory.productPromoRuleId)?if_exists}" /> + <input type="hidden" name="productPromoActionSeqId" value="${(promoProductPromoCategory.productPromoActionSeqId)?if_exists}" /> + <input type="hidden" name="productPromoCondSeqId" value="${(promoProductPromoCategory.productPromoCondSeqId)?if_exists}" /> + <input type="hidden" name="productCategoryId" value="${(promoProductPromoCategory.productCategoryId)?if_exists}" /> + <input type="hidden" name="andGroupId" value="${(promoProductPromoCategory.andGroupId)?if_exists}" /> <a href="javascript:document.deleteProductPromoCategoryAction_${productPromoRule_index}_${promoProductPromoCategory_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a> </form> </div> </#list> <div> <form method="post" action="<@ofbizUrl>createProductPromoCategory</@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="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" 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="${uiLabelMap.CommonClickHereForFieldLookup}"/></a> <select name="productPromoApplEnumId"> @@ -471,7 +471,7 @@ under the License. <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}"> + <input type="submit" value="${uiLabelMap.CommonAdd}" /> </form> </div> </div> @@ -489,28 +489,28 @@ under the License. ${(promoProduct.internalName)?if_exists} [${promoProductPromoProduct.productId}] - ${(promoApplEnumeration.get("description",locale))?default(promoProductPromoProduct.productPromoApplEnumId)} <form name="deleteProductPromoProductAction_${promoProductPromoProduct_index}" action="<@ofbizUrl>deleteProductPromoProduct</@ofbizUrl>" method="post"> - <input type="hidden" name="productPromoId" value="${(promoProductPromoProduct.productPromoId)?if_exists}"> - <input type="hidden" name="productPromoRuleId" value="${(promoProductPromoProduct.productPromoRuleId)?if_exists}"> - <input type="hidden" name="productPromoActionSeqId" value="${(promoProductPromoProduct.productPromoActionSeqId)?if_exists}"> - <input type="hidden" name="productPromoCondSeqId" value="${(promoProductPromoProduct.productPromoCondSeqId)?if_exists}"> - <input type="hidden" name="productId" value="${(promoProductPromoProduct.productId)?if_exists}"> + <input type="hidden" name="productPromoId" value="${(promoProductPromoProduct.productPromoId)?if_exists}" /> + <input type="hidden" name="productPromoRuleId" value="${(promoProductPromoProduct.productPromoRuleId)?if_exists}" /> + <input type="hidden" name="productPromoActionSeqId" value="${(promoProductPromoProduct.productPromoActionSeqId)?if_exists}" /> + <input type="hidden" name="productPromoCondSeqId" value="${(promoProductPromoProduct.productPromoCondSeqId)?if_exists}" /> + <input type="hidden" name="productId" value="${(promoProductPromoProduct.productId)?if_exists}" /> <a href="javascript:document.deleteProductPromoProductAction_${promoProductPromoProduct_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a> </form> </div> </#list> <div> <form method="post" name="createpromoproductform" action="<@ofbizUrl>createProductPromoProduct</@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_"> + <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="${uiLabelMap.CommonClickHereForFieldLookup}"/></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}"> + <input type="submit" value="${uiLabelMap.CommonAdd}" /> </form> </div> </div> Modified: ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl?rev=931700&r1=931699&r2=931700&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl Wed Apr 7 21:50:56 2010 @@ -43,21 +43,21 @@ under the License. <#assign hasExpired = false> <#if (productStorePromoAppl.getTimestamp("thruDate"))?exists && nowTimestamp.after(productStorePromoAppl.getTimestamp("thruDate"))> <#assign hasExpired = true></#if> <form method="post" action="<@ofbizUrl>promo_updateProductStorePromoAppl</@ofbizUrl>" name="lineForm${line}"> - <input type="hidden" name="productStoreId" value="${productStorePromoAppl.productStoreId}"> - <input type="hidden" name="productPromoId" value="${productStorePromoAppl.productPromoId}"> - <input type="hidden" name="fromDate" value="${productStorePromoAppl.fromDate}"> - <input type="text" size="20" name="thruDate" value="${(productStorePromoAppl.thruDate)?if_exists}" <#if hasExpired>style="color: red;"</#if>> - <a href="javascript:call_cal(document.lineForm${line}.thruDate, '${nowTimestamp}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> - <input type="text" size="5" name="sequenceNum" value="${(productStorePromoAppl.sequenceNum)?if_exists}"> - <input type="submit" value="${uiLabelMap.CommonUpdate}"> + <input type="hidden" name="productStoreId" value="${productStorePromoAppl.productStoreId}" /> + <input type="hidden" name="productPromoId" value="${productStorePromoAppl.productPromoId}" /> + <input type="hidden" name="fromDate" value="${productStorePromoAppl.fromDate}" /> + <input type="text" size="20" name="thruDate" value="${(productStorePromoAppl.thruDate)?if_exists}" <#if hasExpired>style="color: red;"</#if> /> + <a href="javascript:call_cal(document.lineForm${line}.thruDate, '${nowTimestamp}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a> + <input type="text" size="5" name="sequenceNum" value="${(productStorePromoAppl.sequenceNum)?if_exists}" /> + <input type="submit" value="${uiLabelMap.CommonUpdate}" /> </form> </td> <td align="center"> <form method="post" action="<@ofbizUrl>promo_deleteProductStorePromoAppl</@ofbizUrl>"> - <input type="hidden" name="productStoreId" value="${productStorePromoAppl.productStoreId}"> - <input type="hidden" name="productPromoId" value="${productStorePromoAppl.productPromoId}"> - <input type="hidden" name="fromDate" value="${productStorePromoAppl.fromDate}"> - <input type="submit" value="${uiLabelMap.CommonDelete}"> + <input type="hidden" name="productStoreId" value="${productStorePromoAppl.productStoreId}" /> + <input type="hidden" name="productPromoId" value="${productStorePromoAppl.productPromoId}" /> + <input type="hidden" name="fromDate" value="${productStorePromoAppl.fromDate}" /> + <input type="submit" value="${uiLabelMap.CommonDelete}" /> </form> </td> </tr> @@ -85,7 +85,7 @@ under the License. </#list> </select> <input type="text" size="20" name="fromDate"/> - <a href="javascript:call_cal(document.addProductPromoToCatalog.fromDate, '${nowTimestamp}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> + <a href="javascript:call_cal(document.addProductPromoToCatalog.fromDate, '${nowTimestamp}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a> <input type="submit" value="${uiLabelMap.CommonAdd}"/> </form> </div> Modified: ofbiz/trunk/applications/product/webapp/catalog/promo/FindProductPromoCode.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/promo/FindProductPromoCode.ftl?rev=931700&r1=931699&r2=931700&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/promo/FindProductPromoCode.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/promo/FindProductPromoCode.ftl Wed Apr 7 21:50:56 2010 @@ -24,14 +24,14 @@ under the License. <div class="screenlet-body"> <form method="post" action="<@ofbizUrl>createBulkProductPromoCode</@ofbizUrl>" enctype="multipart/form-data"> <input type="hidden" name="productPromoId" value="${productPromoId}"/> - <span class="label">${uiLabelMap.ProductPromoUserEntered}:</span></span><select name="userEntered"><option>N</option><option>Y</option></select> + <span class="label">${uiLabelMap.ProductPromoUserEntered}:</span><select name="userEntered"><option>N</option><option>Y</option></select> <span class="label">${uiLabelMap.ProductPromotionReqEmailOrParty}:</span><select name="requireEmailOrParty"><option>N</option><option>Y</option></select> <span class="label">${uiLabelMap.ProductPromotionUseLimits}: - ${uiLabelMap.ProductPromotionPerCode}</span><input type="text" size="5" name="useLimitPerCode"> - <span class="label">${uiLabelMap.ProductPromotionPerCustomer}</span><input type="text" size="5" name="useLimitPerCustomer"> + ${uiLabelMap.ProductPromotionPerCode}</span><input type="text" size="5" name="useLimitPerCode" /> + <span class="label">${uiLabelMap.ProductPromotionPerCustomer}</span><input type="text" size="5" name="useLimitPerCustomer" /> <div> - <input type="file" size="40" name="uploadedFile"> - <input type="submit" value="${uiLabelMap.CommonUpload}"> + <input type="file" size="40" name="uploadedFile" /> + <input type="submit" value="${uiLabelMap.CommonUpload}" /> </div> </form> </div> @@ -44,13 +44,13 @@ under the License. <div class="screenlet-body"> <form method="post" action="<@ofbizUrl>createProductPromoCodeSet</@ofbizUrl>"> <input type="hidden" name="productPromoId" value="${productPromoId}"/> - <span class="label">${uiLabelMap.CommonQuantity}:</span><input type="text" size="5" name="quantity"> + <span class="label">${uiLabelMap.CommonQuantity}:</span><input type="text" size="5" name="quantity" /> <span class="label">${uiLabelMap.ProductPromoUserEntered}:</span><select name="userEntered"><option>N</option><option>Y</option></select> <span class="label">${uiLabelMap.ProductPromotionReqEmailOrParty}:</span><select name="requireEmailOrParty"><option>N</option><option>Y</option></select> <span class="label">${uiLabelMap.ProductPromotionUseLimits}: - ${uiLabelMap.ProductPromotionPerCode}</span><input type="text" size="5" name="useLimitPerCode"> - <span class="label">${uiLabelMap.ProductPromotionPerCustomer}</span><input type="text" size="5" name="useLimitPerCustomer"> - <input type="submit" value="${uiLabelMap.CommonAdd}"> + ${uiLabelMap.ProductPromotionPerCode}</span><input type="text" size="5" name="useLimitPerCode" /> + <span class="label">${uiLabelMap.ProductPromotionPerCustomer}</span><input type="text" size="5" name="useLimitPerCustomer" /> + <input type="submit" value="${uiLabelMap.CommonAdd}" /> </form> </div> </div> Modified: ofbiz/trunk/applications/product/webapp/catalog/reviews/pendingReviews.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/reviews/pendingReviews.ftl?rev=931700&r1=931699&r2=931700&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/reviews/pendingReviews.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/reviews/pendingReviews.ftl Wed Apr 7 21:50:56 2010 @@ -31,13 +31,13 @@ under the License. <h3>${uiLabelMap.ProductReviewsNoPendingApproval}</h3> <#else> <form method='POST' action='<@ofbizUrl>updateProductReview</@ofbizUrl>' name="selectAllForm"> - <input type="hidden" name="_useRowSubmit" value="Y"> - <input type="hidden" name="_checkGlobalScope" value="Y"> - <input type="hidden" name="statusId" value=""> + <input type="hidden" name="_useRowSubmit" value="Y" /> + <input type="hidden" name="_checkGlobalScope" value="Y" /> + <input type="hidden" name="statusId" value="" /> <div align="right"> - <input type="button" value="${uiLabelMap.CommonUpdate}" onClick="javascript:changeReviewStatus('PRR_PENDING')"> - <input type="button" value="${uiLabelMap.ProductPendingReviewUpdateAndApprove}" onClick="javascript:changeReviewStatus('PRR_APPROVED')"> - <input type="button" value="${uiLabelMap.CommonDelete}" onClick="javascript:changeReviewStatus('PRR_DELETED')"> + <input type="button" value="${uiLabelMap.CommonUpdate}" onClick="javascript:changeReviewStatus('PRR_PENDING')" /> + <input type="button" value="${uiLabelMap.ProductPendingReviewUpdateAndApprove}" onClick="javascript:changeReviewStatus('PRR_APPROVED')" /> + <input type="button" value="${uiLabelMap.CommonDelete}" onClick="javascript:changeReviewStatus('PRR_DELETED')" /> </div> <table cellspacing="0" class="basic-table"> <tr class="header-row"> @@ -50,7 +50,7 @@ under the License. <td><b>${uiLabelMap.ProductReviews}</b></td> <td align="right"> <span class="label">${uiLabelMap.CommonAll}</span> - <input type="checkbox" name="selectAll" value="${uiLabelMap.CommonY}" onclick="javascript:toggleAll(this, 'selectAllForm');highlightAllRows(this, 'review_tableRow_', 'selectAllForm');"> + <input type="checkbox" name="selectAll" value="${uiLabelMap.CommonY}" onclick="javascript:toggleAll(this, 'selectAllForm');highlightAllRows(this, 'review_tableRow_', 'selectAllForm');" /> </td> </tr> <#assign rowCount = 0> @@ -68,7 +68,7 @@ under the License. </#if> <tr id="review_tableRow_${rowCount}" valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> <td> - <input type="hidden" name="productReviewId_o_${rowCount}" value="${review.productReviewId}"> + <input type="hidden" name="productReviewId_o_${rowCount}" value="${review.productReviewId}" /> ${review.postedDateTime?if_exists} </td> <#if postedPerson?has_content> @@ -88,14 +88,14 @@ under the License. </td> <td>${review.getRelatedOne("Product").internalName?if_exists}<br /><a class="buttontext" href="<@ofbizUrl>EditProduct?productId=${review.productId}</@ofbizUrl>">${review.productId}</a></td> <td> - <input type="text" size='3' name="productRating_o_${rowCount}" value="${review.productRating?if_exists?string}"> + <input type="text" size='3' name="productRating_o_${rowCount}" value="${review.productRating?if_exists?string}" /> </td> <td>${review.getRelatedOne("StatusItem").get("description", locale)}</td> <td> <textarea name="productReview_o_${rowCount}" rows="5" cols="30" wrap="hard">${review.productReview?if_exists}</textarea> </td> <td align="right"> - <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');highlightRow(this,'review_tableRow_${rowCount}');"> + <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');highlightRow(this,'review_tableRow_${rowCount}');" /> </td> </tr> <#assign rowCount = rowCount + 1> @@ -106,7 +106,7 @@ under the License. <#assign rowClass = "2"> </#if> </#list> - <input type="hidden" name="_rowCount" value="${rowCount}"> + <input type="hidden" name="_rowCount" value="${rowCount}" /> </table> </form> </#if> Modified: ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl?rev=931700&r1=931699&r2=931700&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl Wed Apr 7 21:50:56 2010 @@ -46,8 +46,8 @@ under the License. <td>${storeSurvey.sequenceNum?if_exists}</td> <td> <form name="deleteProductStoreSurveyAppl_${storeSurvey_index}" method="post" action="<@ofbizUrl>deleteProductStoreSurveyAppl</@ofbizUrl>"> - <input type="hidden" name="productStoreId" value="${productStoreId}"> - <input type="hidden" name="productStoreSurveyId" value="${storeSurvey.productStoreSurveyId}"> + <input type="hidden" name="productStoreId" value="${productStoreId}" /> + <input type="hidden" name="productStoreSurveyId" value="${storeSurvey.productStoreSurveyId}" /> <a href="javascript:document.deleteProductStoreSurveyAppl_${storeSurvey_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a> </form> </td> @@ -63,7 +63,7 @@ under the License. </div> <div class="screenlet-body"> <form name="addSurvey" action="<@ofbizUrl>createProductStoreSurveyAppl</@ofbizUrl>" method="post"> - <input type="hidden" name="productStoreId" value="${productStoreId}"> + <input type="hidden" name="productStoreId" value="${productStoreId}" /> <table cellspacing="0" class="basic-table"> <tr> <td class="label">${uiLabelMap.CommonType}</td> @@ -78,7 +78,7 @@ under the License. <tr> <td class="label">${uiLabelMap.CommonGroup} ${uiLabelMap.CommonName}</td> <td> - <input type="text" size="20" name="groupName"> + <input type="text" size="20" name="groupName" /> </td> </tr> <tr> @@ -94,7 +94,7 @@ under the License. <tr> <td class="label">${uiLabelMap.ProductProductId}</td> <td> - <input type="text" size="20" name="productId"> + <input type="text" size="20" name="productId" /> </td> </tr> <tr> @@ -107,38 +107,38 @@ under the License. <tr> <td class="label">${uiLabelMap.CommonFromDate}</td> <td> - <input type="text" size="25" name="fromDate"> - <a href="javascript:call_cal(document.addSurvey.fromDate, '${nowTimestampString}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> + <input type="text" size="25" name="fromDate" /> + <a href="javascript:call_cal(document.addSurvey.fromDate, '${nowTimestampString}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a> </td> </tr> <tr> <td class="label">${uiLabelMap.CommonThruDate}</td> <td> - <input type="text" size="25" name="thruDate"> - <a href="javascript:call_cal(document.addSurvey.thruDate, '${nowTimestampString}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> + <input type="text" size="25" name="thruDate" /> + <a href="javascript:call_cal(document.addSurvey.thruDate, '${nowTimestampString}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a> </td> </tr> <tr> <td class="label">${uiLabelMap.ProductStoreSurveyTemplatePath}</td> <td> - <input type="text" size="30" name="surveyTemplate"> + <input type="text" size="30" name="surveyTemplate" /> </td> </tr> <tr> <td class="label">${uiLabelMap.ProductStoreSurveyResultTemplatePath}</td> <td> - <input type="text" size="30" name="resultTemplate"> + <input type="text" size="30" name="resultTemplate" /> </td> </tr> <tr> <td class="label">${uiLabelMap.CommonSequenceNum}</td> <td> - <input type="text" size="5" name="sequenceNum"> + <input type="text" size="5" name="sequenceNum" /> </td> </tr> <tr> <td> </td> - <td><input type="submit" class="smallSubmit" value="${uiLabelMap.CommonAdd}"></td> + <td><input type="submit" class="smallSubmit" value="${uiLabelMap.CommonAdd}" /></td> </tr> </table> </form> Modified: ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreWebSites.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreWebSites.ftl?rev=931700&r1=931699&r2=931700&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreWebSites.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreWebSites.ftl Wed Apr 7 21:50:56 2010 @@ -21,7 +21,7 @@ under the License. <h3>${uiLabelMap.PageTitleEditProductStoreWebSites}</h3> </div> <div class="screenlet-body"> - <a href="/content/control/EditWebSite?productStoreId=${productStoreId}&externalLoginKey=${requestAttributes.externalLoginKey}" class="buttontext">${uiLabelMap.ProductCreateNewProductStoreWebSite}</a> + <a href="/content/control/EditWebSite?productStoreId=${productStoreId}&externalLoginKey=${requestAttributes.externalLoginKey}" class="buttontext">${uiLabelMap.ProductCreateNewProductStoreWebSite}</a> <table cellspacing="0" class="basic-table"> <tr class="header-row"> <td>${uiLabelMap.ProductWebSiteId}</td> @@ -33,7 +33,7 @@ under the License. <#assign rowClass = "2"> <#list storeWebSites as webSite> <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> - <td><a href="/content/control/EditWebSite?webSiteId=${webSite.webSiteId}&externalLoginKey=${requestAttributes.externalLoginKey}" class="buttontext">${webSite.siteName?if_exists} [${webSite.webSiteId}]</a></td> + <td><a href="/content/control/EditWebSite?webSiteId=${webSite.webSiteId}&externalLoginKey=${requestAttributes.externalLoginKey}" class="buttontext">${webSite.siteName?if_exists} [${webSite.webSiteId}]</a></td> <td>${webSite.httpHost?default(' ')}</td> <td>${webSite.httpPort?default(' ')}</td> <td align="center"> @@ -62,14 +62,14 @@ under the License. </div> <div class="screenlet-body"> <form name="addWebSite" action="<@ofbizUrl>storeUpdateWebSite</@ofbizUrl>" method="post"> - <input type="hidden" name="viewProductStoreId" value="${productStoreId}"> - <input type="hidden" name="productStoreId" value="${productStoreId}"> + <input type="hidden" name="viewProductStoreId" value="${productStoreId}" /> + <input type="hidden" name="productStoreId" value="${productStoreId}" /> <select name="webSiteId"> <#list webSites as webSite> <option value="${webSite.webSiteId}">${webSite.siteName?if_exists} [${webSite.webSiteId}]</option> </#list> </select> - <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonUpdate}"> + <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonUpdate}" /> </form> </div> </div> Modified: ofbiz/trunk/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl?rev=931700&r1=931699&r2=931700&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl Wed Apr 7 21:50:56 2010 @@ -41,6 +41,7 @@ under the License. </div> <br /> <#assign lastkeyword = ""> + <#if keywordThesauruses?has_content> <table cellspacing="0" class="basic-table"> <#assign rowClass = "2"> <#list keywordThesauruses as keyword> @@ -59,17 +60,17 @@ under the License. <a href="<@ofbizUrl>deleteKeywordThesaurus?enteredKeyword=${keyword.enteredKeyword}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDeleteAll}</a> </div> <div> - <input type="hidden" name="enteredKeyword" value=${keyword.enteredKeyword}> - <span class="label">${uiLabelMap.ProductAlternate}</span><input type="text" name="alternateKeyword" size="10"> + <input type="hidden" name="enteredKeyword" value="${keyword.enteredKeyword}" /> + <span class="label">${uiLabelMap.ProductAlternate}</span><input type="text" name="alternateKeyword" size="10" /> <span class="label">${uiLabelMap.ProductRelationship}</span><select name="relationshipEnumId"><#list relationshipEnums as relationshipEnum><option value="${relationshipEnum.enumId}">${relationshipEnum.get("description",locale)}</option></#list></select> - <input type="submit" value="${uiLabelMap.CommonAdd}"> + <input type="submit" value="${uiLabelMap.CommonAdd}" /> </div> </form> </td> <td> </#if> <div> - <a href="<@ofbizUrl>deleteKeywordThesaurus?enteredKeyword=${keyword.enteredKeyword}&alternateKeyword=${keyword.alternateKeyword}</@ofbizUrl>" class="buttontext">X</a> + <a href="<@ofbizUrl>deleteKeywordThesaurus?enteredKeyword=${keyword.enteredKeyword}&alternateKeyword=${keyword.alternateKeyword}</@ofbizUrl>" class="buttontext">X</a> ${keyword.alternateKeyword} (${uiLabelMap.ProductRelationship}:${(relationship.get("description",locale))?default(keyword.relationshipEnumId?if_exists)}) </div> <#-- toggle the row color --> @@ -82,5 +83,6 @@ under the License. </td> </tr> </table> + </#if> </div> </div> \ No newline at end of file Modified: ofbiz/trunk/applications/product/webapp/facility/facility/EditContactMech.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/EditContactMech.ftl?rev=931700&r1=931699&r2=931700&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/EditContactMech.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/EditContactMech.ftl Wed Apr 7 21:50:56 2010 @@ -29,8 +29,8 @@ under the License. <a href='<@ofbizUrl>authview/${donePage}?facilityId=${facilityId}</@ofbizUrl>' class='buttontext'>${uiLabelMap.CommonGoBack}</a> </div> <form method="post" action='<@ofbizUrl>EditContactMech</@ofbizUrl>' name="createcontactmechform"> - <input type='hidden' name='facilityId' value='${facilityId}'> - <input type='hidden' name='DONE_PAGE' value='${donePage?if_exists}'> + <input type='hidden' name='facilityId' value='${facilityId}' /> + <input type='hidden' name='DONE_PAGE' value='${donePage?if_exists}' /> <table width="50%" class="basic-table" cellspacing="0"> <tr> <td class="label">${uiLabelMap.PartySelectContactType}</td> @@ -58,13 +58,13 @@ under the License. </#if> <table width="90%" class="basic-table" cellspacing="0"> <form method="post" action='<@ofbizUrl>${mechMap.requestName}</@ofbizUrl>' name="editcontactmechform"> - <input type='hidden' name='DONE_PAGE' value='${donePage}'> - <input type='hidden' name='contactMechTypeId' value='${mechMap.contactMechTypeId}'> - <input type='hidden' name='facilityId' value='${facilityId}'> - <#if preContactMechTypeId?exists><input type='hidden' name='preContactMechTypeId' value='${preContactMechTypeId}'></#if> - <#if contactMechPurposeTypeId?exists><input type='hidden' name='contactMechPurposeTypeId' value='${contactMechPurposeTypeId?if_exists}'></#if> + <input type='hidden' name='DONE_PAGE' value='${donePage}' /> + <input type='hidden' name='contactMechTypeId' value='${mechMap.contactMechTypeId}' /> + <input type='hidden' name='facilityId' value='${facilityId}' /> + <#if preContactMechTypeId?exists><input type='hidden' name='preContactMechTypeId' value='${preContactMechTypeId}' /></#if> + <#if contactMechPurposeTypeId?exists><input type='hidden' name='contactMechPurposeTypeId' value='${contactMechPurposeTypeId?if_exists}' /></#if> - <#if paymentMethodId?exists><input type='hidden' name='paymentMethodId' value='${paymentMethodId}'></#if> + <#if paymentMethodId?exists><input type='hidden' name='paymentMethodId' value='${paymentMethodId}' /></#if> <#else> <h1>${title}</h1> <div class="button-bar"> @@ -107,9 +107,9 @@ under the License. </#if> <tr> <td> - <form method="post" action='<@ofbizUrl>createFacilityContactMechPurpose?DONE_PAGE=${donePage}&useValues=true</@ofbizUrl>' name='newpurposeform'> - <input type="hidden" name='facilityId' value='${facilityId}'> - <input type="hidden" name='contactMechId' value='${contactMechId?if_exists}'> + <form method="post" action='<@ofbizUrl>createFacilityContactMechPurpose?DONE_PAGE=${donePage}&useValues=true</@ofbizUrl>' name='newpurposeform'> + <input type="hidden" name='facilityId' value='${facilityId}' /> + <input type="hidden" name='contactMechId' value='${contactMechId?if_exists}' /> <select name='contactMechPurposeTypeId'> <option></option> <#list mechMap.purposeTypes as contactMechPurposeType> @@ -125,40 +125,40 @@ under the License. </tr> </#if> <form method="post" action='<@ofbizUrl>${mechMap.requestName}</@ofbizUrl>' name="editcontactmechform"> - <input type="hidden" name="contactMechId" value='${contactMechId}'> - <input type="hidden" name="contactMechTypeId" value='${mechMap.contactMechTypeId}'> - <input type="hidden" name='facilityId' value='${facilityId}'> + <input type="hidden" name="contactMechId" value='${contactMechId}' /> + <input type="hidden" name="contactMechTypeId" value='${mechMap.contactMechTypeId}' /> + <input type="hidden" name='facilityId' value='${facilityId}' /> </#if> <#if "POSTAL_ADDRESS" = mechMap.contactMechTypeId?if_exists> <tr> <td class="label">${uiLabelMap.PartyToName}</td> <td> - <input type="text" size="30" maxlength="60" name="toName" value="${(mechMap.postalAddress.toName)?default(request.getParameter('toName')?if_exists)}"> + <input type="text" size="30" maxlength="60" name="toName" value="${(mechMap.postalAddress.toName)?default(request.getParameter('toName')?if_exists)}" /> </td> </tr> <tr> <td class="label">${uiLabelMap.PartyAttentionName}</td> <td> - <input type="text" size="30" maxlength="60" name="attnName" value="${(mechMap.postalAddress.attnName)?default(request.getParameter('attnName')?if_exists)}"> + <input type="text" size="30" maxlength="60" name="attnName" value="${(mechMap.postalAddress.attnName)?default(request.getParameter('attnName')?if_exists)}" /> </td> </tr> <tr> <td class="label">${uiLabelMap.PartyAddressLine1}</td> <td> - <input type="text" class="required" size="30" maxlength="30" name="address1" value="${(mechMap.postalAddress.address1)?default(request.getParameter('address1')?if_exists)}"> + <input type="text" class="required" size="30" maxlength="30" name="address1" value="${(mechMap.postalAddress.address1)?default(request.getParameter('address1')?if_exists)}" /> *</td> </tr> <tr> <td class="label">${uiLabelMap.PartyAddressLine2}</td> <td> - <input type="text" size="30" maxlength="30" name="address2" value="${(mechMap.postalAddress.address2)?default(request.getParameter('address2')?if_exists)}"> + <input type="text" size="30" maxlength="30" name="address2" value="${(mechMap.postalAddress.address2)?default(request.getParameter('address2')?if_exists)}" /> </td> </tr> <tr> <td class="label">${uiLabelMap.PartyCity}</td> <td> - <input type="text" class="required" size="30" maxlength="30" name="city" value="${(mechMap.postalAddress.city)?default(request.getParameter('city')?if_exists)}"> + <input type="text" class="required" size="30" maxlength="30" name="city" value="${(mechMap.postalAddress.city)?default(request.getParameter('city')?if_exists)}" /> *</td> </tr> <tr> @@ -174,7 +174,7 @@ under the License. <tr> <td class="label">${uiLabelMap.PartyZipCode}</td> <td> - <input type="text" class="required" size="12" maxlength="10" name="postalCode" value="${(mechMap.postalAddress.postalCode)?default(request.getParameter('postalCode')?if_exists)}"> + <input type="text" class="required" size="12" maxlength="10" name="postalCode" value="${(mechMap.postalAddress.postalCode)?default(request.getParameter('postalCode')?if_exists)}" /> *</td> </tr> <tr> @@ -191,10 +191,10 @@ under the License. <tr> <td class="label">${uiLabelMap.PartyPhoneNumber}</td> <td> - <input type="text" size="4" maxlength="10" name="countryCode" value="${(mechMap.telecomNumber.countryCode)?default(request.getParameter('countryCode')?if_exists)}"> - - <input type="text" size="4" maxlength="10" name="areaCode" value="${(mechMap.telecomNumber.areaCode)?default(request.getParameter('areaCode')?if_exists)}"> - - <input type="text" size="15" maxlength="15" name="contactNumber" value="${(mechMap.telecomNumber.contactNumber)?default(request.getParameter('contactNumber')?if_exists)}"> - ext <input type="text" size="6" maxlength="10" name="extension" value="${(mechMap.facilityContactMech.extension)?default(request.getParameter('extension')?if_exists)}"> + <input type="text" size="4" maxlength="10" name="countryCode" value="${(mechMap.telecomNumber.countryCode)?default(request.getParameter('countryCode')?if_exists)}" /> + - <input type="text" size="4" maxlength="10" name="areaCode" value="${(mechMap.telecomNumber.areaCode)?default(request.getParameter('areaCode')?if_exists)}" /> + - <input type="text" size="15" maxlength="15" name="contactNumber" value="${(mechMap.telecomNumber.contactNumber)?default(request.getParameter('contactNumber')?if_exists)}" /> + ext <input type="text" size="6" maxlength="10" name="extension" value="${(mechMap.facilityContactMech.extension)?default(request.getParameter('extension')?if_exists)}" /> </td> </tr> <tr> @@ -205,14 +205,14 @@ under the License. <tr> <td class="label">${uiLabelMap.PartyEmailAddress}</td> <td> - <input type="text" class="required" size="60" maxlength="255" name="emailAddress" value="${(mechMap.contactMech.infoString)?default(request.getParameter('emailAddress')?if_exists)}"> + <input type="text" class="required" size="60" maxlength="255" name="emailAddress" value="${(mechMap.contactMech.infoString)?default(request.getParameter('emailAddress')?if_exists)}" /> *</td> </tr> <#else> <tr> <td class="label">${mechMap.contactMechType.get("description",locale)}</td> <td> - <input type="text" class="required" size="60" maxlength="255" name="infoString" value="${(mechMap.contactMech.infoString)?if_exists}"> + <input type="text" class="required" size="60" maxlength="255" name="infoString" value="${(mechMap.contactMech.infoString)?if_exists}" /> *</td> </tr> </#if> Modified: ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl?rev=931700&r1=931699&r2=931700&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl Wed Apr 7 21:50:56 2010 @@ -19,7 +19,7 @@ under the License. <#if facility?exists && facilityId?has_content> <form action="<@ofbizUrl>UpdateFacility</@ofbizUrl>" name="EditFacilityForm" method="post"> - <input type="hidden" name="facilityId" value="${facilityId?if_exists}"> + <input type="hidden" name="facilityId" value="${facilityId?if_exists}" /> <table class="basic-table" cellspacing='0'> <tr> <td class="label">${uiLabelMap.ProductFacilityId}</td> @@ -38,7 +38,7 @@ under the License. <td class="label">${uiLabelMap.ProductFacilityTypeId}</td> <td> <select name="facilityTypeId"> - <option selected value='${facilityType.facilityTypeId?if_exists}'>${facilityType.get("description",locale)?if_exists}</option> + <option selected="selected" value='${facilityType.facilityTypeId?if_exists}'>${facilityType.get("description",locale)?if_exists}</option> <option value='${facilityType.facilityTypeId?if_exists}'>----</option> <#list facilityTypes as nextFacilityType> <option value='${nextFacilityType.facilityTypeId?if_exists}'>${nextFacilityType.get("description",locale)?if_exists}</option> @@ -73,7 +73,8 @@ under the License. <#list weightUomList as uom> <option value='${uom.uomId}' <#if (facility.defaultWeightUomId?has_content) && (uom.uomId == facility.defaultWeightUomId)> - SELECTED + + </#if> >${uom.get("description",locale)?default(uom.uomId)}</option> </#list> @@ -97,11 +98,11 @@ under the License. <tr> <td class="label">${uiLabelMap.ProductName}</td> - <td><input type="text" name="facilityName" value="${facility.facilityName?if_exists}" size="30" maxlength="60"></td> + <td><input type="text" name="facilityName" value="${facility.facilityName?if_exists}" size="30" maxlength="60" /></td> </tr> <tr> <td class="label">${uiLabelMap.ProductFacilitySize}</td> - <td><input type="text" name="facilitySize" value="${facility.facilitySize?if_exists}" size="10" maxlength="20"></td> + <td><input type="text" name="facilitySize" value="${facility.facilitySize?if_exists}" size="10" maxlength="20" /></td> </tr> <tr> <td class="label">${uiLabelMap.ProductFacilityDefaultAreaUnit}</td> @@ -120,19 +121,19 @@ under the License. </tr> <tr> <td class="label">${uiLabelMap.ProductProductDescription}</td> - <td ><input type="text" name="description" value="${facility.description?if_exists}" size="60" maxlength="250"></td> + <td ><input type="text" name="description" value="${facility.description?if_exists}" size="60" maxlength="250" /></td> </tr> <tr> <td class="label">${uiLabelMap.ProductDefaultDaysToShip}</td> - <td><input type="text" name="defaultDaysToShip" value="${facility.defaultDaysToShip?if_exists}" size="10" maxlength="20"></td> + <td><input type="text" name="defaultDaysToShip" value="${facility.defaultDaysToShip?if_exists}" size="10" maxlength="20" /></td> </tr> <tr> <td> </td> <#if facilityId?has_content> - <td><input type="submit" name="Update" value="${uiLabelMap.CommonUpdate}"></td> + <td><input type="submit" name="Update" value="${uiLabelMap.CommonUpdate}" /></td> <#else> - <td><input type="submit" name="Update" value="${uiLabelMap.CommonSave}"></td> + <td><input type="submit" name="Update" value="${uiLabelMap.CommonSave}" /></td> </#if> </tr> </table> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |