svn commit: r931700 [1/5] - in /ofbiz/trunk/applications/prod
Locked
svn commit: r931700 [1/5] - in /ofbiz/trunk/applications/prod
 
|
Author: buscob
Date: Wed Apr 7 21:50:56 2010 New Revision: 931700 URL: http://svn.apache.org/viewvc?rev=931700&view=rev Log: A patch from Blas Rodriguez Somoza OFBIZ-3609 - XHTML validation errors (product) XHTML validation errors * Unclosed INPUT or IMG * attributes without values (checked, selected, disabled, etc) * attribute values without " * Uppercase tags or attributes. * Unencoded ampersands in urls. Other errors: EditKeywordThesaurus.ftl Lines 44-84. When keywordThesauruses is empty the resulting markup will be <table cellspacing="0" class="basic-table"> </td> </tr> </table> Which is obviously wrong. Added an <#if to guard against wrong table markup when keywordThesauruses is empty. FindProductPromoCode.ftl Wrong markup at Line 27. Duplicated </span> EditProductConfigItemContent.ftl Wrong markup at line 99. Input can't be directly inside table. In this file the input can be one line before table tag without functional changes <table cellspacing="0" class="basic-table"> <input type="hidden" name="configItemId" value="${configItemId?if_exists}"> Modified: ofbiz/trunk/applications/product/webapp/catalog/ChooseTopCategory.ftl ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryContent.ftl ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryParties.ftl ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryRollup.ftl ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryCheckExisting.ftl ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryStart.ftl ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigItemContent.ftl ofbiz/trunk/applications/product/webapp/catalog/feature/BulkAddFeature.ftl ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureGroups.ftl ofbiz/trunk/applications/product/webapp/catalog/find/FindProductById.ftl ofbiz/trunk/applications/product/webapp/catalog/find/advancedsearch.ftl ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchactions.ftl ofbiz/trunk/applications/product/webapp/catalog/lookup/LookupVariantProduct.ftl ofbiz/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl ofbiz/trunk/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl ofbiz/trunk/applications/product/webapp/catalog/product/EditProductFeatures.ftl ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl ofbiz/trunk/applications/product/webapp/catalog/product/ProductInventorySummary.ftl ofbiz/trunk/applications/product/webapp/catalog/product/QuickAddVariants.ftl 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/reviews/pendingReviews.ftl ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreWebSites.ftl ofbiz/trunk/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl ofbiz/trunk/applications/product/webapp/facility/facility/EditContactMech.ftl ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl ofbiz/trunk/applications/product/webapp/facility/facility/EditFacilityLocation.ftl ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentItems.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/QuickShipOrder.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/VerifyPick.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentItemInfo.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/WeightPackage.ftl Modified: ofbiz/trunk/applications/product/webapp/catalog/ChooseTopCategory.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/ChooseTopCategory.ftl?rev=931700&r1=931699&r2=931700&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/ChooseTopCategory.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/ChooseTopCategory.ftl Wed Apr 7 21:50:56 2010 @@ -24,7 +24,7 @@ under the License. <div class="screenlet-body"> <#list noParentCategories as category> <div> - <a href="<@ofbizUrl>EditCategory?CATALOG_TOP_CATEGORY=${category.productCategoryId}&productCategoryId=${category.productCategoryId}</@ofbizUrl>" class="buttontext"> + <a href="<@ofbizUrl>EditCategory?CATALOG_TOP_CATEGORY=${category.productCategoryId}&productCategoryId=${category.productCategoryId}</@ofbizUrl>" class="buttontext"> ${category.description?if_exists} [${category.productCategoryId}] </a> </div> Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl?rev=931700&r1=931699&r2=931700&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl Wed Apr 7 21:50:56 2010 @@ -237,14 +237,14 @@ function insertImageName(type,nameValue) </div> <div> <b>${uiLabelMap.CommonDuplicate}:</b> - ${uiLabelMap.ProductCategoryContent} <input type="checkbox" name="duplicateContent" value="Y" checked /> - ${uiLabelMap.ProductCategoryRollupParentCategories} <input type="checkbox" name="duplicateParentRollup" value="Y" checked /> + ${uiLabelMap.ProductCategoryContent} <input type="checkbox" name="duplicateContent" value="Y" checked="checked" /> + ${uiLabelMap.ProductCategoryRollupParentCategories} <input type="checkbox" name="duplicateParentRollup" value="Y" checked="checked" /> ${uiLabelMap.ProductCategoryRollupChildCategories} <input type="checkbox" name="duplicateChildRollup" value="Y" /> - ${uiLabelMap.ProductProducts} <input type="checkbox" name="duplicateMembers" value="Y" checked /> - ${uiLabelMap.ProductCatalogs} <input type="checkbox" name="duplicateCatalogs" value="Y" checked /> - ${uiLabelMap.ProductFeatures} <input type="checkbox" name="duplicateFeatures" value="Y" checked /> - ${uiLabelMap.PartyParties} <input type="checkbox" name="duplicateRoles" value="Y" checked /> - ${uiLabelMap.ProductAttributes} <input type="checkbox" name="duplicateAttributes" value="Y" checked /> + ${uiLabelMap.ProductProducts} <input type="checkbox" name="duplicateMembers" value="Y" checked="checked" /> + ${uiLabelMap.ProductCatalogs} <input type="checkbox" name="duplicateCatalogs" value="Y" checked="checked" /> + ${uiLabelMap.ProductFeatures} <input type="checkbox" name="duplicateFeatures" value="Y" checked="checked" /> + ${uiLabelMap.PartyParties} <input type="checkbox" name="duplicateRoles" value="Y" checked="checked" /> + ${uiLabelMap.ProductAttributes} <input type="checkbox" name="duplicateAttributes" value="Y" checked="checked" /> </div> </td></tr> </table> Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryContent.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryContent.ftl?rev=931700&r1=931699&r2=931700&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryContent.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryContent.ftl Wed Apr 7 21:50:56 2010 @@ -24,7 +24,7 @@ under the License. <form action="<@ofbizUrl>updateCategoryContent</@ofbizUrl>" method="post" style="margin: 0;" name="categoryForm"> <table cellspacing="0" class="basic-table"> <tr> - <td width="26%" align="right" class="label"><input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}">${uiLabelMap.ProductProductCategoryType}</td> + <td width="26%" align="right" class="label"><input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}" />${uiLabelMap.ProductProductCategoryType}</td> <td> </td> <td width="74%"> <select name="productCategoryTypeId" size="1"> @@ -58,14 +58,14 @@ under the License. <td width="26%" align="right" class="label">${uiLabelMap.ProductDetailScreen}</td> <td> </td> <td width="74%"> - <input type="text" <#if productCategory?has_content>value="${productCategory.detailScreen?if_exists}"</#if> name="detailScreen" size="60" maxlength="250"> + <input type="text" <#if productCategory?has_content>value="${productCategory.detailScreen?if_exists}"</#if> name="detailScreen" size="60" maxlength="250" /> <br /> <span class="tooltip">${uiLabelMap.ProductDefaultsTo} "categorydetail", ${uiLabelMap.ProductDetailScreenMessage}: "component://ecommerce/widget/CatalogScreens.xml#categorydetail"</span> </td> </tr> <tr> <td colspan="2"> </td> - <td><input type="submit" name="Update" value="${uiLabelMap.CommonUpdate}"></td> + <td><input type="submit" name="Update" value="${uiLabelMap.CommonUpdate}" /></td> <td colspan="3"> </td> </tr> </table> Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl?rev=931700&r1=931699&r2=931700&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl Wed Apr 7 21:50:56 2010 @@ -45,20 +45,20 @@ under the License. <form method="post" action="<@ofbizUrl>updateProductFeatureCatGrpAppl</@ofbizUrl>" name="lineFormGrp${line}"> <#assign hasExpired = false> <#if (productFeatureCatGrpAppl.getTimestamp("thruDate"))?exists && nowTimestamp.after(productFeatureCatGrpAppl.getTimestamp("thruDate"))> <#assign hasExpired = true></#if> - <input type="hidden" name="productCategoryId" value="${(productFeatureCatGrpAppl.productCategoryId)?if_exists}"> - <input type="hidden" name="productFeatureGroupId" value="${(productFeatureCatGrpAppl.productFeatureGroupId)?if_exists}"> - <input type="hidden" name="fromDate" value="${(productFeatureCatGrpAppl.fromDate)?if_exists}"> - <input type="text" size="25" name="thruDate" value="${(productFeatureCatGrpAppl.thruDate)?if_exists}" <#if hasExpired>style="color: red;"</#if>> + <input type="hidden" name="productCategoryId" value="${(productFeatureCatGrpAppl.productCategoryId)?if_exists}" /> + <input type="hidden" name="productFeatureGroupId" value="${(productFeatureCatGrpAppl.productFeatureGroupId)?if_exists}" /> + <input type="hidden" name="fromDate" value="${(productFeatureCatGrpAppl.fromDate)?if_exists}" /> + <input type="text" size="25" name="thruDate" value="${(productFeatureCatGrpAppl.thruDate)?if_exists}" <#if hasExpired>style="color: red;"</#if> /> <a href="javascript:call_cal(document.lineFormGrp${line}.thruDate, '${(productFeatureCatGrpAppl.thruDate)?default(nowTimestamp?string)}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> - <input type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;"> + <input type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;" /> </form> </td> <td align="center"> <a href="javascript:document.removeProductFeatureCatGrpApplForm_${productFeatureCatGrpAppl_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a> <form method="post" action="<@ofbizUrl>removeProductFeatureCatGrpAppl</@ofbizUrl>" name="removeProductFeatureCatGrpApplForm_${productFeatureCatGrpAppl_index}"> - <input type="hidden" name="productFeatureGroupId" value="${(productFeatureCatGrpAppl.productFeatureGroupId)?if_exists}"> - <input type="hidden" name="productCategoryId" value="${(productFeatureCatGrpAppl.productCategoryId)?if_exists}"> - <input type="hidden" name="fromDate" value="${productFeatureCatGrpAppl.getString("fromDate")}"> + <input type="hidden" name="productFeatureGroupId" value="${(productFeatureCatGrpAppl.productFeatureGroupId)?if_exists}" /> + <input type="hidden" name="productCategoryId" value="${(productFeatureCatGrpAppl.productCategoryId)?if_exists}" /> + <input type="hidden" name="fromDate" value="${productFeatureCatGrpAppl.getString("fromDate")}" /> </form> </td> </tr> @@ -80,15 +80,15 @@ under the License. <table cellspacing="0" class="basic-table"> <tr><td> <form method="post" action="<@ofbizUrl>createProductFeatureCatGrpAppl</@ofbizUrl>" style="margin: 0;" name="addNewGroupForm"> - <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}"> + <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}" /> <select name="productFeatureGroupId"> <#list productFeatureGroups as productFeatureGroup> <option value="${(productFeatureGroup.productFeatureGroupId)?if_exists}">${(productFeatureGroup.description)?if_exists} [${(productFeatureGroup.productFeatureGroupId)?if_exists}]</option> </#list> </select> - <input type="text" size="25" name="fromDate"> + <input type="text" size="25" name="fromDate" /> <a href="javascript:call_cal(document.addNewGroupForm.fromDate, '${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> - <input type="submit" value="${uiLabelMap.CommonAdd}"> + <input type="submit" value="${uiLabelMap.CommonAdd}" /> </form> </td></tr> </table> @@ -121,20 +121,20 @@ under the License. <form method="post" action="<@ofbizUrl>updateProductFeatureCategoryAppl</@ofbizUrl>" name="lineForm${line}"> <#assign hasExpired = false> <#if (productFeatureCategoryAppl.getTimestamp("thruDate"))?exists && nowTimestamp.after(productFeatureCategoryAppl.getTimestamp("thruDate"))> <#assign hasExpired = true></#if> - <input type="hidden" name="productCategoryId" value="${(productFeatureCategoryAppl.productCategoryId)?if_exists}"> - <input type="hidden" name="productFeatureCategoryId" value="${(productFeatureCategoryAppl.productFeatureCategoryId)?if_exists}"> - <input type="hidden" name="fromDate" value="${(productFeatureCategoryAppl.fromDate)?if_exists}"> - <input type="text" size="25" name="thruDate" value="${(productFeatureCategoryAppl.thruDate)?if_exists}" <#if hasExpired>style="color: red;"</#if>> + <input type="hidden" name="productCategoryId" value="${(productFeatureCategoryAppl.productCategoryId)?if_exists}" /> + <input type="hidden" name="productFeatureCategoryId" value="${(productFeatureCategoryAppl.productFeatureCategoryId)?if_exists}" /> + <input type="hidden" name="fromDate" value="${(productFeatureCategoryAppl.fromDate)?if_exists}" /> + <input type="text" size="25" name="thruDate" value="${(productFeatureCategoryAppl.thruDate)?if_exists}" <#if hasExpired>style="color: red;"</#if> /> <a href="javascript:call_cal(document.lineForm${line}.thruDate, '${(productFeatureCategoryAppl.thruDate)?default(nowTimestamp?string)}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> - <input type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;"> + <input type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;" /> </form> </td> <td align="center"> <a href="javascript:document.removeProductFeatureCategoryApplForm_${productFeatureCategoryAppl_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a> <form method="post" action="<@ofbizUrl>removeProductFeatureCategoryAppl</@ofbizUrl>" name="removeProductFeatureCategoryApplForm_${productFeatureCategoryAppl_index}"> - <input type="hidden" name="productFeatureCategoryId" value="${(productFeatureCategoryAppl.productFeatureCategoryId)?if_exists}"> - <input type="hidden" name="productCategoryId" value="${(productFeatureCategoryAppl.productCategoryId)?if_exists}"> - <input type="hidden" name="fromDate" value="${productFeatureCategoryAppl.getString("fromDate")}"> + <input type="hidden" name="productFeatureCategoryId" value="${(productFeatureCategoryAppl.productFeatureCategoryId)?if_exists}" /> + <input type="hidden" name="productCategoryId" value="${(productFeatureCategoryAppl.productCategoryId)?if_exists}" /> + <input type="hidden" name="fromDate" value="${productFeatureCategoryAppl.getString("fromDate")}" /> </form> </td> </tr> @@ -156,15 +156,15 @@ under the License. <table cellspacing="0" class="basic-table"> <tr><td> <form method="post" action="<@ofbizUrl>createProductFeatureCategoryAppl</@ofbizUrl>" style="margin: 0;" name="addNewCategoryForm"> - <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}"> + <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}" /> <select name="productFeatureCategoryId"> <#list productFeatureCategories as productFeatureCategory> <option value="${(productFeatureCategory.productFeatureCategoryId)?if_exists}">${(productFeatureCategory.description)?if_exists} [${(productFeatureCategory.productFeatureCategoryId)?if_exists}]</option> </#list> </select> - <input type="text" size="25" name="fromDate"> + <input type="text" size="25" name="fromDate" /> <a href="javascript:call_cal(document.addNewCategoryForm.fromDate, '${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> - <input type="submit" value="${uiLabelMap.CommonAdd}"> + <input type="submit" value="${uiLabelMap.CommonAdd}" /> </form> </td></tr> </table> Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryParties.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryParties.ftl?rev=931700&r1=931699&r2=931700&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryParties.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryParties.ftl Wed Apr 7 21:50:56 2010 @@ -43,27 +43,27 @@ under the License. <#if (productCategoryRole.getTimestamp("fromDate"))?exists && Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().before(productCategoryRole.getTimestamp("fromDate"))> <#assign hasntStarted = true></#if> <td <#if hasntStarted> style="color: red;"</#if>>${(productCategoryRole.fromDate)?if_exists}</td> <td align="center"> - <FORM method="post" action="<@ofbizUrl>updatePartyToCategory</@ofbizUrl>" name="lineForm_update${line}"> + <form method="post" action="<@ofbizUrl>updatePartyToCategory</@ofbizUrl>" name="lineForm_update${line}"> <#assign hasExpired = false> <#if (productCategoryRole.getTimestamp("thruDate"))?exists && (Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().after(productCategoryRole.getTimestamp("thruDate")))> <#assign hasExpired = true></#if> - <input type="hidden" name="productCategoryId" value="${(productCategoryRole.productCategoryId)?if_exists}"> - <input type="hidden" name="partyId" value="${(productCategoryRole.partyId)?if_exists}"> - <input type="hidden" name="roleTypeId" value="${(productCategoryRole.roleTypeId)?if_exists}"> - <input type="hidden" name="fromDate" value="${(productCategoryRole.getTimestamp("fromDate"))?if_exists}"> - <input type="text" size="25" name="thruDate" value="${(productCategoryRole. getTimestamp("thruDate"))?if_exists}" <#if hasExpired> style="color: red;"</#if>> + <input type="hidden" name="productCategoryId" value="${(productCategoryRole.productCategoryId)?if_exists}" /> + <input type="hidden" name="partyId" value="${(productCategoryRole.partyId)?if_exists}" /> + <input type="hidden" name="roleTypeId" value="${(productCategoryRole.roleTypeId)?if_exists}" /> + <input type="hidden" name="fromDate" value="${(productCategoryRole.getTimestamp("fromDate"))?if_exists}" /> + <input type="text" size="25" name="thruDate" value="${(productCategoryRole. getTimestamp("thruDate"))?if_exists}" <#if hasExpired> style="color: red;"</#if> /> <a href="javascript:call_cal(document.lineForm_update${line}.thruDate, '${(productCategoryRole.getTimestamp("thruDate"))?default(nowTimestamp?string)}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> - <INPUT type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;"> - </FORM> + <input type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;" /> + </form> </td> <td align="center"> - <FORM method="post" action="<@ofbizUrl>removePartyFromCategory</@ofbizUrl>" name="lineForm_delete${line}"> + <form method="post" action="<@ofbizUrl>removePartyFromCategory</@ofbizUrl>" name="lineForm_delete${line}"> <#assign hasExpired = false> - <input type="hidden" name="productCategoryId" value="${(productCategoryRole.productCategoryId)?if_exists}"> - <input type="hidden" name="partyId" value="${(productCategoryRole.partyId)?if_exists}"> - <input type="hidden" name="roleTypeId" value="${(productCategoryRole.roleTypeId)?if_exists}"> - <input type="hidden" name="fromDate" value="${(productCategoryRole.getTimestamp("fromDate"))?if_exists}"> + <input type="hidden" name="productCategoryId" value="${(productCategoryRole.productCategoryId)?if_exists}" /> + <input type="hidden" name="partyId" value="${(productCategoryRole.partyId)?if_exists}" /> + <input type="hidden" name="roleTypeId" value="${(productCategoryRole.roleTypeId)?if_exists}" /> + <input type="hidden" name="fromDate" value="${(productCategoryRole.getTimestamp("fromDate"))?if_exists}" /> <a href="javascript:document.lineForm_delete${line}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a> - </FORM> + </form> </td> </tr> <#-- toggle the row color --> @@ -85,16 +85,16 @@ under the License. <tr> <td> <form method="post" action="<@ofbizUrl>addPartyToCategory</@ofbizUrl>" style="margin: 0;" name="addNewForm"> - <input type="hidden" name="productCategoryId" value="${productCategoryId}"> - <input type="text" size="20" maxlength="20" name="partyId" value=""> + <input type="hidden" name="productCategoryId" value="${productCategoryId}" /> + <input type="text" size="20" maxlength="20" name="partyId" value="" /> <select name="roleTypeId" size="1"> <#list roleTypes as roleType> <option value="${(roleType.roleTypeId)?if_exists}" <#if roleType.roleTypeId.equals("_NA_")> ${uiLabelMap.ProductSelected}</#if>>${(roleType.get("description",locale))?if_exists}</option> </#list> </select> - <input type="text" size="25" name="fromDate"> + <input type="text" size="25" name="fromDate" /> <a href="javascript:call_cal(document.addNewForm.fromDate, '${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> - <input type="submit" value="${uiLabelMap.CommonAdd}"> + <input type="submit" value="${uiLabelMap.CommonAdd}" /> </form> </td> </tr> Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl?rev=931700&r1=931699&r2=931700&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl Wed Apr 7 21:50:56 2010 @@ -17,20 +17,20 @@ specific language governing permissions under the License. --> <#if activeOnly> - <a href="<@ofbizUrl>EditCategoryProducts?productCategoryId=${productCategoryId?if_exists}&activeOnly=false</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductActiveAndInactive}</a> + <a href="<@ofbizUrl>EditCategoryProducts?productCategoryId=${productCategoryId?if_exists}&activeOnly=false</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductActiveAndInactive}</a> <#else> - <a href="<@ofbizUrl>EditCategoryProducts?productCategoryId=${productCategoryId?if_exists}&activeOnly=true</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductActiveOnly}</a> + <a href="<@ofbizUrl>EditCategoryProducts?productCategoryId=${productCategoryId?if_exists}&activeOnly=true</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductActiveOnly}</a> </#if> <div class="screenlet"> <div class="screenlet-title-bar"> <#if (listSize > 0)> <div class="boxhead-right"> <#if (viewIndex > 1)> - <a href="<@ofbizUrl>EditCategoryProducts?productCategoryId=${productCategoryId?if_exists}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}&activeOnly=${activeOnly.toString()}</@ofbizUrl>" class="submenutext">${uiLabelMap.CommonPrevious}</a> | + <a href="<@ofbizUrl>EditCategoryProducts?productCategoryId=${productCategoryId?if_exists}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}&activeOnly=${activeOnly.toString()}</@ofbizUrl>" class="submenutext">${uiLabelMap.CommonPrevious}</a> | </#if> <span class="submenutextinfo">${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}</span> <#if (listSize > highIndex)> - | <a class="lightbuttontext" href="<@ofbizUrl>EditCategoryProducts?productCategoryId=${productCategoryId?if_exists}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}&activeOnly=${activeOnly.toString()}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonNext}</a> + | <a class="lightbuttontext" href="<@ofbizUrl>EditCategoryProducts?productCategoryId=${productCategoryId?if_exists}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}&activeOnly=${activeOnly.toString()}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonNext}</a> </#if> </div> @@ -54,7 +54,7 @@ under the License. <input type="hidden" name="VIEW_SIZE" value="${viewSize}"/> <input type="hidden" name="VIEW_INDEX" value="${viewIndex}"/> <input type="hidden" name="activeOnly" value="${activeOnly.toString()}"> - <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}"> + <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}" /> <#assign rowClass = "2"> <#assign rowCount = 0> <#list productCategoryMembers as productCategoryMember> @@ -73,13 +73,13 @@ under the License. </td> <td <#if hasntStarted> style="color: red;"</#if>>${(productCategoryMember.fromDate)?if_exists}</td> <td align="center"> - <input type="hidden" name="productId${suffix}" value="${(productCategoryMember.productId)?if_exists}"> - <input type="hidden" name="productCategoryId${suffix}" value="${(productCategoryMember.productCategoryId)?if_exists}"> - <input type="hidden" name="fromDate${suffix}" value="${(productCategoryMember.fromDate)?if_exists}"> - <input type="text" size="25" name="thruDate${suffix}" value="${(productCategoryMember.thruDate)?if_exists}" <#if hasExpired>style="color: red;"</#if>> + <input type="hidden" name="productId${suffix}" value="${(productCategoryMember.productId)?if_exists}" /> + <input type="hidden" name="productCategoryId${suffix}" value="${(productCategoryMember.productCategoryId)?if_exists}" /> + <input type="hidden" name="fromDate${suffix}" value="${(productCategoryMember.fromDate)?if_exists}" /> + <input type="text" size="25" name="thruDate${suffix}" value="${(productCategoryMember.thruDate)?if_exists}" <#if hasExpired>style="color: red;"</#if> /> <a href="javascript:call_cal(document.updateCategoryProductForm.thruDate${suffix}, '${(productCategoryMember.thruDate)?default(nowTimestamp?string)}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> - <input type="text" size="5" name="sequenceNum${suffix}" value="${(productCategoryMember.sequenceNum)?if_exists}"> - <input type="text" size="5" name="quantity${suffix}" value="${(productCategoryMember.quantity)?if_exists}"> + <input type="text" size="5" name="sequenceNum${suffix}" value="${(productCategoryMember.sequenceNum)?if_exists}" /> + <input type="text" size="5" name="quantity${suffix}" value="${(productCategoryMember.quantity)?if_exists}" /> <br /> <textarea name="comments${suffix}" rows="2" cols="40">${(productCategoryMember.comments)?if_exists}</textarea> </td> @@ -95,8 +95,8 @@ under the License. </#if> <tr valign="middle"> <td colspan="4" align="center"> - <input type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;"> - <input type="hidden" value="${productCategoryMembers.size()}" name="_rowCount"> + <input type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;" /> + <input type="hidden" value="${productCategoryMembers.size()}" name="_rowCount" /> </td> </tr> <#assign rowCount = rowCount + 1> @@ -107,7 +107,7 @@ under the License. <form name="deleteProductFromCategory_o_${rowCount}" method="post" action="<@ofbizUrl>removeCategoryProductMember</@ofbizUrl>"> <input type="hidden" name="VIEW_SIZE" value="${viewSize}"/> <input type="hidden" name="VIEW_INDEX" value="${viewIndex}"/> - <input type="hidden" name="productId" value="${(productCategoryMember.productId)?if_exists}"> + <input type="hidden" name="productId" value="${(productCategoryMember.productId)?if_exists}" /> <input type="hidden" name="productCategoryId" value="${(productCategoryMember.productCategoryId)?if_exists}"/> <input type="hidden" name="fromDate" value="${productCategoryMember.getString("fromDate")?if_exists}"/> <input type="hidden" name="activeOnly" value="${activeOnly.toString()}"/> @@ -121,11 +121,11 @@ under the License. <#if (listSize > 0)> <div class="boxhead-right"> <#if (viewIndex > 1)> - <a href="<@ofbizUrl>EditCategoryProducts?productCategoryId=${productCategoryId?if_exists}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}&activeOnly=${activeOnly.toString()}</@ofbizUrl>" class="submenutext">${uiLabelMap.CommonPrevious}</a> | + <a href="<@ofbizUrl>EditCategoryProducts?productCategoryId=${productCategoryId?if_exists}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}&activeOnly=${activeOnly.toString()}</@ofbizUrl>" class="submenutext">${uiLabelMap.CommonPrevious}</a> | </#if> <span class="submenutextinfo">${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}</span> <#if (listSize > highIndex)> - | <a class="lightbuttontext" href="<@ofbizUrl>EditCategoryProducts?productCategoryId=${productCategoryId?if_exists}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}&activeOnly=${activeOnly.toString()}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonNext}</a> + | <a class="lightbuttontext" href="<@ofbizUrl>EditCategoryProducts?productCategoryId=${productCategoryId?if_exists}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}&activeOnly=${activeOnly.toString()}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonNext}</a> </#if> </div> @@ -144,16 +144,16 @@ under the License. <table cellspacing="0" class="basic-table"> <tr><td> <form method="post" action="<@ofbizUrl>addCategoryProductMember</@ofbizUrl>" style="margin: 0;" name="addProductCategoryMemberForm"> - <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}"> - <input type="hidden" name="activeOnly" value="${activeOnly.toString()}"> + <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}" /> + <input type="hidden" name="activeOnly" value="${activeOnly.toString()}" /> <div> - <span class="label">${uiLabelMap.ProductProductId}</span> <input type="text" size="20" name="productId"> + <span class="label">${uiLabelMap.ProductProductId}</span> <input type="text" size="20" name="productId" /> <a href="javascript:call_fieldlookup2(document.addProductCategoryMemberForm.productId, 'LookupProduct');"><img src="<@ofbizContentUrl>/images/fieldlookup.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"></a> - <span class="label">${uiLabelMap.CommonFromDate}</span> <input type="text" size="22" name="fromDate"> + <span class="label">${uiLabelMap.CommonFromDate}</span> <input type="text" size="22" name="fromDate" /> <a href="javascript:call_cal(document.addProductCategoryMemberForm.fromDate, '${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> <br /> <span class="label">${uiLabelMap.CommonComments}</span> <textarea name="comments" rows="2" cols="40"></textarea> - <input type="submit" value="${uiLabelMap.CommonAdd}"> + <input type="submit" value="${uiLabelMap.CommonAdd}" /> </div> </form> </td></tr> @@ -168,14 +168,14 @@ under the License. <table cellspacing="0" class="basic-table"> <tr><td> <form method="post" action="<@ofbizUrl>copyCategoryProductMembers</@ofbizUrl>" style="margin: 0;" name="copyCategoryProductMembersForm"> - <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}"> - <input type="hidden" name="activeOnly" value="${activeOnly.toString()}"> + <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}" /> + <input type="hidden" name="activeOnly" value="${activeOnly.toString()}" /> <div> <span class="label">${uiLabelMap.ProductTargetProductCategory}</span> <input type="text" name="productCategoryIdTo" size="20" maxlength="20"/> <a href="javascript:call_fieldlookup2(document.copyCategoryProductMembersForm.productCategoryIdTo,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a> <br /> - <span class="label">${uiLabelMap.ProductOptionalFilterWithDate}</span> <input type="text" size="20" name="validDate"> + <span class="label">${uiLabelMap.ProductOptionalFilterWithDate}</span> <input type="text" size="20" name="validDate" /> <a href="javascript:call_cal(document.copyCategoryProductMembersForm.validDate, '${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> <br /> <span class="label">${uiLabelMap.ProductIncludeSubCategories}?</span> @@ -183,7 +183,7 @@ under the License. <option value="N">${uiLabelMap.CommonN}</option> <option value="Y">${uiLabelMap.CommonY}</option> </select> - <input type="submit" value="${uiLabelMap.CommonCopy}"> + <input type="submit" value="${uiLabelMap.CommonCopy}" /> </div> </form> </td></tr> @@ -198,12 +198,12 @@ under the License. <table cellspacing="0" class="basic-table"> <tr><td> <form method="post" action="<@ofbizUrl>expireAllCategoryProductMembers</@ofbizUrl>" style="margin: 0;" name="expireAllCategoryProductMembersForm"> - <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}"> - <input type="hidden" name="activeOnly" value="${activeOnly.toString()}"> + <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}" /> + <input type="hidden" name="activeOnly" value="${activeOnly.toString()}" /> <div> - <span class="label">${uiLabelMap.ProductOptionalExpirationDate}</span> <input type="text" size="20" name="thruDate"> + <span class="label">${uiLabelMap.ProductOptionalExpirationDate}</span> <input type="text" size="20" name="thruDate" /> <a href="javascript:call_cal(document.expireAllCategoryProductMembersForm.thruDate, '${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> - <input type="submit" value="${uiLabelMap.CommonExpireAll}"> + <input type="submit" value="${uiLabelMap.CommonExpireAll}" /> </div> </form> </td></tr> @@ -218,12 +218,12 @@ under the License. <table cellspacing="0" class="basic-table"> <tr><td> <form method="post" action="<@ofbizUrl>removeExpiredCategoryProductMembers</@ofbizUrl>" style="margin: 0;" name="removeExpiredCategoryProductMembersForm"> - <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}"> - <input type="hidden" name="activeOnly" value="${activeOnly.toString()}"> + <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}" /> + <input type="hidden" name="activeOnly" value="${activeOnly.toString()}" /> <div> - <span class="label">${uiLabelMap.ProductOptionalExpiredBeforeDate}</span> <input type="text" size="20" name="validDate"> + <span class="label">${uiLabelMap.ProductOptionalExpiredBeforeDate}</span> <input type="text" size="20" name="validDate" /> <a href="javascript:call_cal(document.removeExpiredCategoryProductMembersForm.validDate, '${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> - <input type="submit" value="${uiLabelMap.CommonRemoveExpired}"> + <input type="submit" value="${uiLabelMap.CommonRemoveExpired}" /> </div> </form> </td></tr> Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryRollup.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryRollup.ftl?rev=931700&r1=931699&r2=931700&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryRollup.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryRollup.ftl Wed Apr 7 21:50:56 2010 @@ -32,7 +32,7 @@ under the License. </tr> <#if currentProductCategoryRollups.size() != 0> <form method="post" action="<@ofbizUrl>updateProductCategoryToCategory</@ofbizUrl>" name="updateProductCategoryForm"> - <input type="hidden" name="showProductCategoryId" value="${productCategoryId}"> + <input type="hidden" name="showProductCategoryId" value="${productCategoryId}" /> <#assign rowClass = "2"> <#list currentProductCategoryRollups as productCategoryRollup> <#assign suffix = "_o_" + productCategoryRollup_index> @@ -45,13 +45,13 @@ under the License. <td><#if curCategory?has_content><a href="<@ofbizUrl>EditCategory?productCategoryId=${curCategory.productCategoryId}</@ofbizUrl>" class="buttontext">${curCategory.description?if_exists} [${curCategory.productCategoryId}]</a></#if></td> <td <#if hasntStarted>style="color: red;"</#if>>${productCategoryRollup.fromDate}</td> <td align="center"> - <input type="hidden" name="showProductCategoryId${suffix}" value="${productCategoryRollup.productCategoryId}"> - <input type="hidden" name="productCategoryId${suffix}" value="${productCategoryRollup.productCategoryId}"> - <input type="hidden" name="parentProductCategoryId${suffix}" value="${productCategoryRollup.parentProductCategoryId}"> - <input type="hidden" name="fromDate${suffix}" value="${productCategoryRollup.fromDate}"> - <input type="text" size="25" name="thruDate${suffix}" value="${productCategoryRollup.thruDate?if_exists}" <#if hasExpired>style="color: red"</#if>> + <input type="hidden" name="showProductCategoryId${suffix}" value="${productCategoryRollup.productCategoryId}" /> + <input type="hidden" name="productCategoryId${suffix}" value="${productCategoryRollup.productCategoryId}" /> + <input type="hidden" name="parentProductCategoryId${suffix}" value="${productCategoryRollup.parentProductCategoryId}" /> + <input type="hidden" name="fromDate${suffix}" value="${productCategoryRollup.fromDate}" /> + <input type="text" size="25" name="thruDate${suffix}" value="${productCategoryRollup.thruDate?if_exists}" <#if hasExpired>style="color: red"</#if> /> <a href="javascript:call_cal(document.updateProductCategoryForm.thruDate${suffix}, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> - <input type="text" size="5" name="sequenceNum${suffix}" value="${productCategoryRollup.sequenceNum?if_exists}"> + <input type="text" size="5" name="sequenceNum${suffix}" value="${productCategoryRollup.sequenceNum?if_exists}" /> </td> <td> <a href="javascript:document.removeProductCategoryFromCategory_${productCategoryRollup_index}.submit();" class="buttontext">${uiLabelMap.CommonDelete}</a> @@ -66,8 +66,8 @@ under the License. </#list> <tr valign="middle"> <td colspan="4" align="center"> - <input type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;"> - <input type="hidden" value="${currentProductCategoryRollups.size()}" name="_rowCount"> + <input type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;" /> + <input type="hidden" value="${currentProductCategoryRollups.size()}" name="_rowCount" /> </td> </tr> </form> @@ -96,13 +96,13 @@ under the License. <table cellspacing="0" class="basic-table"> <tr><td> <form method="post" action="<@ofbizUrl>addProductCategoryToCategory</@ofbizUrl>" style="margin: 0;" name="addParentForm"> - <input type="hidden" name="productCategoryId" value="${productCategoryId}"> - <input type="hidden" name="showProductCategoryId" value="${productCategoryId}"> + <input type="hidden" name="productCategoryId" value="${productCategoryId}" /> + <input type="hidden" name="showProductCategoryId" value="${productCategoryId}" /> <input type="text" name="parentProductCategoryId" size="20" maxlength="20" value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}"/> <a href="javascript:call_fieldlookup2(document.addParentForm.parentProductCategoryId,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a> - <input type="text" size="25" name="fromDate"> + <input type="text" size="25" name="fromDate" /> <a href="javascript:call_cal(document.addParentForm.fromDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> - <input type="submit" value="${uiLabelMap.CommonAdd}"> + <input type="submit" value="${uiLabelMap.CommonAdd}" /> </form> </td></tr> </table> @@ -122,7 +122,7 @@ under the License. </tr> <#if parentProductCategoryRollups.size() != 0> <form method="post" action="<@ofbizUrl>updateProductCategoryToCategory</@ofbizUrl>" name="updateProductCategoryToCategoryChild"> - <input type="hidden" name="showProductCategoryId" value="${productCategoryId}"> + <input type="hidden" name="showProductCategoryId" value="${productCategoryId}" /> <#assign lineChild = 0> <#assign rowClass = "2"> <#list parentProductCategoryRollups as productCategoryRollup> @@ -137,12 +137,12 @@ under the License. <td><#if curCategory?has_content><a href="<@ofbizUrl>EditCategory?productCategoryId=${curCategory.productCategoryId}</@ofbizUrl>" class="buttontext">${curCategory.description?if_exists} [${curCategory.productCategoryId}]</a></#if> <td <#if hasntStarted>style="color: red"</#if>>${productCategoryRollup.fromDate}</td> <td align="center"> - <input type="hidden" name="productCategoryId${suffix}" value="${productCategoryRollup.productCategoryId}"> - <input type="hidden" name="parentProductCategoryId${suffix}" value="${productCategoryRollup.parentProductCategoryId}"> - <input type="hidden" name="fromDate${suffix}" value="${productCategoryRollup.fromDate}"> - <input type="text" size="25" name="thruDate${suffix}" value="${productCategoryRollup.thruDate?if_exists}" <#if hasExpired>style="color: red;"</#if>> + <input type="hidden" name="productCategoryId${suffix}" value="${productCategoryRollup.productCategoryId}" /> + <input type="hidden" name="parentProductCategoryId${suffix}" value="${productCategoryRollup.parentProductCategoryId}" /> + <input type="hidden" name="fromDate${suffix}" value="${productCategoryRollup.fromDate}" /> + <input type="text" size="25" name="thruDate${suffix}" value="${productCategoryRollup.thruDate?if_exists}" <#if hasExpired>style="color: red;"</#if> /> <a href="javascript:call_cal(document.updateProductCategoryToCategoryChild.thruDate${suffix}, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> - <input type="text" size="5" name="sequenceNum${suffix}" value="${productCategoryRollup.sequenceNum?if_exists}"> + <input type="text" size="5" name="sequenceNum${suffix}" value="${productCategoryRollup.sequenceNum?if_exists}" /> </td> <td> <a href="javascript:document.removeProductCategoryFromCategory_1_${productCategoryRollup_index}.submit();" class="buttontext">${uiLabelMap.CommonDelete}</a> @@ -157,8 +157,8 @@ under the License. </#list> <tr valign="middle"> <td colspan="4" align="center"> - <input type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;"> - <input type="hidden" value="${lineChild}" name="_rowCount"> + <input type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;" /> + <input type="hidden" value="${lineChild}" name="_rowCount" /> </td> </tr> </form> @@ -187,13 +187,13 @@ under the License. <table cellspacing="0" class="basic-table"> <tr><td> <form method="post" action="<@ofbizUrl>addProductCategoryToCategory</@ofbizUrl>" style="margin: 0;" name="addChildForm"> - <input type="hidden" name="showProductCategoryId" value="${productCategoryId}"> - <input type="hidden" name="parentProductCategoryId" value="${productCategoryId}"> + <input type="hidden" name="showProductCategoryId" value="${productCategoryId}" /> + <input type="hidden" name="parentProductCategoryId" value="${productCategoryId}" /> <input type="text" name="productCategoryId" size="20" maxlength="20" value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}"/> <a href="javascript:call_fieldlookup2(document.addChildForm.productCategoryId,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a> - <input type="text" size="25" name="fromDate"> + <input type="text" size="25" name="fromDate" /> <a href="javascript:call_cal(document.addChildForm.fromDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> - <input type="submit" value="${uiLabelMap.CommonAdd}"> + <input type="submit" value="${uiLabelMap.CommonAdd}" /> </form> </td></tr> </table> Modified: ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryCheckExisting.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryCheckExisting.ftl?rev=931700&r1=931699&r2=931700&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryCheckExisting.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryCheckExisting.ftl Wed Apr 7 21:50:56 2010 @@ -58,7 +58,7 @@ under the License. <br /> <div class="screenlet-body"> <form name="createProductInCategoryForm" method="post" action="<@ofbizUrl>createProductInCategory</@ofbizUrl>" style="margin: 0;"> - <input type="hidden" name="productCategoryId" value="${productCategoryId}"> + <input type="hidden" name="productCategoryId" value="${productCategoryId}" /> <table cellspacing="0" class="basic-table"> <#list productFeatureAndTypeDatas?if_exists as productFeatureAndTypeData> <#assign productFeatureType = productFeatureAndTypeData.productFeatureType> Modified: ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryStart.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryStart.ftl?rev=931700&r1=931699&r2=931700&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryStart.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryStart.ftl Wed Apr 7 21:50:56 2010 @@ -28,7 +28,7 @@ under the License. </div> <div class="screenlet-body"> <form name="createProductInCategoryCheckExistingForm" method="post" action="<@ofbizUrl>CreateProductInCategoryCheckExisting</@ofbizUrl>" style="margin: 0;"> - <input type="hidden" name="productCategoryId" value="${productCategoryId}"> + <input type="hidden" name="productCategoryId" value="${productCategoryId}" /> <table cellspacing="0" class="basic-table"> <#list productFeaturesByTypeMap.keySet() as productFeatureTypeId> <#assign findPftMap = Static["org.ofbiz.base.util.UtilMisc"].toMap("productFeatureTypeId", productFeatureTypeId)> Modified: ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigItemContent.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigItemContent.ftl?rev=931700&r1=931699&r2=931700&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigItemContent.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigItemContent.ftl Wed Apr 7 21:50:56 2010 @@ -60,7 +60,7 @@ function insertImageName(size,nameValue) <td>${productContent.fromDate?default("N/A")}</td> <td>${productContent.thruDate?default("N/A")}</td> <td><a href="<@ofbizUrl>removeContentFromProductConfigItem?configItemId=${productContent.configItemId}&contentId=${productContent.contentId}&confItemContentTypeId=${productContent.confItemContentTypeId}&fromDate=${productContent.fromDate}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a></td> - <td><a href="/content/control/EditContent?contentId=${productContent.contentId}&externalLoginKey=${requestAttributes.externalLoginKey?if_exists}" class="buttontext">${uiLabelMap.ProductEditContent} ${entry.content.contentId}</td> + <td><a href="/content/control/EditContent?contentId=${productContent.contentId}&externalLoginKey=${requestAttributes.externalLoginKey?if_exists}" class="buttontext">${uiLabelMap.ProductEditContent} ${entry.content.contentId}</td> </tr> <#-- toggle the row color --> <#if rowClass == "2"> @@ -95,8 +95,8 @@ function insertImageName(size,nameValue) </div> <div class="screenlet-body"> <form action="<@ofbizUrl>updateProductConfigItemContent</@ofbizUrl>" method="post" style="margin: 0;" name="productForm"> + <input type="hidden" name="configItemId" value="${configItemId?if_exists}" /> <table cellspacing="0" class="basic-table"> - <input type="hidden" name="configItemId" value="${configItemId?if_exists}"> <tr> <td width="20%" align="right" valign="top" class="label">${uiLabelMap.CommonDescription}</td> <td> </td> @@ -120,7 +120,7 @@ function insertImageName(size,nameValue) </td> <td> </td> <td width="80%" colspan="4" valign="top"> - <input type="text" name="imageUrl" value="${(configItem.imageUrl)?default(imageNameSmall + '.jpg')}" size="60" maxlength="255"> + <input type="text" name="imageUrl" value="${(configItem.imageUrl)?default(imageNameSmall + '.jpg')}" size="60" maxlength="255" /> <#if configItemId?has_content> <div> <span class="label">${uiLabelMap.ProductInsertDefaultImageUrl}: </span> @@ -133,7 +133,7 @@ function insertImageName(size,nameValue) </tr> <tr> <td colspan="2"> </td> - <td><input type="submit" name="Update" value="${uiLabelMap.CommonUpdate}"></td> + <td><input type="submit" name="Update" value="${uiLabelMap.CommonUpdate}" /></td> <td colspan="3"> </td> </tr> </table> @@ -145,9 +145,9 @@ function insertImageName(size,nameValue) <h3>${uiLabelMap.ProductUploadImage}</h3> </div> <div class="screenlet-body"> - <form method="post" enctype="multipart/form-data" action="<@ofbizUrl>UploadProductConfigItemImage?configItemId=${configItemId}&upload_file_type=small</@ofbizUrl>" name="imageUploadForm"> - <input type="file" size="50" name="fname"> - <input type="submit" class="smallSubmit" value="${uiLabelMap.ProductUploadImage}"> + <form method="post" enctype="multipart/form-data" action="<@ofbizUrl>UploadProductConfigItemImage?configItemId=${configItemId}&upload_file_type=small</@ofbizUrl>" name="imageUploadForm"> + <input type="file" size="50" name="fname" /> + <input type="submit" class="smallSubmit" value="${uiLabelMap.ProductUploadImage}" /> </form> </div> </div> Modified: ofbiz/trunk/applications/product/webapp/catalog/feature/BulkAddFeature.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/feature/BulkAddFeature.ftl?rev=931700&r1=931699&r2=931700&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/feature/BulkAddFeature.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/feature/BulkAddFeature.ftl Wed Apr 7 21:50:56 2010 @@ -23,30 +23,30 @@ under the License. <div class="screenlet-body"> <table cellspacing="0" class="basic-table"> <form method='POST' action='<@ofbizUrl>BulkAddProductFeatures</@ofbizUrl>' name="selectAllForm"> - <input type="hidden" name="_useRowSubmit" value="Y"> - <input type="hidden" name="_checkGlobalScope" value="N"> - <input type="hidden" name="productFeatureCategoryId" value="${productFeatureCategoryId}"> + <input type="hidden" name="_useRowSubmit" value="Y" /> + <input type="hidden" name="_checkGlobalScope" value="N" /> + <input type="hidden" name="productFeatureCategoryId" value="${productFeatureCategoryId}" /> <tr class="header-row"> <td><b>${uiLabelMap.CommonDescription}</b></td> <td><b>${uiLabelMap.ProductFeatureType}</b></td> <td><b>${uiLabelMap.ProductIdSeqNum}</b></td> <td><b>${uiLabelMap.ProductIdCode}</b></td> - <td align="right"><b>${uiLabelMap.CommonAll}<input type="checkbox" name="selectAll" value="Y" checked="checked" onclick="javascript:toggleAll(this, 'selectAllForm');highlightAllRows(this, 'productFeatureTypeId_tableRow_', 'selectAllForm');"></td> + <td align="right"><b>${uiLabelMap.CommonAll}<input type="checkbox" name="selectAll" value="Y" checked="checked" onclick="javascript:toggleAll(this, 'selectAllForm');highlightAllRows(this, 'productFeatureTypeId_tableRow_', 'selectAllForm');" /></td> </tr> <#assign rowClass = "2"> <#list 0..featureNum-1 as feature> <tr id="productFeatureTypeId_tableRow_${feature_index}" valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> - <td><input type="text" size='15' name="description_o_${feature_index}"></td> + <td><input type="text" size='15' name="description_o_${feature_index}" /></td> <td><select name='productFeatureTypeId_o_${feature_index}' size="1"> <#list productFeatureTypes as productFeatureType> <option value='${productFeatureType.productFeatureTypeId}'>${productFeatureType.get("description",locale)?if_exists}</option> </#list> </select> - <input name='productFeatureCategoryId_o_${feature_index}' type="hidden" value="${productFeatureCategoryId}"> + <input name='productFeatureCategoryId_o_${feature_index}' type="hidden" value="${productFeatureCategoryId}" /> </td> - <td><input type="text" size='5' name="defaultSequenceNum_o_${feature_index}""></td> - <td><input type="text" size='5' name="idCode_o_${feature_index}"></td> - <td align="right"><input type="checkbox" name="_rowSubmit_o_${feature_index}" value="Y" checked="checked" onclick="javascript:checkToggle(this, 'selectAllForm');highlightRow(this,'productFeatureTypeId_tableRow_${feature_index}');"></td> + <td><input type="text" size='5' name="defaultSequenceNum_o_${feature_index}"" /></td> + <td><input type="text" size='5' name="idCode_o_${feature_index}" /></td> + <td align="right"><input type="checkbox" name="_rowSubmit_o_${feature_index}" value="Y" checked="checked" onclick="javascript:checkToggle(this, 'selectAllForm');highlightRow(this,'productFeatureTypeId_tableRow_${feature_index}');" /></td> </tr> <#-- toggle the row color --> <#if rowClass == "2"> @@ -55,7 +55,7 @@ under the License. <#assign rowClass = "2"> </#if> </#list> - <input type="hidden" name="_rowCount" value="${featureNum}"> + <input type="hidden" name="_rowCount" value="${featureNum}" /> <tr><td colspan="11" align="center"><input type="submit" value='${uiLabelMap.CommonCreate}'/></td></tr> </form> </table> Modified: ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl?rev=931700&r1=931699&r2=931700&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl Wed Apr 7 21:50:56 2010 @@ -28,11 +28,11 @@ under the License. <form action="<@ofbizUrl>QuickAddProductFeatures</@ofbizUrl>" method="post"> <div> ${uiLabelMap.CommonAdd} - <input type="text" name="featureNum" value="1" size="3"> + <input type="text" name="featureNum" value="1" size="3" /> ${uiLabelMap.ProductAddFeatureToCategory} - <input class="smallSubmit" type="submit" value="${uiLabelMap.CommonCreate}"> + <input class="smallSubmit" type="submit" value="${uiLabelMap.CommonCreate}" /> </div> - <input type="hidden" name="productFeatureCategoryId" value="${productFeatureCategoryId}"> + <input type="hidden" name="productFeatureCategoryId" value="${productFeatureCategoryId}" /> </form> <br /> </div> @@ -44,7 +44,7 @@ under the License. <div class="screenlet-body"> <#if (listSize > 0)> <#if productId?has_content> - <#assign productString = "&productId=" + productId> + <#assign productString = "&productId=" + productId> </#if> <table border="0" width="100%" cellpadding="2"> <tr> @@ -52,11 +52,11 @@ under the License. <span class="label"> <b> <#if (viewIndex > 0)> - <a href="<@ofbizUrl>EditFeatureCategoryFeatures?productFeatureCategoryId=${productFeatureCategoryId?if_exists}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}${productString?if_exists}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonPrevious}]</a> | + <a href="<@ofbizUrl>EditFeatureCategoryFeatures?productFeatureCategoryId=${productFeatureCategoryId?if_exists}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}${productString?if_exists}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonPrevious}]</a> | </#if> ${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize} <#if (listSize > highIndex)> - | <a href="<@ofbizUrl>EditFeatureCategoryFeatures?productFeatureCategoryId=${productFeatureCategoryId?if_exists}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}${productString?if_exists}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonNext}]</a> + | <a href="<@ofbizUrl>EditFeatureCategoryFeatures?productFeatureCategoryId=${productFeatureCategoryId?if_exists}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}${productString?if_exists}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonNext}]</a> </#if> </b> </span> @@ -67,9 +67,9 @@ under the License. <br /> <table cellspacing="0" class="basic-table"> <form method='POST' action='<@ofbizUrl>UpdateProductFeatureInCategory</@ofbizUrl>' name="selectAllForm"> - <input type="hidden" name="_useRowSubmit" value="Y"> - <input type="hidden" name="_checkGlobalScope" value="N"> - <input type="hidden" name="productFeatureCategoryId" value="${productFeatureCategoryId}"> + <input type="hidden" name="_useRowSubmit" value="Y" /> + <input type="hidden" name="_checkGlobalScope" value="N" /> + <input type="hidden" name="productFeatureCategoryId" value="${productFeatureCategoryId}" /> <tr class="header-row"> <td><b>${uiLabelMap.CommonId}</b></td> <td><b>${uiLabelMap.CommonDescription}</b></td> @@ -81,7 +81,7 @@ under the License. <td><b>${uiLabelMap.ProductIdSeqNum}</b></td> <td><b>${uiLabelMap.ProductIdCode}</b></td> <td><b>${uiLabelMap.ProductAbbrev}</b></td> - <td align="right"><b>${uiLabelMap.CommonAll}<input type="checkbox" name="selectAll" value="${uiLabelMap.CommonY}" onclick="javascript:toggleAll(this, 'selectAllForm');highlightAllRows(this, 'productFeatureId_tableRow_', 'selectAllForm');"></td> + <td align="right"><b>${uiLabelMap.CommonAll}<input type="checkbox" name="selectAll" value="${uiLabelMap.CommonY}" onclick="javascript:toggleAll(this, 'selectAllForm');highlightAllRows(this, 'productFeatureId_tableRow_', 'selectAllForm');" /></td> </tr> <#if (listSize > 0)> <#assign rowCount = 0> @@ -89,9 +89,9 @@ under the License. <#list productFeatures as productFeature> <#assign curProductFeatureType = productFeature.getRelatedOneCache("ProductFeatureType")> <tr id="productFeatureId_tableRow_${rowCount}" valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> - <input type="hidden" name="productFeatureId_o_${rowCount}" value="${productFeature.productFeatureId}"> + <input type="hidden" name="productFeatureId_o_${rowCount}" value="${productFeature.productFeatureId}" /> <td><a href="<@ofbizUrl>EditFeature?productFeatureId=${productFeature.productFeatureId}</@ofbizUrl>" class="buttontext">${productFeature.productFeatureId}</a></td> - <td><input type="text" size='15' name="description_o_${rowCount}" value="${productFeature.description}"></td> + <td><input type="text" size='15' name="description_o_${rowCount}" value="${productFeature.description}" /></td> <td><select name='productFeatureTypeId_o_${rowCount}' size="1"> <#if productFeature.productFeatureTypeId?has_content> <option value='${productFeature.productFeatureTypeId}'><#if curProductFeatureType?exists>${curProductFeatureType.get("description",locale)?if_exists}<#else> [${productFeature.productFeatureTypeId}]</#if></option> @@ -111,13 +111,13 @@ under the License. <option value='${productFeatureCategory.productFeatureCategoryId}'>${productFeatureCategory.get("description",locale)?if_exists} [${productFeatureCategory.productFeatureCategoryId}]</option> </#list> </select></td> - <td><input type="text" size='10' name="uomId_o_${rowCount}" value="${productFeature.uomId?if_exists}"></td> - <td><input type="text" size='5' name="numberSpecified_o_${rowCount}" value="${productFeature.numberSpecified?if_exists}"></td> - <td><input type="text" size='5' name="defaultAmount_o_${rowCount}" value="${productFeature.defaultAmount?if_exists}"></td> - <td><input type="text" size='5' name="defaultSequenceNum_o_${rowCount}" value="${productFeature.defaultSequenceNum?if_exists}"></td> - <td><input type="text" size='5' name="idCode_o_${rowCount}" value="${productFeature.idCode?if_exists}"></td> - <td><input type="text" size='5' name="abbrev_o_${rowCount}" value="${productFeature.abbrev?if_exists}"></td> - <td align="right"><input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');highlightRow(this,'productFeatureId_tableRow_${rowCount}');"></td> + <td><input type="text" size='10' name="uomId_o_${rowCount}" value="${productFeature.uomId?if_exists}" /></td> + <td><input type="text" size='5' name="numberSpecified_o_${rowCount}" value="${productFeature.numberSpecified?if_exists}" /></td> + <td><input type="text" size='5' name="defaultAmount_o_${rowCount}" value="${productFeature.defaultAmount?if_exists}" /></td> + <td><input type="text" size='5' name="defaultSequenceNum_o_${rowCount}" value="${productFeature.defaultSequenceNum?if_exists}" /></td> + <td><input type="text" size='5' name="idCode_o_${rowCount}" value="${productFeature.idCode?if_exists}" /></td> + <td><input type="text" size='5' name="abbrev_o_${rowCount}" value="${productFeature.abbrev?if_exists}" /></td> + <td align="right"><input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');highlightRow(this,'productFeatureId_tableRow_${rowCount}');" /></td> </tr> <#assign rowCount = rowCount + 1> <#-- toggle the row color --> @@ -127,7 +127,7 @@ under the License. <#assign rowClass = "2"> </#if> </#list> - <input type="hidden" name="_rowCount" value="${rowCount}"> + <input type="hidden" name="_rowCount" value="${rowCount}" /> <tr><td colspan="11" align="center"><input type="submit" value='${uiLabelMap.CommonUpdate}'/></td></tr> </form> </#if> Modified: ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureGroups.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureGroups.ftl?rev=931700&r1=931699&r2=931700&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureGroups.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureGroups.ftl Wed Apr 7 21:50:56 2010 @@ -33,10 +33,10 @@ under the License. <#list productFeatureGroups as productFeatureGroup> <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> <form method='POST' action='<@ofbizUrl>UpdateProductFeatureGroup</@ofbizUrl>'> - <input type='hidden' name="productFeatureGroupId" value="${productFeatureGroup.productFeatureGroupId}"> + <input type='hidden' name="productFeatureGroupId" value="${productFeatureGroup.productFeatureGroupId}" /> <td><a href='<@ofbizUrl>EditFeatureGroupAppls?productFeatureGroupId=${productFeatureGroup.productFeatureGroupId}</@ofbizUrl>' class="buttontext">${productFeatureGroup.productFeatureGroupId}</a></td> - <td><input type='text' size='30' name="description" value="${productFeatureGroup.description?if_exists}"></td> - <td><input type="submit" value="${uiLabelMap.CommonUpdate}"></td> + <td><input type='text' size='30' name="description" value="${productFeatureGroup.description?if_exists}" /></td> + <td><input type="submit" value="${uiLabelMap.CommonUpdate}" /></td> <td><a href='<@ofbizUrl>EditFeatureGroupAppls?productFeatureGroupId=${productFeatureGroup.productFeatureGroupId}</@ofbizUrl>' class="buttontext">${uiLabelMap.ProductFeatureGroupAppls}</a></td> </form> </tr> @@ -61,10 +61,10 @@ under the License. <table cellspacing="0" class="basic-table"> <tr> <td class="label">${uiLabelMap.CommonDescription}:</td> - <td><input type="text" size='30' name='description' value=''></td> + <td><input type="text" size='30' name='description' value='' /></td> </tr> <tr> - <td colspan='2'><input type="submit" value="${uiLabelMap.CommonCreate}"></td> + <td colspan='2'><input type="submit" value="${uiLabelMap.CommonCreate}" /></td> </tr> </table> </form> Modified: ofbiz/trunk/applications/product/webapp/catalog/find/FindProductById.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/FindProductById.ftl?rev=931700&r1=931699&r2=931700&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/find/FindProductById.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/find/FindProductById.ftl Wed Apr 7 21:50:56 2010 @@ -24,7 +24,7 @@ under the License. </div> <div class="screenlet-body"> <form name="idsearchform" method="post" action="<@ofbizUrl>FindProductById</@ofbizUrl>" style="margin: 0;"> - <span class="label">${uiLabelMap.CommonId} ${uiLabelMap.CommonValue}:</span> <input type="text" name="idValue" size="20" maxlength="50" value="${idValue?if_exists}"> <a href="javascript:document.idsearchform.submit()" class="buttontext">${uiLabelMap.CommonFind}</a> + <span class="label">${uiLabelMap.CommonId} ${uiLabelMap.CommonValue}:</span> <input type="text" name="idValue" size="20" maxlength="50" value="${idValue?if_exists}" /> <a href="javascript:document.idsearchform.submit()" class="buttontext">${uiLabelMap.CommonFind}</a> </form> <br /> <h1>${uiLabelMap.ProductSearchResultsWithIdValue}: ${idValue?if_exists}</h1> Modified: ofbiz/trunk/applications/product/webapp/catalog/find/advancedsearch.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/advancedsearch.ftl?rev=931700&r1=931699&r2=931700&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/find/advancedsearch.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/find/advancedsearch.ftl Wed Apr 7 21:50:56 2010 @@ -35,7 +35,7 @@ under the License. <td valign="middle"> <div> <b>"${(searchCategory.description)?if_exists}" [${(searchCategory.productCategoryId)?if_exists}]</b> ${uiLabelMap.ProductIncludeSubCategories}? - ${uiLabelMap.CommonYes}<input type="radio" name="SEARCH_SUB_CATEGORIES" value="Y" checked/> + ${uiLabelMap.CommonYes}<input type="radio" name="SEARCH_SUB_CATEGORIES" value="Y" checked="checked" /> ${uiLabelMap.CommonNo}<input type="radio" name="SEARCH_SUB_CATEGORIES" value="N"/> </div> </td> Modified: ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl?rev=931700&r1=931699&r2=931700&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl Wed Apr 7 21:50:56 2010 @@ -22,7 +22,7 @@ under the License. </div> <div class="screenlet-body"> <#list searchConstraintStrings as searchConstraintString> - <div> <a href="<@ofbizUrl>keywordsearch?removeConstraint=${searchConstraintString_index}&clearSearch=N</@ofbizUrl>" class="buttontext">X</a> ${searchConstraintString}</div> + <div> <a href="<@ofbizUrl>keywordsearch?removeConstraint=${searchConstraintString_index}&clearSearch=N</@ofbizUrl>" class="buttontext">X</a> ${searchConstraintString}</div> </#list> <span class="label">${uiLabelMap.CommonSortedBy}:</span>${searchSortOrderString} <div><a href="<@ofbizUrl>advancedsearch?SEARCH_CATEGORY_ID=${(requestParameters.SEARCH_CATEGORY_ID)?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRefineSearch}</a></div> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |