svn commit: r939794 - in /ofbiz/trunk/applications/prod
Locked
 
|
Author: buscob
Date: Fri Apr 30 19:45:10 2010 New Revision: 939794 URL: http://svn.apache.org/viewvc?rev=939794&view=rev Log: A patch from Blas Rodriguez Somoza OFBIZ-3731 - XHTML validation errors round 2+ (product) https://issues.apache.org/jira/browse/OFBIZ-3731 advancedsearch.ftl Line 30: input can't be directly inside table. LInes 108,109,253: attribute without value CreateVirtualWithVariantsForm.ftl Line 20: Form can't be located directly inside table. EditProductQuickAdmin.ftl Line 135: attribute without value EditFacility.ftl Line 85: uppercase attribute without value FindFacilityLocation.ftl Line 33: input can't be directly inside table. Line 42: duplicated tr open Line 30,44,48,52,56,60,54: unclosed input PicklistOptions.ftl Lines 32,34,36: attribute without value Line 38: text can't be directly inside tr Line 52: invalid attribute align in tag a PickMoveStock.ftl Line 164: tr open needed Line 172: td close needed Line 176: tr open needed Line 173: unencoded ampersand Lines 168,175: unclosed inputs ViewContactMechs.ftl Line 100: form close without > character receiveInventory.ftl Line 19:236: script without type attribute FindShipment.ftl Line 149: duplicated id. PackOrder.ftl Line 508,512: script without type attribute Lines 516,517: invalid div closings ReceiveInventoryAgainstPurchaseOrder.ftl Line 238: script without type attribute VerifyPick.ftl Lines 363,367,372: script without type attribute Modified: ofbiz/trunk/applications/product/webapp/catalog/find/advancedsearch.ftl ofbiz/trunk/applications/product/webapp/catalog/product/CreateVirtualWithVariantsForm.ftl ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.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/ReceiveInventoryAgainstPurchaseOrder.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/VerifyPick.ftl 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=939794&r1=939793&r2=939794&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/find/advancedsearch.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/find/advancedsearch.ftl Fri Apr 30 19:45:10 2010 @@ -25,9 +25,11 @@ under the License. <input type="hidden" name="VIEW_SIZE" value="25"/> <input type="hidden" name="PAGING" value="Y"/> <input type="hidden" name="noConditionFind" value="Y"/> + <#if searchCategory?has_content> + <input type="hidden" name="SEARCH_CATEGORY_ID" value="${searchCategoryId?if_exists}"/> + </#if> <table cellspacing="0" class="basic-table"> <#if searchCategory?has_content> - <input type="hidden" name="SEARCH_CATEGORY_ID" value="${searchCategoryId?if_exists}"/> <tr> <td class="label" align="right" valign="middle"> ${uiLabelMap.ProductCategory}: @@ -104,8 +106,8 @@ under the License. <td valign="middle"> <div> <input type="text" name="SEARCH_STRING" size="40" value="${requestParameters.SEARCH_STRING?if_exists}"/> - ${uiLabelMap.CommonAny}<input type="radio" name="SEARCH_OPERATOR" value="OR" <#if searchOperator == "OR">checked</#if>/> - ${uiLabelMap.CommonAll}<input type="radio" name="SEARCH_OPERATOR" value="AND" <#if searchOperator == "AND">checked</#if>/> + ${uiLabelMap.CommonAny}<input type="radio" name="SEARCH_OPERATOR" value="OR" <#if searchOperator == "OR">checked="checked"</#if>/> + ${uiLabelMap.CommonAll}<input type="radio" name="SEARCH_OPERATOR" value="AND" <#if searchOperator == "AND">checked="checked"</#if>/> </div> </td> </tr> @@ -250,7 +252,7 @@ under the License. <option value="SortProductPrice:MINIMUM_PRICE">${uiLabelMap.ProductMinimumPrice}</option> <option value="SortProductPrice:MAXIMUM_PRICE">${uiLabelMap.ProductMaximumPrice}</option> </select> - ${uiLabelMap.ProductLowToHigh}<input type="radio" name="sortAscending" value="Y" checked/> + ${uiLabelMap.ProductLowToHigh}<input type="radio" name="sortAscending" value="Y" checked="checked" /> ${uiLabelMap.ProductHighToLow}<input type="radio" name="sortAscending" value="N"/> </div> </td> Modified: ofbiz/trunk/applications/product/webapp/catalog/product/CreateVirtualWithVariantsForm.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/CreateVirtualWithVariantsForm.ftl?rev=939794&r1=939793&r2=939794&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/CreateVirtualWithVariantsForm.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/CreateVirtualWithVariantsForm.ftl Fri Apr 30 19:45:10 2010 @@ -16,8 +16,8 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> +<form action="<@ofbizUrl>quickCreateVirtualWithVariants</@ofbizUrl>" method="post" name="quickCreateVirtualWithVariants"> <table cellspacing="0" class="basic-table"> - <form action="<@ofbizUrl>quickCreateVirtualWithVariants</@ofbizUrl>" method="post" name="quickCreateVirtualWithVariants"> <tr class="header-row"> <td><b>${uiLabelMap.ProductQuickCreateVirtualFromVariants}</b></td> </tr> @@ -36,5 +36,5 @@ under the License. <input type="submit" value="${uiLabelMap.ProductCreateVirtualProduct}"/> </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/product/EditProductQuickAdmin.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl?rev=939794&r1=939793&r2=939794&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl Fri Apr 30 19:45:10 2010 @@ -132,7 +132,7 @@ function doPublish() { <#assign checked=""/> <#if ((assocProduct.smallImageUrl?if_exists != "") && (assocProduct.smallImageUrl?if_exists == product.smallImageUrl?if_exists) && (assocProduct.smallImageUrl?if_exists != "") && (assocProduct.smallImageUrl?if_exists == product.smallImageUrl?if_exists)) > - <#assign checked = "checked"/> + <#assign checked = "checked='checked'"/> </#if> <td><input type="radio" ${checked} name="useImages" value="${assocProduct.productId}"/></td> <#assign fromDate = Static["org.ofbiz.base.util.UtilFormatOut"].encodeQueryValue(productAssoc.getTimestamp("fromDate").toString())/> Modified: ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl?rev=939794&r1=939793&r2=939794&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl Fri Apr 30 19:45:10 2010 @@ -82,7 +82,7 @@ under the License. <#list inventoryItemTypes as nextInventoryItemType> <option value='${nextInventoryItemType.inventoryItemTypeId}' <#if (facility.defaultInventoryItemTypeId?has_content) && (nextInventoryItemType.inventoryItemTypeId == facility.defaultInventoryItemTypeId)> - SELECTED + selected="selected" </#if> >${nextInventoryItemType.get("description",locale)?default(nextInventoryItemType.inventoryItemTypeId)}</option> </#list> 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=939794&r1=939793&r2=939794&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl Fri Apr 30 19:45:10 2010 @@ -23,14 +23,15 @@ under the License. </div> <form action="<@ofbizUrl>FindFacilityLocation</@ofbizUrl>" method="get" name="findFacilityLocation"> + <#if (facilityId?exists)> + <input type="hidden" name="facilityId" value="${facilityId}" /> + </#if> <table class="basic-table" cellspacing="0"> <#if !(facilityId?exists)> <tr> <td class="label">${uiLabelMap.ProductFacility}</td> - <td><input type="text" value="" size="19" maxlength="20"></td> + <td><input type="text" value="" size="19" maxlength="20" /></td> </tr> - <#else> - <input type="hidden" name="facilityId" value="${facilityId}"> </#if> <tr> <td class="label">${uiLabelMap.ProductLocationSeqId}</td> @@ -39,29 +40,28 @@ under the License. </td> </tr> <tr> - <tr> <td class="label">${uiLabelMap.CommonArea}</td> - <td><input type="text" name="areaId" value="" size="19" maxlength="20"></td> + <td><input type="text" name="areaId" value="" size="19" maxlength="20" /></td> </tr> <tr> <td class="label">${uiLabelMap.ProductAisle}</td> - <td><input type="text" name="aisleId" value="" size="19" maxlength="20"></td> + <td><input type="text" name="aisleId" value="" size="19" maxlength="20" /></td> </tr> <tr> <td class="label">${uiLabelMap.ProductSection}</td> - <td><input type="text" name="sectionId" value="" size="19" maxlength="20"></td> + <td><input type="text" name="sectionId" value="" size="19" maxlength="20" /></td> </tr> <tr> <td class="label">${uiLabelMap.ProductLevel}</td> - <td><input type="text" name="levelId" value="" size="19" maxlength="20"></td> + <td><input type="text" name="levelId" value="" size="19" maxlength="20" /></td> </tr> <tr> <td class="label">${uiLabelMap.ProductPosition}</td> - <td><input type="text" name="positionId" value="" size="19" maxlength="20"></td> + <td><input type="text" name="positionId" value="" size="19" maxlength="20" /></td> </tr> <tr> <td> </td> - <td><input type="submit" name="look_up" value="${uiLabelMap.CommonFind}"></td> + <td><input type="submit" name="look_up" value="${uiLabelMap.CommonFind}" /></td> </tr> </table> </form> Modified: ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl?rev=939794&r1=939793&r2=939794&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl Fri Apr 30 19:45:10 2010 @@ -161,18 +161,21 @@ under the License. <td>${uiLabelMap.ProductMoveQuantity}</td> <td> </td> </tr> + <tr> <td> <@htmlTemplate.lookupField formName="quickStockMove" name="productId" id="productId" fieldFormName="LookupProduct" presentation="window"/> </td> <td> - <input type="text" size="20" name="locationSeqId" maxlength="20"> + <input type="text" size="20" name="locationSeqId" maxlength="20" /> <a href="javascript:quicklookup('call_fieldlookup2', document.quickStockMove.locationSeqId, document.quickStockMove.facilityId, document.quickStockMove.productId)"> <img src="<@ofbizContentUrl>/images/fieldlookup.gif</@ofbizContentUrl>" width="15" height="14" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"/> - </a> + </a> + </td> <td> - <@htmlTemplate.lookupField formName="quickStockMove" name="targetLocationSeqId" id="targetLocationSeqId" fieldFormName="LookupFacilityLocation?facilityId=${facilityId}&locationTypeEnumId=FLT_PICKLOC"/> + <@htmlTemplate.lookupField formName="quickStockMove" name="targetLocationSeqId" id="targetLocationSeqId" fieldFormName="LookupFacilityLocation?facilityId=${facilityId}&locationTypeEnumId=FLT_PICKLOC"/> </td> - <td><input type="text" name="quantityMoved" size="6"></td> + <td><input type="text" name="quantityMoved" size="6" /></td> + </tr> <tr> <td colspan="13" align="right"> <a href="javascript:document.quickStockMove.submit();" class="buttontext">${uiLabelMap.ProductQuickStockMove}</a> Modified: ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl?rev=939794&r1=939793&r2=939794&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl Fri Apr 30 19:45:10 2010 @@ -29,13 +29,13 @@ under the License. <table class="basic-table" cellspacing='0'> <tr> <td class='label'>${uiLabelMap.FacilityGroupByShippingMethod}</td> - <td><input type="checkbox" name="groupByShippingMethod" value="Y" <#if "${requestParameters.groupByShippingMethod?if_exists}" == "Y">checked</#if>/></td> + <td><input type="checkbox" name="groupByShippingMethod" value="Y" <#if "${requestParameters.groupByShippingMethod?if_exists}" == "Y">checked="checked"</#if>/></td> <td class='label'>${uiLabelMap.FacilityGroupByWarehouseArea}</td> - <td><input type="checkbox" name="groupByWarehouseArea" value="Y" <#if "${requestParameters.groupByWarehouseArea?if_exists}" == "Y">checked</#if>/></td> + <td><input type="checkbox" name="groupByWarehouseArea" value="Y" <#if "${requestParameters.groupByWarehouseArea?if_exists}" == "Y">checked="checked"</#if>/></td> <td class='label'>${uiLabelMap.FacilityGroupByNoOfOrderItems}</td> - <td><input type="checkbox" name="groupByNoOfOrderItems" value="Y" <#if "${requestParameters.groupByNoOfOrderItems?if_exists}" == "Y">checked</#if>/></td> + <td><input type="checkbox" name="groupByNoOfOrderItems" value="Y" <#if "${requestParameters.groupByNoOfOrderItems?if_exists}" == "Y">checked="checked"</#if>/></td> </tr> - <tr> </tr> + <tr><td> </td></tr> </table> <div align ='right'> <input type="submit" value="Submit" class="buttontext" align='right'/> @@ -49,7 +49,7 @@ under the License. </div> <div class="screenlet-body"> <div align ='right'> - <a class="buttontext" align='right' href="<@ofbizUrl>ReviewOrdersNotPickedOrPacked?facilityId=${facilityId}</@ofbizUrl>">${uiLabelMap.FormFieldTitle_reviewOrdersNotPickedOrPacked}</a> + <a class="buttontext" href="<@ofbizUrl>ReviewOrdersNotPickedOrPacked?facilityId=${facilityId}</@ofbizUrl>">${uiLabelMap.FormFieldTitle_reviewOrdersNotPickedOrPacked}</a> </div> <table cellspacing="0" class="basic-table"> <#if pickMoveInfoList?has_content || rushOrderInfo?has_content> 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=939794&r1=939793&r2=939794&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl Fri Apr 30 19:45:10 2010 @@ -97,7 +97,7 @@ under the License. <form action="<@ofbizUrl>deleteContactMech/ViewContactMechs</@ofbizUrl>" name="deleteContactForm_${contactMechMap_index}" method="post"> <input type="hidden" name="facilityId" value="${facilityId?if_exists}"/> <input type="hidden" name="contactMechId" value="${contactMech.contactMechId?if_exists}"/> - </form + </form> <a href="javascript:document.deleteContactForm_${contactMechMap_index}.submit()">${uiLabelMap.CommonExpire}</a> </#if> </td> 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=939794&r1=939793&r2=939794&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl Fri Apr 30 19:45:10 2010 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<script language="JavaScript"> +<script language="JavaScript" type="text/javascript"> function setNow(field) { eval('document.selectAllForm.' + field + '.value="${nowTimestamp}"'); } </script> <h1>${title}</h1> @@ -233,7 +233,7 @@ under the License. <td colspan="2"><input type="submit" value="${uiLabelMap.CommonReceive}" /></td> </tr> </table> - <script language="JavaScript"> + <script language="JavaScript" type="text/javascript"> document.selectAllForm.quantityAccepted.focus(); </script> </form> Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl?rev=939794&r1=939793&r2=939794&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl Fri Apr 30 19:45:10 2010 @@ -146,7 +146,7 @@ function lookupShipments() { </div> </div> <#if shipmentList?exists> -<div id="findOrders" class="screenlet"> +<div id="findOrders_2" class="screenlet"> <div class="screenlet-title-bar"> <ul> <li class="h3">${uiLabelMap.ProductShipmentsFound}</li> Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl?rev=939794&r1=939793&r2=939794&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl Fri Apr 30 19:45:10 2010 @@ -505,16 +505,14 @@ under the License. </#if> <#if orderId?has_content> - <script language="javascript"> + <script language="javascript" type="text/javascript"> document.singlePackForm.productId.focus(); </script> <#else> - <script language="javascript"> + <script language="javascript" type="text/javascript"> document.selectOrderForm.orderId.focus(); </script> </#if> - </div> - </div> <#else> <h3>${uiLabelMap.ProductFacilityViewPermissionError}</h3> </#if> Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl?rev=939794&r1=939793&r2=939794&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl Fri Apr 30 19:45:10 2010 @@ -235,7 +235,7 @@ under the License. <input type="submit" value="${uiLabelMap.CommonAdd}" class="smallSubmit"/> </div> </form> - <script language="javascript"> + <script language="javascript" type="text/javascript"> document.getElementById('productId').focus(); </script> </#if> Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/VerifyPick.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/VerifyPick.ftl?rev=939794&r1=939793&r2=939794&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/VerifyPick.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/VerifyPick.ftl Fri Apr 30 19:45:10 2010 @@ -360,16 +360,16 @@ under the License. </form> </#if> <#if orderId?has_content> - <script language="javascript"> + <script language="javascript" type="text/javascript"> document.singlePickForm.productId.focus(); </script> <#else> - <script language="javascript"> + <script language="javascript" type="text/javascript"> document.selectOrderForm.orderId.focus(); </script> </#if> <#if shipmentId?has_content> - <script language="javascript"> + <script language="javascript" type="text/javascript"> document.selectOrderForm.orderId.focus(); </script> </#if> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |