svn commit: r935309 [1/2] - in /ofbiz/trunk/applications/prod
Locked
svn commit: r935309 [1/2] - in /ofbiz/trunk/applications/prod
 
|
Author: buscob
Date: Sun Apr 18 07:00:37 2010 New Revision: 935309 URL: http://svn.apache.org/viewvc?rev=935309&view=rev Log: A slightly changed (tabs replaced with spaces) patch from Blas Rodriguez Somoza OFBIZ-3683 - XHTML validation errors round 2 (product) https://issues.apache.org/jira/browse/OFBIZ-3683 XHTML validation errors * Unclosed tags * attributes without values (checked, selected, disabled, etc) * attribute values without " * Uppercase tags or attributes. * Unencoded ampersands in urls. Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductQuickAdmin.groovy 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/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/keywordsearchactions.ftl ofbiz/trunk/applications/product/webapp/catalog/product/AddAdditionalImages.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/EditProductParties.ftl ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl ofbiz/trunk/applications/product/webapp/catalog/product/QuickAddVariants.ftl ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl ofbiz/trunk/applications/product/webapp/catalog/reviews/pendingReviews.ftl ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl ofbiz/trunk/applications/product/webapp/facility/facility/batchPrintMarkAsAccepted.ftl ofbiz/trunk/applications/product/webapp/facility/facility/searchInventoryItemsByLabelsForm.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/EditShipmentPackages.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.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/WeightPackage.ftl ofbiz/trunk/applications/product/widget/catalog/FacilityForms.xml ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductQuickAdmin.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductQuickAdmin.groovy?rev=935309&r1=935308&r2=935309&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductQuickAdmin.groovy (original) +++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductQuickAdmin.groovy Sun Apr 18 07:00:37 2010 @@ -218,9 +218,9 @@ if (product) { if (!salesThru) { salesthru = "[ ]"; } else if (salesThru.after(new java.util.Date())) { - salesthru = "<div style='color: blue'>[x]</div>"; + salesthru = "<span style='color: blue'>[x]</span>"; } else { - salesthru = "<div style='color: red'>[x]</div>"; + salesthru = "<span style='color: red'>[x]</span>"; } context.salesthru = salesthru; thrudate = ""; @@ -262,19 +262,19 @@ if (product) { } salesThru = assocProduct.getTimestamp("salesDiscontinuationDate"); if (!salesThru) { - featureSalesThru.put(assocProduct.productId, "<div style='color: blue'>[ ]</div>"); + featureSalesThru.put(assocProduct.productId, "<span style='color: blue'>[ ]</span>"); } else if (salesThru.after(new java.util.Date())) { - featureSalesThru.put(assocProduct.productId, "<div style='color: blue'>[x]</div>"); + featureSalesThru.put(assocProduct.productId, "<span style='color: blue'>[x]</span>"); } else { - featureSalesThru.put(assocProduct.productId, "<div style='color: red'>[x]</div>"); + featureSalesThru.put(assocProduct.productId, "<span style='color: red'>[x]</span>"); } java.sql.Timestamp thruDate = productAssoc.getTimestamp("thruDate"); if (!thruDate) { - featureThruDate.put(assocProduct.productId, "<div style='color: blue'>[ ]</div>"); + featureThruDate.put(assocProduct.productId, "<span style='color: blue'>[ ]</span>"); } else if (thruDate.after(new java.util.Date())) { - featureThruDate.put(assocProduct.productId, "<div style='color: blue'>[x]</div>"); + featureThruDate.put(assocProduct.productId, "<span style='color: blue'>[x]</span>"); } else { - featureThruDate.put(assocProduct.productId, "<div style='color: red'>[x]</div>"); + featureThruDate.put(assocProduct.productId, "<span style='color: red'>[x]</span>"); } prodFeaturesFiltered = EntityUtil.filterByAnd(assocProductFeatureAndAppls, [productFeatureTypeId : productFeatureTypeId]); 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=935309&r1=935308&r2=935309&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl Sun Apr 18 07:00:37 2010 @@ -114,7 +114,7 @@ function insertImageName(type,nameValue) <td width="20%" align="right" valign="top" class="label"> ${uiLabelMap.ProductCategoryImageUrl} <#if (productCategory.categoryImageUrl)?exists> - <a href="<@ofbizContentUrl>${(productCategory.categoryImageUrl)?if_exists}</@ofbizContentUrl>" target="_blank"><img alt="Category Image" src="<@ofbizContentUrl>${(productCategory.categoryImageUrl)?if_exists}</@ofbizContentUrl>" height="40" width="40"></a> + <a href="<@ofbizContentUrl>${(productCategory.categoryImageUrl)?if_exists}</@ofbizContentUrl>" target="_blank"><img alt="Category Image" src="<@ofbizContentUrl>${(productCategory.categoryImageUrl)?if_exists}</@ofbizContentUrl>" height="40" width="40" /></a> </#if> </td> <td> </td> @@ -134,7 +134,7 @@ function insertImageName(type,nameValue) <td width="20%" align="right" valign="top" class="label"> ${uiLabelMap.ProductLinkOneImageUrl} <#if (productCategory.linkOneImageUrl)?exists> - <a href="<@ofbizContentUrl>${(productCategory.linkOneImageUrl)?if_exists}</@ofbizContentUrl>" target="_blank"><img alt="Link One Image" src="<@ofbizContentUrl>${(productCategory.linkOneImageUrl)?if_exists}</@ofbizContentUrl>" height="40" width="40"></a> + <a href="<@ofbizContentUrl>${(productCategory.linkOneImageUrl)?if_exists}</@ofbizContentUrl>" target="_blank"><img alt="Link One Image" src="<@ofbizContentUrl>${(productCategory.linkOneImageUrl)?if_exists}</@ofbizContentUrl>" height="40" width="40" /></a> </#if> </td> <td> </td> @@ -154,7 +154,7 @@ function insertImageName(type,nameValue) <td width="20%" align="right" valign="top" class="label"> ${uiLabelMap.ProductLinkTwoImageUrl} <#if (productCategory.linkTwoImageUrl)?exists> - <a href="<@ofbizContentUrl>${(productCategory.linkTwoImageUrl)?if_exists}</@ofbizContentUrl>" target="_blank"><img alt="Link One Image" src="<@ofbizContentUrl>${(productCategory.linkTwoImageUrl)?if_exists}</@ofbizContentUrl>" height="40" width="40"></a> + <a href="<@ofbizContentUrl>${(productCategory.linkTwoImageUrl)?if_exists}</@ofbizContentUrl>" target="_blank"><img alt="Link One Image" src="<@ofbizContentUrl>${(productCategory.linkTwoImageUrl)?if_exists}</@ofbizContentUrl>" height="40" width="40" /></a> </#if> </td> <td> </td> @@ -230,9 +230,9 @@ function insertImageName(type,nameValue) <table cellspacing="0" class="basic-table"> <tr><td> ${uiLabelMap.ProductDuplicateProductCategorySelected}: - <input type=hidden name="oldProductCategoryId" value="${productCategoryId}"/> + <input type="hidden" name="oldProductCategoryId" value="${productCategoryId}"/> <div> - <input type="text" size="20" maxlength="20" name="productCategoryId"/> <input type=submit class="smallSubmit" value="${uiLabelMap.CommonGo}"/> + <input type="text" size="20" maxlength="20" name="productCategoryId"/> <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonGo}"/> </div> <div> <b>${uiLabelMap.CommonDuplicate}:</b> 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=935309&r1=935308&r2=935309&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryContent.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryContent.ftl Sun Apr 18 07:00:37 2010 @@ -30,7 +30,7 @@ under the License. <select name="productCategoryTypeId" size="1"> <option value=""> </option> <#list productCategoryTypes as productCategoryTypeData> - <option <#if productCategory?has_content><#if productCategory.productCategoryTypeId==productCategoryTypeData.productCategoryTypeId> selected</#if></#if> value="${productCategoryTypeData.productCategoryTypeId}">${productCategoryTypeData.get("description",locale)}</option> + <option <#if productCategory?has_content><#if productCategory.productCategoryTypeId==productCategoryTypeData.productCategoryTypeId> selected="selected"</#if></#if> value="${productCategoryTypeData.productCategoryTypeId}">${productCategoryTypeData.get("description",locale)}</option> </#list> </select> </td> 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=935309&r1=935308&r2=935309&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl Sun Apr 18 07:00:37 2010 @@ -29,7 +29,7 @@ under the License. <td><b>${uiLabelMap.ProductFeatureGroup}</b></td> <td><b>${uiLabelMap.CommonFromDateTime}</b></td> <td align="center"><b>${uiLabelMap.CommonThruDateTime}</b></td> - <td><b> </b></div></td> + <td><b> </b></td> </tr> <#assign line = 0> <#assign rowClass = "2"> @@ -49,7 +49,7 @@ under the License. <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> + <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;" /> </form> </td> @@ -77,6 +77,7 @@ under the License. <h3>${uiLabelMap.ProductApplyFeatureGroupFromCategory}</h3> </div> <div class="screenlet-body"> + <#if productFeatureGroups?has_content> <table cellspacing="0" class="basic-table"> <tr><td> <form method="post" action="<@ofbizUrl>createProductFeatureCatGrpAppl</@ofbizUrl>" style="margin: 0;" name="addNewGroupForm"> @@ -87,11 +88,14 @@ under the License. </#list> </select> <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> + <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}" /> </form> </td></tr> </table> + <#else> + + </#if> </div> </div> <div class="screenlet"> @@ -125,7 +129,7 @@ under the License. <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> + <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;" /> </form> </td> @@ -163,7 +167,7 @@ under the License. </#list> </select> <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> + <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}" /> </form> </td></tr> 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=935309&r1=935308&r2=935309&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryParties.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryParties.ftl Sun Apr 18 07:00:37 2010 @@ -51,7 +51,7 @@ under the License. <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> + <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> </td> @@ -89,11 +89,11 @@ under the License. <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> + <option value="${(roleType.roleTypeId)?if_exists}" <#if roleType.roleTypeId.equals("_NA_")> selected="selected"</#if>>${(roleType.get("description",locale))?if_exists}</option> </#list> </select> <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> + <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}" /> </form> </td> 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=935309&r1=935308&r2=935309&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl Sun Apr 18 07:00:37 2010 @@ -53,7 +53,7 @@ under the License. <form method="post" action="<@ofbizUrl>updateCategoryProductMember</@ofbizUrl>" name="updateCategoryProductForm"> <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="activeOnly" value="${activeOnly.toString()}" /> <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}" /> <#assign rowClass = "2"> <#assign rowCount = 0> @@ -67,7 +67,7 @@ under the License. <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> <td> <#if (product.smallImageUrl)?exists> - <a href="<@ofbizUrl>EditProduct?productId=${(productCategoryMember.productId)?if_exists}</@ofbizUrl>"><img alt="Small Image" src="<@ofbizContentUrl>${product.smallImageUrl}</@ofbizContentUrl>" height="40" width="40" align="middle"></a> + <a href="<@ofbizUrl>EditProduct?productId=${(productCategoryMember.productId)?if_exists}</@ofbizUrl>"><img alt="Small Image" src="<@ofbizContentUrl>${product.smallImageUrl}</@ofbizContentUrl>" height="40" width="40" align="middle" /></a> </#if> <a href="<@ofbizUrl>EditProduct?productId=${(productCategoryMember.productId)?if_exists}</@ofbizUrl>" class="buttontext"><#if product?exists>${(product.internalName)?if_exists}</#if> [${(productCategoryMember.productId)?if_exists}]</a> </td> @@ -77,7 +77,7 @@ under the License. <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> + <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}" /> <br /> @@ -147,10 +147,11 @@ under the License. <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}" /> <input type="hidden" name="activeOnly" value="${activeOnly.toString()}" /> <div> - <span class="label">${uiLabelMap.ProductProductId}</span> + <span class="label">${uiLabelMap.ProductProductId}</span> <@htmlTemplate.lookupField formName="addProductCategoryMemberForm" name="productId" id="productId" fieldFormName="LookupProduct"/> + <br/> <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> + <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}" /> @@ -175,7 +176,7 @@ under the License. <@htmlTemplate.lookupField formName="copyCategoryProductMembersForm" name="productCategoryIdTo" id="productCategoryIdTo" fieldFormName="LookupProductCategory"/> <br /> <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> + <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> <select name="recurse"> @@ -201,7 +202,7 @@ under the License. <input type="hidden" name="activeOnly" value="${activeOnly.toString()}" /> <div> <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> + <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}" /> </div> </form> @@ -221,7 +222,7 @@ under the License. <input type="hidden" name="activeOnly" value="${activeOnly.toString()}" /> <div> <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> + <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}" /> </div> </form> 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=935309&r1=935308&r2=935309&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryRollup.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryRollup.ftl Sun Apr 18 07:00:37 2010 @@ -50,7 +50,7 @@ under the License. <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> + <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}" /> </td> <td> @@ -100,7 +100,7 @@ under the License. <input type="hidden" name="showProductCategoryId" value="${productCategoryId}" /> <@htmlTemplate.lookupField value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}" formName="addParentForm" name="parentProductCategoryId" id="parentProductCategoryId" fieldFormName="LookupProductCategory"/> <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> + <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}" /> </form> </td></tr> @@ -140,7 +140,7 @@ under the License. <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> + <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}" /> </td> <td> @@ -190,7 +190,7 @@ under the License. <input type="hidden" name="parentProductCategoryId" value="${productCategoryId}" /> <@htmlTemplate.lookupField value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}" formName="addChildForm" name="productCategoryId" id="productCategoryId" fieldFormName="LookupProductCategory"/> <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> + <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}" /> </form> </td></tr> 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=935309&r1=935308&r2=935309&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigItemContent.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigItemContent.ftl Sun Apr 18 07:00:37 2010 @@ -115,7 +115,7 @@ function insertImageName(size,nameValue) <td width="20%" align="right" valign="top" class="label"> ${uiLabelMap.ProductSmallImage} <#if (configItem.imageUrl)?exists> - <a href="<@ofbizContentUrl>${configItem.imageUrl}</@ofbizContentUrl>" target="_blank"><img alt="Image" src="<@ofbizContentUrl>${configItem.imageUrl}</@ofbizContentUrl>" height="40" width="40"></a> + <a href="<@ofbizContentUrl>${configItem.imageUrl}</@ofbizContentUrl>" target="_blank"><img alt="Image" src="<@ofbizContentUrl>${configItem.imageUrl}</@ofbizContentUrl>" height="40" width="40" /></a> </#if> </td> <td> </td> 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=935309&r1=935308&r2=935309&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/feature/BulkAddFeature.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/feature/BulkAddFeature.ftl Sun Apr 18 07:00:37 2010 @@ -22,7 +22,7 @@ under the License. </div> <div class="screenlet-body"> <table cellspacing="0" class="basic-table"> - <form method='POST' action='<@ofbizUrl>BulkAddProductFeatures</@ofbizUrl>' name="selectAllForm"> + <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}" /> 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=935309&r1=935308&r2=935309&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl Sun Apr 18 07:00:37 2010 @@ -24,7 +24,7 @@ under the License. <div class="button-bar"> <a href="<@ofbizUrl>CreateFeature?productFeatureCategoryId=${productFeatureCategoryId?if_exists}</@ofbizUrl>" class="buttontext create">${uiLabelMap.ProductCreateNewFeature}</a> </div> - <br> + <br/> <form action="<@ofbizUrl>QuickAddProductFeatures</@ofbizUrl>" method="post"> <div> ${uiLabelMap.CommonAdd} @@ -65,11 +65,11 @@ under the License. </table> </#if> <br /> + <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}" /> <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}" /> <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');" /></b></td> </tr> <#if (listSize > 0)> <#assign rowCount = 0> @@ -89,8 +89,8 @@ 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}" /> - <td><a href="<@ofbizUrl>EditFeature?productFeatureId=${productFeature.productFeatureId}</@ofbizUrl>" class="buttontext">${productFeature.productFeatureId}</a></td> + <td><input type="hidden" name="productFeatureId_o_${rowCount}" value="${productFeature.productFeatureId}" /> + <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><select name='productFeatureTypeId_o_${rowCount}' size="1"> <#if productFeature.productFeatureTypeId?has_content> @@ -127,10 +127,11 @@ under the License. <#assign rowClass = "2"> </#if> </#list> + <tr><td colspan="11" align="center"> <input type="hidden" name="_rowCount" value="${rowCount}" /> - <tr><td colspan="11" align="center"><input type="submit" value='${uiLabelMap.CommonUpdate}'/></td></tr> - </form> + <input type="submit" value='${uiLabelMap.CommonUpdate}'/></td></tr> </#if> </table> + </form> </div> </div> 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=935309&r1=935308&r2=935309&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureGroups.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureGroups.ftl Sun Apr 18 07:00:37 2010 @@ -32,13 +32,15 @@ under the License. <#assign rowClass = "2"> <#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}" /> <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> + <form method='post' action='<@ofbizUrl>UpdateProductFeatureGroup</@ofbizUrl>'> + <input type='hidden' name="productFeatureGroupId" value="${productFeatureGroup.productFeatureGroupId}" /> + <input type='text' size='30' name="description" value="${productFeatureGroup.description?if_exists}" /> + <input type="submit" value="${uiLabelMap.CommonUpdate}" /> + </form> + </td> <td><a href='<@ofbizUrl>EditFeatureGroupAppls?productFeatureGroupId=${productFeatureGroup.productFeatureGroupId}</@ofbizUrl>' class="buttontext">${uiLabelMap.ProductFeatureGroupAppls}</a></td> - </form> </tr> <#-- toggle the row color --> <#if rowClass == "2"> Modified: ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchactions.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchactions.ftl?rev=935309&r1=935308&r2=935309&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchactions.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchactions.ftl Sun Apr 18 07:00:37 2010 @@ -42,7 +42,7 @@ under the License. <form method="post" action="<@ofbizUrl>searchExpireFromCategory</@ofbizUrl>" name="searchExpireFromCategory"> <span class="label">${uiLabelMap.ProductExpireResultsFrom} ${uiLabelMap.ProductCategory}:</span> <@htmlTemplate.lookupField formName="searchExpireFromCategory" name="SE_SEARCH_CATEGORY_ID" id="SE_SEARCH_CATEGORY_ID" fieldFormName="LookupProductCategory"/> - <span class="label">${uiLabelMap.CommonThru}</span><input type="text" size="25" name="thruDate" /><a href="javascript:call_cal(document.searchExpireFromCategory.thruDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> + <span class="label">${uiLabelMap.CommonThru}</span><input type="text" size="25" name="thruDate" /><a href="javascript:call_cal(document.searchExpireFromCategory.thruDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a> <input type="hidden" name="clearSearch" value="N" /> <input type="submit" value="${uiLabelMap.CommonExpire}" class="smallSubmit" /> <br /> @@ -55,7 +55,7 @@ under the License. <form method="post" action="<@ofbizUrl>searchAddToCategory</@ofbizUrl>" name="searchAddToCategory"> <span class="label">${uiLabelMap.ProductAddResultsTo} ${uiLabelMap.ProductCategory}:</span> <@htmlTemplate.lookupField formName="searchAddToCategory" name="SE_SEARCH_CATEGORY_ID" id="SE_SEARCH_CATEGORY_ID" fieldFormName="LookupProductCategory"/> - <span class="label">${uiLabelMap.CommonFrom}</span><input type="text" size="25" name="fromDate" /><a href="javascript:call_cal(document.searchAddToCategory.fromDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> + <span class="label">${uiLabelMap.CommonFrom}</span><input type="text" size="25" name="fromDate" /><a href="javascript:call_cal(document.searchAddToCategory.fromDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a> <input type="hidden" name="clearSearch" value="N" /> <input type="submit" value="${uiLabelMap.ProductAddToCategory}" class="smallSubmit" /> <br /> @@ -68,8 +68,8 @@ under the License. <form method="post" action="<@ofbizUrl>searchAddFeature</@ofbizUrl>" name="searchAddFeature"> <span class="label">${uiLabelMap.ProductAddFeatureToResults}:</span><br /> <span class="label">${uiLabelMap.ProductFeatureId}</span><input type="text" size="10" name="productFeatureId" value="" /> - <span class="label">${uiLabelMap.CommonFrom}</span><input type="tex"t size="25" name="fromDate" /><a href="javascript:call_cal(document.searchAddFeature.fromDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> - <span class="label">${uiLabelMap.CommonThru}</span><input type="text" size="25" name="thruDate" /><a href="javascript:call_cal(document.searchAddFeature.thruDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> + <span class="label">${uiLabelMap.CommonFrom}</span><input type="tex"t size="25" name="fromDate" /><a href="javascript:call_cal(document.searchAddFeature.fromDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a> + <span class="label">${uiLabelMap.CommonThru}</span><input type="text" size="25" name="thruDate" /><a href="javascript:call_cal(document.searchAddFeature.thruDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a> <br /> <span class="label">${uiLabelMap.CommonAmount}</span><input type="text" size="5" name="amount" value="" /> <span class="label">${uiLabelMap.CommonSequence}</span><input type="text" size="5" name="sequenceNum" value="" /> Modified: ofbiz/trunk/applications/product/webapp/catalog/product/AddAdditionalImages.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/AddAdditionalImages.ftl?rev=935309&r1=935308&r2=935309&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/AddAdditionalImages.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/AddAdditionalImages.ftl Sun Apr 18 07:00:37 2010 @@ -27,19 +27,19 @@ under the License. <table> <tbody> <tr> - <td><#if productAdditionalImage1?has_content><a href="javascript:void(0);" swapDetail="<@ofbizContentUrl>${productAdditionalImage1}</@ofbizContentUrl>"><img src="<@ofbizContentUrl>${productAdditionalImage1}</@ofbizContentUrl>" height="50" width="50"/></a></#if></td> + <td><#if productAdditionalImage1?has_content><a href="javascript:void(0);" swapDetail="<@ofbizContentUrl>${productAdditionalImage1}</@ofbizContentUrl>"><img src="<@ofbizContentUrl>${productAdditionalImage1}</@ofbizContentUrl>" height="50" width="50" alt="" /></a></#if></td> <td><input id="additionalImageOne" type="file" size="20" name="additionalImageOne" /></td> </tr> <tr> - <td><#if productAdditionalImage2?has_content><a href="javascript:void(0);" swapDetail="<@ofbizContentUrl>${productAdditionalImage2}</@ofbizContentUrl>" ><img src="<@ofbizContentUrl>${productAdditionalImage2}</@ofbizContentUrl>" height="50" width="50" /></a></#if></td> + <td><#if productAdditionalImage2?has_content><a href="javascript:void(0);" swapDetail="<@ofbizContentUrl>${productAdditionalImage2}</@ofbizContentUrl>" ><img src="<@ofbizContentUrl>${productAdditionalImage2}</@ofbizContentUrl>" height="50" width="50" alt="" /></a></#if></td> <td><input type="file" size="20" name="additionalImageTwo" /></td> </tr> <tr> - <td><#if productAdditionalImage3?has_content><a href="javascript:void(0);" swapDetail="<@ofbizContentUrl>${productAdditionalImage3}</@ofbizContentUrl>"><img src="<@ofbizContentUrl>${productAdditionalImage3}</@ofbizContentUrl>" height="50" width="50" /></a></#if></td> + <td><#if productAdditionalImage3?has_content><a href="javascript:void(0);" swapDetail="<@ofbizContentUrl>${productAdditionalImage3}</@ofbizContentUrl>"><img src="<@ofbizContentUrl>${productAdditionalImage3}</@ofbizContentUrl>" height="50" width="50" alt="" /></a></#if></td> <td><input type="file" size="20" name="additionalImageThree" /></td> </tr> <tr> - <td><#if productAdditionalImage4?has_content><a href="javascript:void(0);" swapDetail="<@ofbizContentUrl>${productAdditionalImage4}</@ofbizContentUrl>"><img src="<@ofbizContentUrl>${productAdditionalImage4}</@ofbizContentUrl>" height="50" width="50" /></a></#if></td> + <td><#if productAdditionalImage4?has_content><a href="javascript:void(0);" swapDetail="<@ofbizContentUrl>${productAdditionalImage4}</@ofbizContentUrl>"><img src="<@ofbizContentUrl>${productAdditionalImage4}</@ofbizContentUrl>" height="50" width="50" alt="" /></a></#if></td> <td><input type="file" size="20" name="additionalImageFour" /></td> </tr> <tr> @@ -49,7 +49,7 @@ under the License. </tbody> </table> <div class="right" style='margin-top:-250px;'> - <a href="javascript:void(0);"><img id="detailImage" name="mainImage" vspace="5" hspace="5" width="150" height="150" style='margin-left:50px'/></a> + <a href="javascript:void(0);"><img id="detailImage" name="mainImage" vspace="5" hspace="5" width="150" height="150" style='margin-left:50px' src="" alt="" /></a> <input type="hidden" id="originalImage" name="originalImage" /> </div> </form> Modified: ofbiz/trunk/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl?rev=935309&r1=935308&r2=935309&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl Sun Apr 18 07:00:37 2010 @@ -80,12 +80,12 @@ under the License. <td> <select name="productFeatureApplTypeId_o_${rowCount}" size="1"> <#list productFeatureApplTypes as productFeatureApplType> - <option value="${productFeatureApplType.productFeatureApplTypeId}" <#if (selectedFeatureApplTypeId?has_content) && (productFeatureApplType.productFeatureApplTypeId == selectedFeatureApplTypeId)>selected</#if>>${productFeatureApplType.get("description", locale)}</option> + <option value="${productFeatureApplType.productFeatureApplTypeId}" <#if (selectedFeatureApplTypeId?has_content) && (productFeatureApplType.productFeatureApplTypeId == selectedFeatureApplTypeId)>selected="selected"</#if>>${productFeatureApplType.get("description", locale)}</option> </#list> </select> </td> - <td><input type="text" size="25" name="fromDate_o_${rowCount}" /><a href="javascript:call_cal(document.selectAllForm.fromDate_o_${rowCount}, '${nowTimestampString}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a></td> - <td><input type="text" size="25" name="thruDate_o_${rowCount}" /><a href="javascript:call_cal(document.selectAllForm.thruDate_o_${rowCount}, '${nowTimestampString}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a></td> + <td><input type="text" size="25" name="fromDate_o_${rowCount}" /><a href="javascript:call_cal(document.selectAllForm.fromDate_o_${rowCount}, '${nowTimestampString}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a></td> + <td><input type="text" size="25" name="thruDate_o_${rowCount}" /><a href="javascript:call_cal(document.selectAllForm.thruDate_o_${rowCount}, '${nowTimestampString}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a></td> <td><input type="text" size="6" name="amount_o_${rowCount}" value="${productFeature.defaultAmount?if_exists}" /></td> <td><input type="text" size="5" name="sequenceNum_o_${rowCount}" value="${productFeature.defaultSequenceNum?if_exists}" /></td> <td align="right"> Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl?rev=935309&r1=935308&r2=935309&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl Sun Apr 18 07:00:37 2010 @@ -23,12 +23,12 @@ under the License. <div class="screenlet-body"> <form action="<@ofbizUrl>UpdateProductAssoc</@ofbizUrl>" method="post" style="margin: 0;" name="editProductAssocForm"> <input type="hidden" name="productId" value="${productId?if_exists}" /> - <table cellspacing="0" class="basic-table"> <#if !(productAssoc?exists)> <#if productId?exists && productIdTo?exists && productAssocTypeId?exists && fromDate?exists> <div><b><#assign uiLabelWithVar=uiLabelMap.ProductAssociationNotFound?interpret><@uiLabelWithVar/></b></div> <input type="hidden" name="UPDATE_MODE" value="CREATE" /> + <table cellspacing="0" class="basic-table"> <tr> <td align="right" class="label">${uiLabelMap.ProductProductId}</td> <td> </td> @@ -47,7 +47,7 @@ under the License. <#if productAssocTypeId?has_content> <#assign curAssocType = delegator.findByPrimaryKey("ProductAssocType", Static["org.ofbiz.base.util.UtilMisc"].toMap("productAssocTypeId", productAssocTypeId))> <#if curAssocType?exists> - <option selected value="${(curAssocType.productAssocTypeId)?if_exists}">${(curAssocType.get("description",locale))?if_exists}</option> + <option selected="selected" value="${(curAssocType.productAssocTypeId)?if_exists}">${(curAssocType.get("description",locale))?if_exists}</option> <option value="${(curAssocType.productAssocTypeId)?if_exists}"></option> </#if> </#if> @@ -63,13 +63,14 @@ under the License. <td> <div> <input type="text" name="FROM_DATE" size="25" maxlength="40" value="${fromDate?if_exists}" /> - <a href="javascript:call_cal(document.editProductAssocForm.FROM_DATE, '${fromDate?default(nowTimestampString)}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> + <a href="javascript:call_cal(document.editProductAssocForm.FROM_DATE, '${fromDate?default(nowTimestampString)}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a> ${uiLabelMap.CommonSetNowEmpty} </div> </td> </tr> <#else> <input type="hidden" name="UPDATE_MODE" value="CREATE" /> + <table cellspacing="0" class="basic-table"> <tr> <td align="right" class="label">${uiLabelMap.ProductProductId}</td> <td> </td> @@ -87,7 +88,7 @@ under the License. <td> </td> <td> <select name="PRODUCT_ASSOC_TYPE_ID" size="1"> - <-- <option value=""> </option> --> + <!-- <option value=""> </option> --> <#list assocTypes as assocType> <option value="${(assocType.productAssocTypeId)?if_exists}">${(assocType.get("description",locale))?if_exists}</option> </#list> @@ -100,7 +101,7 @@ under the License. <td> <div> <input type="text" name="FROM_DATE" size="25" maxlength="40" value="" /> - <a href="javascript:call_cal(document.editProductAssocForm.FROM_DATE, '${nowTimestampString}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> + <a href="javascript:call_cal(document.editProductAssocForm.FROM_DATE, '${nowTimestampString}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a> ${uiLabelMap.CommonSetNowEmpty} </div> </td> @@ -114,6 +115,7 @@ under the License. <input type="hidden" name="PRODUCT_ID_TO" value="${productIdTo?if_exists}" /> <input type="hidden" name="PRODUCT_ASSOC_TYPE_ID" value="${productAssocTypeId?if_exists}" /> <input type="hidden" name="FROM_DATE" value="${fromDate?if_exists}" /> + <table cellspacing="0" class="basic-table"> <tr> <td align="right" class="label">${uiLabelMap.ProductProductId}</td> <td> </td> @@ -141,7 +143,7 @@ under the License. <td width="74%"> <div> <input type="text" name="THRU_DATE" <#if useValues> value="${productAssoc.thruDate?if_exists}"<#else>value="${(request.getParameter("THRU_DATE"))?if_exists}"</#if> size="30" maxlength="30" /> - <a href="javascript:call_cal(document.editProductAssocForm.THRU_DATE, <#if useValues>'${productAssoc.thruDate?if_exists}'<#elseif (request.getParameter("THRU_DATE"))?exists>'${request.getParameter("THRU_DATE")}'<#else>'${nowTimestampString}'</#if>);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> + <a href="javascript:call_cal(document.editProductAssocForm.THRU_DATE, <#if useValues>'${productAssoc.thruDate?if_exists}'<#elseif (request.getParameter("THRU_DATE"))?exists>'${request.getParameter("THRU_DATE")}'<#else>'${nowTimestampString}'</#if>);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a> </div> </td> </tr> Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductFeatures.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductFeatures.ftl?rev=935309&r1=935308&r2=935309&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductFeatures.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductFeatures.ftl Sun Apr 18 07:00:37 2010 @@ -41,11 +41,12 @@ under the License. <#assign curProductFeatureType = productFeatureAndAppl.getRelatedOneCache("ProductFeatureType")> <#assign curProductFeatureApplType = productFeatureAndAppl.getRelatedOneCache("ProductFeatureApplType")> <#assign curProductFeatureCategory = (productFeatureAndAppl.getRelatedOneCache("ProductFeatureCategory")?if_exists)> - <tr id="productFeatureId_tableRow_${productFeatureAndAppl_index}" valign="middle"<#if rowClass == "1"> class="alternate-row"</#if> /> + <tr id="productFeatureId_tableRow_${productFeatureAndAppl_index}" valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> + <td> <input type="hidden" name="productId_o_${productFeatureAndAppl_index}" value="${(productFeatureAndAppl.productId)?if_exists}" /> - <input type="hidden" name="productFeatureId_o_${productFeatureAndAppl_index}" value="${(productFeatureAndAppl.productFeatureId)?if_exists}"> + <input type="hidden" name="productFeatureId_o_${productFeatureAndAppl_index}" value="${(productFeatureAndAppl.productFeatureId)?if_exists}" /> <input type="hidden" name="fromDate_o_${productFeatureAndAppl_index}" value="${(productFeatureAndAppl.fromDate)?if_exists}" /> - <td><a href="<@ofbizUrl>EditFeature?productFeatureId=${(productFeatureAndAppl.productFeatureId)?if_exists}</@ofbizUrl>" class="buttontext"> + <a href="<@ofbizUrl>EditFeature?productFeatureId=${(productFeatureAndAppl.productFeatureId)?if_exists}</@ofbizUrl>" class="buttontext"> ${(productFeatureAndAppl.productFeatureId)?if_exists}</a></td> <td>${(productFeatureAndAppl.get("description",locale))?if_exists}</td> <td>${(curProductFeatureType.get("description",locale))?default((productFeatureAndAppl.productFeatureTypeId)?if_exists)}</td> Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl?rev=935309&r1=935308&r2=935309&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl Sun Apr 18 07:00:37 2010 @@ -46,7 +46,7 @@ under the License. <input type="hidden" name="roleTypeId" value="${(productRole.roleTypeId)?if_exists}" /> <input type="hidden" name="fromDate" value="${(productRole.getTimestamp("fromDate"))?if_exists}" /> <input type="text" size="25" name="thruDate" value="${(productRole. getTimestamp("thruDate"))?if_exists}"<#if hasExpired> class="alert"</#if> /> - <a href="javascript:call_cal(document.lineForm${line}.thruDate, '${(productRole.getTimestamp("thruDate"))?default(nowTimestamp?string)}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> + <a href="javascript:call_cal(document.lineForm${line}.thruDate, '${(productRole.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}" /> </form> </td> @@ -72,17 +72,17 @@ under the License. <h2>${uiLabelMap.ProductAssociatePartyToProduct}:</h2> <br /> <form method="post" action="<@ofbizUrl>addPartyToProduct</@ofbizUrl>" name="addNewForm"> - <input type="hidden" name="productId" value="${productId}"> + <input type="hidden" name="productId" value="${productId}" /> <#-- TODO: Add PartyId lookup screen <@htmlTemplate.lookupField formName="addNewForm" name="partyId" id="partyId" fieldFormName="LookupCustomerName"/> --> <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> + <option value="${(roleType.roleTypeId)?if_exists}" <#if roleType.roleTypeId.equals("_NA_")> selected="selected"</#if>>${(roleType.get("description",locale))?if_exists}</option> </#list> </select> <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> + <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}" /> </form> </#if> Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl?rev=935309&r1=935308&r2=935309&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl Sun Apr 18 07:00:37 2010 @@ -69,7 +69,7 @@ function doPublish() { </#if> <table cellspacing="0" class="basic-table"> <tr> - <td><h2>${productId?if_exists}<h2></td> + <td><h2>${productId?if_exists}</h2></td> <td><input type="text" name="productName" size="40" maxlength="40" value="${product.productName?if_exists}"/></td> <td><input type="submit" value="${uiLabelMap.ProductUpdateName}"/></td> </tr> @@ -121,9 +121,10 @@ function doPublish() { <#assign rowClass = "2"> <#list productAssocs as productAssoc> <#assign assocProduct = productAssoc.getRelatedOne("AssocProduct")/> - <input type="hidden" name="productId${idx}" value="${assocProduct.productId?if_exists}"/> <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> - <td nowrap="nowrap"><a class="buttontext" href="<@ofbizUrl>EditProduct?productId=${assocProduct.productId}</@ofbizUrl>">${assocProduct.productId?if_exists}</a></td> + <td nowrap="nowrap"> + <input type="hidden" name="productId${idx}" value="${assocProduct.productId?if_exists}"/> + <a class="buttontext" href="<@ofbizUrl>EditProduct?productId=${assocProduct.productId}</@ofbizUrl>">${assocProduct.productId?if_exists}</a></td> <td width="100%"><a class="buttontext" href="<@ofbizUrl>EditProduct?productId=${assocProduct.productId}</@ofbizUrl>">${assocProduct.internalName?if_exists}</a></td> <td colspan="2"> <input type="text" name="description${idx}" size="70" maxlength="100" value="${selFeatureDesc[assocProduct.productId]?if_exists}"/> @@ -252,7 +253,7 @@ function doPublish() { </#if> </#list> <tr> - <td colspan=10 align="right"><input name="applyToAll" type="submit" value="${uiLabelMap.ProductApplyToAll}"/> + <td colspan="10" align="right"><input name="applyToAll" type="submit" value="${uiLabelMap.ProductApplyToAll}"/> <input name="updateShipping" type="submit" value="${uiLabelMap.ProductUpdateShipping}"/></td> </tr> <#else> @@ -270,7 +271,7 @@ function doPublish() { <td><a class="buttontext" href="<@ofbizUrl>EditProductAssoc?productId=${product.productId}</@ofbizUrl>">${StringUtil.wrapString(thrudate?if_exists)}</a></td> </tr> <tr> - <td colspan=10 align="right"><input type="submit" value="${uiLabelMap.ProductUpdateShipping}" /></td> + <td colspan="10" align="right"><input type="submit" value="${uiLabelMap.ProductUpdateShipping}" /></td> </tr> </#if> @@ -285,10 +286,11 @@ function doPublish() { </div> <div class="screenlet-body"> <!-- **************************************************** Standard Features section --> + <#if addedFeatureTypeIds?has_content || standardFeatureAppls?has_content> <table cellspacing="0" class="basic-table"> <tr> <td> - <#if addedFeatureTypeIds.size() > 0> + <#if addedFeatureTypeIds?has_content> <form method="post" action="<@ofbizUrl>quickAdminApplyFeatureToProduct</@ofbizUrl>" name="addFeatureById"> <input type="hidden" name="productId" value="${product.productId?if_exists}"/> <input type="hidden" name="productFeatureApplTypeId" value="STANDARD_FEATURE"/> @@ -321,6 +323,7 @@ function doPublish() { </td> <td width="20"> </td> <td valign="top"> + <#if standardFeatureAppls?has_content> <table cellspacing="0" class="basic-table"> <#assign rowClass = "2"> <#list standardFeatureAppls as standardFeatureAppl> @@ -338,10 +341,12 @@ function doPublish() { </#if> </#list> </table> + </#if> </td> </tr> </table> <br /> + </#if> <form action="<@ofbizUrl>EditProductQuickAdmin</@ofbizUrl>"> <input type="hidden" name="productFeatureTypeId" value="${(productFeatureTypeId)?if_exists}"/> <input type="hidden" name="productId" value="${product.productId?if_exists}"/> @@ -385,6 +390,7 @@ function doPublish() { </td> </tr> </table> + </td> <td valign="top"> <table cellspacing="0" class="basic-table"> <#assign rowClass = "2"> @@ -429,7 +435,7 @@ function doPublish() { <a href="javascript:call_cal(document.publish.fromDate,'${nowTimestampString}');"> <img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/> </a> - <input type=button value="${uiLabelMap.ProductPublishAndView}" onClick="doPublish();"/> + <input type="button" value="${uiLabelMap.ProductPublishAndView}" onclick="doPublish();"/> </td> </tr> </table> Modified: ofbiz/trunk/applications/product/webapp/catalog/product/QuickAddVariants.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/QuickAddVariants.ftl?rev=935309&r1=935308&r2=935309&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/QuickAddVariants.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/QuickAddVariants.ftl Sun Apr 18 07:00:37 2010 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<script> +<script type="text/javascript"> function setProductVariantId(e, value, fieldname) { var cform = document.selectAllForm; var len = cform.elements.length; @@ -49,12 +49,12 @@ function clickAll(e) { <h2>${uiLabelMap.ProductWarningProductNotVirtual}</h2> </#if> <#if featureTypes?has_content && (featureTypes.size() > 0)> - <table cellspacing="0" class="basic-table"> - <#assign rowCount = 0> <form method="post" action="<@ofbizUrl>QuickAddChosenVariants</@ofbizUrl>" name="selectAllForm"> <input type="hidden" name="productId" value="${productId}" /> <input type="hidden" name="_useRowSubmit" value="Y" /> <input type="hidden" name="_checkGlobalScope" value="Y" /> + <table cellspacing="0" class="basic-table"> + <#assign rowCount = 0> <tr class="header-row"> <#list featureTypes as featureType> <td><b>${featureType}</b></td> @@ -79,12 +79,12 @@ function clickAll(e) { <#assign productFeatureIds = productFeatureIds + "|" + productFeatureAndAppl.productFeatureId> </td> </#list> - <input type="hidden" name="productFeatureIds_o_${rowCount}" value="${productFeatureIds}"/> <td> + <input type="hidden" name="productFeatureIds_o_${rowCount}" value="${productFeatureIds}"/> <input type="text" size="20" maxlength="20" name="productVariantId_o_${rowCount}" value=""/> </td> <td> - <input type"text" size="5" maxlength="10" name="sequenceNum_o_${rowCount}" value="${defaultSequenceNum}"/> + <input type="text" size="5" maxlength="10" name="sequenceNum_o_${rowCount}" value="${defaultSequenceNum}"/> </td> <td> <div> @@ -113,13 +113,13 @@ function clickAll(e) { <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonCreate}"/> </td> </tr> - </form> - </table> + </table> + </form> <#else> <b>${uiLabelMap.ProductNoSelectableFeaturesFound}</b> </#if> -<table cellspacing="0" class="basic-table"> - <form action="<@ofbizUrl>addVariantsToVirtual</@ofbizUrl>" method="post" name="addVariantsToVirtual"> +<form action="<@ofbizUrl>addVariantsToVirtual</@ofbizUrl>" method="post" name="addVariantsToVirtual"> + <table cellspacing="0" class="basic-table"> <tr class="header-row"> <td><b>${uiLabelMap.ProductVariantAdd}:</b></td> </tr> @@ -132,5 +132,5 @@ function clickAll(e) { <input type="submit" class="smallSubmit" value="${uiLabelMap.ProductVariantAdd}"/> </td> </tr> - </form> -</table> \ No newline at end of file + </table> +</form> \ No newline at end of file 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=935309&r1=935308&r2=935309&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl Sun Apr 18 07:00:37 2010 @@ -150,7 +150,7 @@ under the License. <input type="hidden" name="productPromoRuleId" value="${productPromoCond.productPromoRuleId}" /> <input type="hidden" name="productPromoActionSeqId" value="_NA_" /> <input type="hidden" name="productPromoCondSeqId" value="${productPromoCond.productPromoCondSeqId}" /> - <@htmlTemplate.lookupField formName="createProductPromoCategoryConditions" name="productCategoryId" id="productCategoryId" fieldFormName="LookupProductCategory"/> + <@htmlTemplate.lookupField formName="createProductPromoCategoryConditions" name="productCategoryId" id="productCategoryId_cond" fieldFormName="LookupProductCategory"/> <select name="productPromoApplEnumId"> <#list productPromoApplEnums as productPromoApplEnum> <option value="${productPromoApplEnum.enumId}">${productPromoApplEnum.get("description",locale)}</option> @@ -311,7 +311,7 @@ under the License. <input type="hidden" name="productPromoRuleId" value="${productPromoAction.productPromoRuleId}" /> <input type="hidden" name="productPromoActionSeqId" value="${productPromoAction.productPromoActionSeqId}" /> <input type="hidden" name="productPromoCondSeqId" value="_NA_" /> - <@htmlTemplate.lookupField formName="createProductPromoCategoryActions" name="productCategoryId" id="productCategoryId" fieldFormName="LookupProductCategory"/> + <@htmlTemplate.lookupField formName="createProductPromoCategoryActions" name="productCategoryId" id="productCategoryId_act" fieldFormName="LookupProductCategory"/> <select name="productPromoApplEnumId"> <#list productPromoApplEnums as productPromoApplEnum> <option value="${productPromoApplEnum.enumId}">${productPromoApplEnum.get("description",locale)}</option> @@ -459,7 +459,7 @@ under the License. <input type="hidden" name="productPromoRuleId" value="_NA_" /> <input type="hidden" name="productPromoActionSeqId" value="_NA_" /> <input type="hidden" name="productPromoCondSeqId" value="_NA_" /> - <@htmlTemplate.lookupField formName="createProductPromoCategoryPromotions" name="productCategoryId" id="productCategoryId" fieldFormName="LookupProductCategory"/> + <@htmlTemplate.lookupField formName="createProductPromoCategoryPromotions" name="productCategoryId" id="productCategoryId_03" fieldFormName="LookupProductCategory"/> <select name="productPromoApplEnumId"> <#list productPromoApplEnums as productPromoApplEnum> <option value="${productPromoApplEnum.enumId}">${productPromoApplEnum.get("description",locale)}</option> 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=935309&r1=935308&r2=935309&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/reviews/pendingReviews.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/reviews/pendingReviews.ftl Sun Apr 18 07:00:37 2010 @@ -30,14 +30,14 @@ under the License. <#if !pendingReviews?has_content> <h3>${uiLabelMap.ProductReviewsNoPendingApproval}</h3> <#else> - <form method='POST' action='<@ofbizUrl>updateProductReview</@ofbizUrl>' name="selectAllForm"> + <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="" /> <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"> Modified: ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl?rev=935309&r1=935308&r2=935309&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl Sun Apr 18 07:00:37 2010 @@ -22,7 +22,7 @@ under the License. <a href="<@ofbizUrl>EditFacilityLocation?facilityId=${facilityId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewFacilityLocation}</a> </div> - <form action="<@ofbizUrl>FindFacilityLocation</@ofbizUrl>" method="GET" name="findFacilityLocation"> + <form action="<@ofbizUrl>FindFacilityLocation</@ofbizUrl>" method="get" name="findFacilityLocation"> <table class="basic-table" cellspacing="0"> <#if !(facilityId?exists)> <tr> Modified: ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl?rev=935309&r1=935308&r2=935309&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl Sun Apr 18 07:00:37 2010 @@ -110,7 +110,7 @@ under the License. <select name="picklistId"> <#list picklistActiveList as picklistActive> <#assign picklistActiveStatusItem = picklistActive.getRelatedOneCache("StatusItem")> - <option value="${picklistActive.picklistId}"<#if picklistActive.picklistId == picklist.picklistId> selected</#if>>${picklistActive.picklistId} [${uiLabelMap.CommonDate}:${picklistActive.picklistDate},${uiLabelMap.CommonStatus}:${picklistActiveStatusItem.get("description",locale)}]</option> + <option value="${picklistActive.picklistId}"<#if picklistActive.picklistId == picklist.picklistId> selected="selected"</#if>>${picklistActive.picklistId} [${uiLabelMap.CommonDate}:${picklistActive.picklistDate},${uiLabelMap.CommonStatus}:${picklistActiveStatusItem.get("description",locale)}]</option> </#list> </select> <input type="submit" value="${uiLabelMap.CommonUpdate}" class="smallSubmit"/> Modified: ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl?rev=935309&r1=935308&r2=935309&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl Sun Apr 18 07:00:37 2010 @@ -23,7 +23,7 @@ under the License. <#list contactMeches as contactMechMap> <#assign contactMech = contactMechMap.contactMech> <#assign facilityContactMech = contactMechMap.facilityContactMech> - <tr><td colspan="3"><hr></td></tr> + <tr><td colspan="3"><hr/></td></tr> <tr> <td class="label" valign="top"> ${contactMechMap.contactMechType.get("description",locale)} Modified: ofbiz/trunk/applications/product/webapp/facility/facility/batchPrintMarkAsAccepted.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/batchPrintMarkAsAccepted.ftl?rev=935309&r1=935308&r2=935309&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/batchPrintMarkAsAccepted.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/batchPrintMarkAsAccepted.ftl Sun Apr 18 07:00:37 2010 @@ -34,7 +34,7 @@ under the License. --> -<script> +<script type="text/javascript"> <!-- function markAsAccepted() { document.Labels.action = "<@ofbizUrl>BatchUpdateShipmentRouteSegments?facilityId=${parameters.facilityId}</@ofbizUrl>"; @@ -43,4 +43,4 @@ under the License. //--> </script> -<input type="submit" class="smallSubmit" value="${uiLabelMap.ProductMarkAsAccepted}" onClick="javascript:markAsAccepted()"/> +<input type="submit" class="smallSubmit" value="${uiLabelMap.ProductMarkAsAccepted}" onclick="javascript:markAsAccepted()"/> Modified: ofbiz/trunk/applications/product/webapp/facility/facility/searchInventoryItemsByLabelsForm.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/searchInventoryItemsByLabelsForm.ftl?rev=935309&r1=935308&r2=935309&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/searchInventoryItemsByLabelsForm.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/searchInventoryItemsByLabelsForm.ftl Sun Apr 18 07:00:37 2010 @@ -32,7 +32,7 @@ under the License. <select name="inventoryItemLabelId_${index}"> <option></option> <#list labels as label> - <option value="${label.inventoryItemLabelId}" <#if parameters["inventoryItemLabelId_" + index]?has_content && parameters["inventoryItemLabelId_" + index] == label.inventoryItemLabelId>selected</#if>>${label.description?if_exists} [${label.inventoryItemLabelId}]</option> + <option value="${label.inventoryItemLabelId}" <#if parameters["inventoryItemLabelId_" + index]?has_content && parameters["inventoryItemLabelId_" + index] == label.inventoryItemLabelId>selected="selected"</#if>>${label.description?if_exists} [${label.inventoryItemLabelId}]</option> </#list> </select> </div> Modified: ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl?rev=935309&r1=935308&r2=935309&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl Sun Apr 18 07:00:37 2010 @@ -442,7 +442,7 @@ under the License. <td>${uiLabelMap.ProductPerUnitPriceFacility}:</td> <td> <input type="hidden" name="currencyUomId_o_${rowCount}" value="${currencyUomId?if_exists}" /> - <input type="text" id="unitCost_${rowCount}" name="unitCost_o_${rowCount}" value="${itemCost}" readonly size="6" maxlength="20" /> + <input type="text" id="unitCost_${rowCount}" name="unitCost_o_${rowCount}" value="${itemCost}" readonly="readonly" size="6" maxlength="20" /> ${currencyUomId?if_exists} </td> <#else> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |