You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by bu...@apache.org on 2010/04/07 22:42:39 UTC
svn commit: r931678 - in
/ofbiz/trunk/applications/manufacturing/webapp/manufacturing:
bom/BomSimulation.ftl bom/EditProductBom.ftl mrp/findInventoryEventPlan.ftl
routing/EditCalendar.ftl routing/EditRoutingTaskAssoc.ftl
Author: buscob
Date: Wed Apr 7 20:42:38 2010
New Revision: 931678
URL: http://svn.apache.org/viewvc?rev=931678&view=rev
Log:
A patch from Blas Rodriguez Somoza
OFBIZ-3605 - XHTML validation errors (manufacturing)
XHTML validation errors
* Unclosed INPUT
* attributes without values (checked, selected, disabled, etc)
* attribute values without "
* Uppercase tags or attributes.
* Unencoded ampersands in urls.
Other errors:
EditProductBom.ftl
Wrong markup at line 67, 79, 113, 121. Nonmatching "
<img src="<@o...@ofbizContentUrl>"
finInventoryEventPlan.ftl
Wrong markup at line 69. Duplicated </a>
<img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
Wrong markup at line 86. Unclosed empty <td>, size don't match with previous row.
<td width="25%" align="center" valign="top">
Wrong markup at line 87. size don't match with previous row. (lacks %)
<td width="5"> </td>
Wrong markup at lines 145,148,221,224 Entity lacks final ;
<td align="center"> </td>
Modified:
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendar.ftl
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditRoutingTaskAssoc.ftl
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl?rev=931678&r1=931677&r2=931678&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl Wed Apr 7 20:42:38 2010
@@ -83,7 +83,7 @@ under the License.
</td>
<td>${node.product.internalName?default(" ")}</td>
<td align="right">${node.quantity}</td>
- <td align="right"><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}</a></td>
+ <td align="right"><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}</a></td>
</tr>
<#-- toggle the row color -->
<#assign alt_row = !alt_row>
@@ -109,14 +109,14 @@ under the License.
<#list productsData as productData>
<#assign node = productData.node>
<tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
- <td><a href="/catalog/control/EditProduct?productId=${node.product.productId}&externalLoginKey=${externalLoginKey}" class="buttontext">${node.product.productId}</a></td>
+ <td><a href="/catalog/control/EditProduct?productId=${node.product.productId}&externalLoginKey=${externalLoginKey}" class="buttontext">${node.product.productId}</a></td>
<td>${node.product.internalName?default(" ")}</td>
<td align="right">${node.quantity}</td>
<td align="right">${productData.qoh?if_exists}</td>
<#if productData.unitCost?exists && (productData.unitCost > 0)>
<td align="right">${productData.unitCost?if_exists}</td>
<#else>
- <td align="center"><a href="/catalog/control/EditProductCosts?productId=${node.product.productId}&externalLoginKey=${externalLoginKey}" class="buttontext">NA</a></td>
+ <td align="center"><a href="/catalog/control/EditProductCosts?productId=${node.product.productId}&externalLoginKey=${externalLoginKey}" class="buttontext">NA</a></td>
</#if>
<td align="right">${productData.totalCost?if_exists}</td>
</tr>
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl?rev=931678&r1=931677&r2=931678&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl Wed Apr 7 20:42:38 2010
@@ -35,7 +35,7 @@ function lookupBom() {
</div>
<div class="screenlet-body">
<#if product?has_content>
- <a href="<@o...@ofbizUrl>?productId=${productId}&bomType=${productAssocTypeId}" class="buttontext">${uiLabelMap.ManufacturingBomSimulation}</a>
+ <a href="<@o...@ofbizUrl>?productId=${productId}&bomType=${productAssocTypeId}" class="buttontext">${uiLabelMap.ManufacturingBomSimulation}</a>
</#if>
<br />
<br />
@@ -51,7 +51,7 @@ function lookupBom() {
<#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>
@@ -64,7 +64,7 @@ function lookupBom() {
<td> </td>
<td>
<input type="text" name="productId" size="20" maxlength="40" value="${productId?if_exists}"/>
- <a href="javascript:call_fieldlookup2(document.searchform.productId,'LookupProduct');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
+ <a href="javascript:call_fieldlookup2(document.searchform.productId,'LookupProduct');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
<span><a href="javascript:document.searchform.submit();" class="buttontext">${uiLabelMap.ManufacturingShowBOMAssocs}</a></span>
</td>
</tr>
@@ -76,7 +76,7 @@ function lookupBom() {
<td> </td>
<td>
<input type="text" name="copyToProductId" size="20" maxlength="40" value=""/>
- <a href="javascript:call_fieldlookup2(document.searchform.copyToProductId,'LookupProduct');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
+ <a href="javascript:call_fieldlookup2(document.searchform.copyToProductId,'LookupProduct');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
<span><a href="javascript:document.searchform.UPDATE_MODE.value='COPY';document.searchform.submit();" class="buttontext">${uiLabelMap.ManufacturingCopyBOMAssocs}</a></span>
</td>
</tr>
@@ -95,7 +95,7 @@ function lookupBom() {
<#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>
@@ -110,7 +110,7 @@ function lookupBom() {
<td> </td>
<td>
<input type="text" name="productId" size="20" maxlength="40" value="${productId?if_exists}"/>
- <a href="javascript:call_fieldlookup2(document.editProductAssocForm.productId,'LookupProduct');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
+ <a href="javascript:call_fieldlookup2(document.editProductAssocForm.productId,'LookupProduct');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
</td>
</tr>
<tr>
@@ -118,7 +118,7 @@ function lookupBom() {
<td> </td>
<td>
<input type="text" name="productIdTo" size="20" maxlength="40" value="${productIdTo?if_exists}"/>
- <a href="javascript:call_fieldlookup2(document.editProductAssocForm.productIdTo,'LookupProduct');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
+ <a href="javascript:call_fieldlookup2(document.editProductAssocForm.productIdTo,'LookupProduct');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
</td>
</tr>
<tr>
@@ -205,7 +205,7 @@ function lookupBom() {
<#assign selectedFormula = (request.getParameter("estimateCalcMethod"))?if_exists>
</#if>
<#list formulae as formula>
- <option value="${formula.customMethodId}" <#if selectedFormula = formula.customMethodId>selected</#if>>${formula.get("description",locale)?if_exists}</option>
+ <option value="${formula.customMethodId}" <#if selectedFormula = formula.customMethodId>selected="selected"</#if>>${formula.get("description",locale)?if_exists}</option>
</#list>
</select>
</td>
@@ -255,8 +255,8 @@ function lookupBom() {
<#assign listToProduct = assocFromProduct.getRelatedOneCache("AssocProduct")>
<#assign curProductAssocType = assocFromProduct.getRelatedOneCache("ProductAssocType")>
<tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
- <td><a href="<@o...@ofbizUrl>" class="buttontext">${(assocFromProduct.productIdTo)?if_exists}</a></td>
- <td><#if listToProduct?exists><a href="<@o...@ofbizUrl>" class="buttontext">${(listToProduct.internalName)?if_exists}</a></#if> </td>
+ <td><a href="<@o...@ofbizUrl>" class="buttontext">${(assocFromProduct.productIdTo)?if_exists}</a></td>
+ <td><#if listToProduct?exists><a href="<@o...@ofbizUrl>" class="buttontext">${(listToProduct.internalName)?if_exists}</a></#if> </td>
<td<#if (assocFromProduct.getTimestamp("fromDate"))?exists && nowDate.before(assocFromProduct.getTimestamp("fromDate"))> class="alert"</#if>>
${(assocFromProduct.fromDate)?if_exists} </td>
<td<#if (assocFromProduct.getTimestamp("thruDate"))?exists && nowDate.after(assocFromProduct.getTimestamp("thruDate"))> class="alert"</#if>>
@@ -267,10 +267,10 @@ function lookupBom() {
<td> ${(assocFromProduct.estimateCalcMethod)?if_exists}</td>
<td> ${(assocFromProduct.routingWorkEffortId)?if_exists}</td>
<td>
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a>
</td>
<td>
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}</a>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}</a>
</td>
</tr>
<#-- toggle the row color -->
@@ -301,14 +301,14 @@ function lookupBom() {
<#assign listToProduct = assocToProduct.getRelatedOneCache("MainProduct")>
<#assign curProductAssocType = assocToProduct.getRelatedOneCache("ProductAssocType")>
<tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
- <td><a href="<@o...@ofbizUrl>" class="buttontext">${(assocToProduct.productId)?if_exists}</a></td>
+ <td><a href="<@o...@ofbizUrl>" class="buttontext">${(assocToProduct.productId)?if_exists}</a></td>
<!-- <td><#if listToProduct?exists><a href="<@o...@ofbizUrl>" class="buttontext">${(listToProduct.internalName)?if_exists}</a></#if></td> -->
- <td><#if listToProduct?exists><a href="<@o...@ofbizUrl>" class="buttontext">${(listToProduct.internalName)?if_exists}</a></#if></td>
+ <td><#if listToProduct?exists><a href="<@o...@ofbizUrl>" class="buttontext">${(listToProduct.internalName)?if_exists}</a></#if></td>
<td>${(assocToProduct.getTimestamp("fromDate"))?if_exists} </td>
<td>${(assocToProduct.getTimestamp("thruDate"))?if_exists} </td>
<td>${(assocToProduct.quantity)?if_exists} </td>
<td>
- <a href="<@o...@ofbizUrl>" class="buttontext">
+ <a href="<@o...@ofbizUrl>" class="buttontext">
${uiLabelMap.CommonDelete}</a>
</td>
</tr>
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl?rev=931678&r1=931677&r2=931678&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl Wed Apr 7 20:42:38 2010
@@ -66,10 +66,10 @@ function lookupInventory() {
<input type='text' size='25' name='productId' value='${requestParameters.productId?if_exists}'/>
<span>
<a href="javascript:call_fieldlookup2(document.lookupinventory.productId,'LookupProduct');">
- <img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
+ <img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}"/>
</a>
</span>
- <input type='text' size='25' readonly name='productId_description' value=''/>${uiLabelMap.CommonDescription}
+ <input type='text' size='25' readonly="readonly" name='productId_description' value=''/>${uiLabelMap.CommonDescription}
</td>
</tr>
<tr>
@@ -83,8 +83,8 @@ function lookupInventory() {
</td>
</tr>
<tr>
- <td width="25%" align="center" valign="top">
- <td width="5"> </td>
+ <td width="20%" align="center" valign="top"> </td>
+ <td width="5%"> </td>
<td width="75%"> <a href="javascript:lookupInventory();" class="smallSubmit"> ${uiLabelMap.CommonFind} </a></td>
</tr>
</table>
@@ -120,7 +120,7 @@ document.lookupinventory.productId.focus
<div class="boxhead" align="right">
<#if 0 < viewIndex>
- <a href="<@o...@ofbizUrl>" class="submenutext">${uiLabelMap.CommonPrevious}</a>
+ <a href="<@o...@ofbizUrl>" class="submenutext">${uiLabelMap.CommonPrevious}</a>
<#else>
<span class="submenutextdisabled">${uiLabelMap.CommonPrevious}</span>
</#if>
@@ -128,7 +128,7 @@ document.lookupinventory.productId.focus
<span class="submenutextinfo">${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}</span>
</#if>
<#if highIndex < listSize>
- <a href="<@o...@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonNext}</a>
+ <a href="<@o...@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonNext}</a>
<#else>
<span class="submenutextrightdisabled">${uiLabelMap.CommonNext}</span>
</#if>
@@ -142,10 +142,10 @@ document.lookupinventory.productId.focus
<table class="basic-table" cellspacing="0">
<tr class="header-row">
<td>${uiLabelMap.CommonType}</td>
- <td align="center"> </td>
+ <td align="center"> </td>
<td>${uiLabelMap.CommonDescription}</td>
<td>${uiLabelMap.CommonDate}</td>
- <td align="center"> </td>
+ <td align="center"> </td>
<td align="right">${uiLabelMap.CommonQuantity}</td>
<td align="right">${uiLabelMap.ManufacturingTotalQuantity}</td>
</tr>
@@ -218,10 +218,10 @@ document.lookupinventory.productId.focus
<#assign MrpEventType = inven.getRelatedOne("MrpEventType")>
<tr class="${rowClass}">
<td>${MrpEventType.get("description",locale)}</td>
- <td> </td>
+ <td> </td>
<td>${inven.eventName?if_exists}</td>
<td><font <#if inven.isLate?default("N") == "Y">color='red'</#if>>${inven.getString("eventDate")}</font></td>
- <td> </td>
+ <td> </td>
<td align="right">${inven.getString("quantity")}</td>
<td align="right">${quantityAvailableAtDate?if_exists}</td>
</tr>
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendar.ftl?rev=931678&r1=931677&r2=931678&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendar.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendar.ftl Wed Apr 7 20:42:38 2010
@@ -28,7 +28,7 @@ under the License.
<div class="screenlet-body">
<div class="button-bar"><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.ManufacturingNewCalendar}</a></div>
<form name="calendarform" method="post" action="<@o...@ofbizUrl>">
- <input type="hidden" name="calendarId" value="${techDataCalendar.calendarId}">
+ <input type="hidden" name="calendarId" value="${techDataCalendar.calendarId}" />
<#else>
<div class="screenlet">
<div class="screenlet-title-bar">
@@ -52,13 +52,13 @@ under the License.
<tr>
<td width='26%' align='right' valign="top" class="label">${uiLabelMap.ManufacturingCalendarId}</td>
<td width="5"> </td>
- <td width="74%"><input type="text" size="12" name="calendarId" value="${calendarData.calendarId?if_exists}"></td>
+ <td width="74%"><input type="text" size="12" name="calendarId" value="${calendarData.calendarId?if_exists}" /></td>
</tr>
</#if>
<tr>
<td width='26%' align='right' valign='top' class="label">${uiLabelMap.CommonDescription}</td>
<td width="5"> </td>
- <td width="74%"><input type="text" size="40" name="description" value="${calendarData.description?if_exists}"></td>
+ <td width="74%"><input type="text" size="40" name="description" value="${calendarData.description?if_exists}" /></td>
</tr>
<tr>
<td width='26%' align='right' valign='top' class="label">${uiLabelMap.ManufacturingCalendarWeekId}</td>
@@ -73,7 +73,7 @@ under the License.
<tr>
<td width="26%" align="right" valign="top">
<td width="5"> </td>
- <td width="74%"><input type="submit" value="${uiLabelMap.CommonUpdate}"></td>
+ <td width="74%"><input type="submit" value="${uiLabelMap.CommonUpdate}" /></td>
</tr>
</table>
</form>
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditRoutingTaskAssoc.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditRoutingTaskAssoc.ftl?rev=931678&r1=931677&r2=931678&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditRoutingTaskAssoc.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditRoutingTaskAssoc.ftl Wed Apr 7 20:42:38 2010
@@ -43,14 +43,14 @@ function addRoutingTask() {
</th>
<td>
<input type="text" name="workEffortIdTo" size="20"/>
- <a href="javascript:call_fieldlookup(document.addtaskassocform.workEffortIdTo,'<@o...@ofbizUrl>', 'vide',540,450);"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}"></a>
+ <a href="javascript:call_fieldlookup(document.addtaskassocform.workEffortIdTo,'<@o...@ofbizUrl>', 'vide',540,450);"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}" /></a>
</td>
<th align="right">
${uiLabelMap.CommonFromDate}
</th>
<td>
<input type="text" name="fromDate" size="25"/>
- <a href="javascript:call_cal(document.addtaskassocform.fromDate, null);"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Click here For Calendar"></a>
+ <a href="javascript:call_cal(document.addtaskassocform.fromDate, null);"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Click here For Calendar" /></a>
</td>
<td align="center" width="40%"> </td>
</tr>
@@ -66,7 +66,7 @@ function addRoutingTask() {
</th>
<td>
<input type="text" name="thruDate" size="25"/>
- <a href="javascript:call_cal(document.addtaskassocform.thruDate, null);"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Click here For Calendar"></a>
+ <a href="javascript:call_cal(document.addtaskassocform.thruDate, null);"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Click here For Calendar" /></a>
</td>
<td> </td>
</tr>