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 23:50:57 UTC
svn commit: r931700 [2/5] - in /ofbiz/trunk/applications/product/webapp:
catalog/ catalog/category/ catalog/config/ catalog/feature/ catalog/find/
catalog/lookup/ catalog/price/ catalog/product/ catalog/promo/
catalog/reviews/ catalog/store/ catalog/th...
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=931700&r1=931699&r2=931700&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchactions.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchactions.ftl Wed Apr 7 21:50:56 2010
@@ -31,8 +31,8 @@ under the License.
<span class="label">${uiLabelMap.ProductRemoveResultsFrom} ${uiLabelMap.ProductCategory}:</span>
<input type="text" name="SE_SEARCH_CATEGORY_ID" size="20" maxlength="20"/>
<a href="javascript:call_fieldlookup2(document.searchRemoveFromCategory.SE_SEARCH_CATEGORY_ID,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
- <input type="hidden" name="clearSearch" value="N">
- <input type="submit" value="${uiLabelMap.CommonRemove}" class="smallSubmit">
+ <input type="hidden" name="clearSearch" value="N" />
+ <input type="submit" value="${uiLabelMap.CommonRemove}" class="smallSubmit" />
<br />
</form>
</div>
@@ -44,9 +44,9 @@ under the License.
<span class="label">${uiLabelMap.ProductExpireResultsFrom} ${uiLabelMap.ProductCategory}:</span>
<input type="text" name="SE_SEARCH_CATEGORY_ID" size="20" maxlength="20"/>
<a href="javascript:call_fieldlookup2(document.searchExpireFromCategory.SE_SEARCH_CATEGORY_ID,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></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="<@o...@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">
+ <span class="label">${uiLabelMap.CommonThru}</span><input type="text" size="25" name="thruDate" /><a href="javascript:call_cal(document.searchExpireFromCategory.thruDate, null);"><img src="<@o...@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 />
</form>
</div>
@@ -58,9 +58,9 @@ under the License.
<span class="label">${uiLabelMap.ProductAddResultsTo} ${uiLabelMap.ProductCategory}:</span>
<input type="text" name="SE_SEARCH_CATEGORY_ID" size="20" maxlength="20"/>
<a href="javascript:call_fieldlookup2(document.searchAddToCategory.SE_SEARCH_CATEGORY_ID,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></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="<@o...@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">
+ <span class="label">${uiLabelMap.CommonFrom}</span><input type="text" size="25" name="fromDate" /><a href="javascript:call_cal(document.searchAddToCategory.fromDate, null);"><img src="<@o...@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 />
</form>
</div>
@@ -70,12 +70,12 @@ under the License.
<div>
<form method="post" action="<@o...@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="<@o...@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="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
+ <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="<@o...@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="<@o...@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="">
+ <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="" />
<span class="label">${uiLabelMap.ProductFeatureApplicationType}</span>
<span class="label">${uiLabelMap.ProductCategoryId}:</span>
<select name='productFeatureApplTypeId' size='1'>
@@ -87,8 +87,8 @@ under the License.
<option value="${applicationType.productFeatureApplTypeId}">${displayDesc}</option>
</#list>
</select>
- <input type="hidden" name="clearSearch" value="N">
- <input type="submit" value="${uiLabelMap.ProductAddFeature}" class="smallSubmit">
+ <input type="hidden" name="clearSearch" value="N" />
+ <input type="submit" value="${uiLabelMap.ProductAddFeature}" class="smallSubmit" />
<br />
</form>
</div>
@@ -98,9 +98,9 @@ under the License.
<div>
<form method="post" action="<@o...@ofbizUrl>" name="searchRemoveFeature">
<span class="label">${uiLabelMap.ProductRemoveFeatureFromResults}:</span><br />
- <span class="label">${uiLabelMap.ProductFeatureId}</span><input type="text" size="10" name="productFeatureId" value="">
- <input type="hidden" name="clearSearch" value="N">
- <input type="submit" value="${uiLabelMap.ProductRemoveFeature}" class="smallSubmit">
+ <span class="label">${uiLabelMap.ProductFeatureId}</span><input type="text" size="10" name="productFeatureId" value="" />
+ <input type="hidden" name="clearSearch" value="N" />
+ <input type="submit" value="${uiLabelMap.ProductRemoveFeature}" class="smallSubmit" />
<br />
</form>
</div>
@@ -110,10 +110,10 @@ under the License.
<div>
<form method="post" action="" name="searchShowParams">
<#assign searchParams = Static["org.ofbiz.product.product.ProductSearchSession"].makeSearchParametersString(session)>
- <span class="label">${uiLabelMap.ProductPlainSearchParameters}:</span><input type="text" size="60" name="searchParameters" value="${StringUtil.wrapString(searchParams)}">
+ <span class="label">${uiLabelMap.ProductPlainSearchParameters}:</span><input type="text" size="60" name="searchParameters" value="${StringUtil.wrapString(searchParams)}" />
<br />
- <span class="label">${uiLabelMap.ProductHtmlSearchParameters}:</span><input type="text" size="60" name="searchParameters" value="${StringUtil.wrapString(searchParams)?html}">
- <input type="hidden" name="clearSearch" value="N">
+ <span class="label">${uiLabelMap.ProductHtmlSearchParameters}:</span><input type="text" size="60" name="searchParameters" value="${StringUtil.wrapString(searchParams)?html}" />
+ <input type="hidden" name="clearSearch" value="N" />
</form>
</div>
Modified: ofbiz/trunk/applications/product/webapp/catalog/lookup/LookupVariantProduct.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/lookup/LookupVariantProduct.ftl?rev=931700&r1=931699&r2=931700&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/lookup/LookupVariantProduct.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/lookup/LookupVariantProduct.ftl Wed Apr 7 21:50:56 2010
@@ -23,7 +23,7 @@ under the License.
<#if searchFeatures?has_content>
<table cellspacing="0" class="basic-table">
<form method="post" action="<@o...@ofbizUrl>" name="selectAllForm">
- <input type="hidden" name="productId" value="${product.productId}">
+ <input type="hidden" name="productId" value="${product.productId}" />
<#list searchFeatures as searchFeature>
<tr>
<td class="label"><b>${searchFeature.featureType}</b></td>
@@ -42,10 +42,10 @@ under the License.
</tr>
</#list>
<tr>
- <td><input type="submit" value="${uiLabelMap.CommonSearch}" class="smallSubmit"></td>
+ <td><input type="submit" value="${uiLabelMap.CommonSearch}" class="smallSubmit" /></td>
</form>
<form method="post" action="<@o...@ofbizUrl>" name="">
- <td><input type="submit" value="${uiLabelMap.CommonBack}" class="smallSubmit"></td>
+ <td><input type="submit" value="${uiLabelMap.CommonBack}" class="smallSubmit" /></td>
</form>
</tr>
</table>
@@ -70,10 +70,10 @@ under the License.
<#if productFeatureIds?exists>
<table cellspacing="0" class="basic-table">
<form method="post" action="<@o...@ofbizUrl>" name="createNewVariant">
- <input type="hidden" name="productId" value="${product.productId}">
- <input type="hidden" name="productFeatureIds" value="${productFeatureIds}">
- <input type="text" name="productVariantId" value="${productVariantId}">
- <input type="submit" value="${uiLabelMap.ProductQuickAddVariants}" class="smallSubmit">
+ <input type="hidden" name="productId" value="${product.productId}" />
+ <input type="hidden" name="productFeatureIds" value="${productFeatureIds}" />
+ <input type="text" name="productVariantId" value="${productVariantId}" />
+ <input type="submit" value="${uiLabelMap.ProductQuickAddVariants}" class="smallSubmit" />
</form>
</table>
</#if>
Modified: ofbiz/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl?rev=931700&r1=931699&r2=931700&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl Wed Apr 7 21:50:56 2010
@@ -35,27 +35,27 @@ under the License.
<td class="label"><b>${productPriceRule.productPriceRuleId}</b></td>
<td>
<form method="post" action="<@o...@ofbizUrl>" name="updateProductPriceRule">
- <input type="hidden" name="productPriceRuleId" value="${productPriceRule.productPriceRuleId}">
- <input type="text" size="15" name="ruleName" value="${productPriceRule.ruleName}">
- <input type="text" size="15" name="description" value="${productPriceRule.description?if_exists}">
- <input type="text" size="22" name="fromDate" value="${productPriceRule.fromDate?if_exists}"><a href="javascript:call_cal(document.updateProductPriceRule.fromDate, null);"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'></a>
- <input type="text" size="22" name="thruDate" value="${productPriceRule.thruDate?if_exists}"><a href="javascript:call_cal(document.updateProductPriceRule.thruDate, null);"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'></a>
+ <input type="hidden" name="productPriceRuleId" value="${productPriceRule.productPriceRuleId}" />
+ <input type="text" size="15" name="ruleName" value="${productPriceRule.ruleName}" />
+ <input type="text" size="15" name="description" value="${productPriceRule.description?if_exists}" />
+ <input type="text" size="22" name="fromDate" value="${productPriceRule.fromDate?if_exists}" /><a href="javascript:call_cal(document.updateProductPriceRule.fromDate, null);"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'/></a>
+ <input type="text" size="22" name="thruDate" value="${productPriceRule.thruDate?if_exists}" /><a href="javascript:call_cal(document.updateProductPriceRule.thruDate, null);"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'/></a>
<#assign saleRule = productPriceRule.isSale?exists && productPriceRule.isSale == "Y">
<div>
<span class="label"><b>${uiLabelMap.ProductNotifySale}</b></span>
- <input type="radio" name="isSale" value="Y" <#if saleRule>CHECKED</#if>>${uiLabelMap.CommonYes}
- <input type="radio" name="isSale" value="N" <#if !saleRule>CHECKED</#if>>${uiLabelMap.CommonNo}
+ <input type="radio" name="isSale" value="Y" <#if saleRule>checked="checked"</#if> />${uiLabelMap.CommonYes}
+ <input type="radio" name="isSale" value="N" <#if !saleRule>checked="checked"</#if> />${uiLabelMap.CommonNo}
- <input type="submit" value="${uiLabelMap.CommonUpdate}">
+ <input type="submit" value="${uiLabelMap.CommonUpdate}" />
</div>
</form>
</td>
<td align="center">
<#if !productPriceConds?has_content && !productPriceActions?has_content>
<form method="post" action="<@o...@ofbizUrl>" name="deleteProductPriceRule">
- <input type="hidden" name="productPriceRuleId" value="${productPriceRule.productPriceRuleId}">
- <input type="submit" value="${uiLabelMap.CommonDelete}">
+ <input type="hidden" name="productPriceRuleId" value="${productPriceRule.productPriceRuleId}" />
+ <input type="submit" value="${uiLabelMap.CommonDelete}" />
</form>
</#if>
</td>
@@ -105,14 +105,14 @@ under the License.
<option value="${condOperEnum.enumId}">${condOperEnum.get("description",locale)}<#--[${condOperEnum.enumId}]--></option>
</#list>
</select>
- <input type="text" size="20" name="condValue" value="${productPriceCond.condValue?if_exists}">
- <input type="submit" value="${uiLabelMap.CommonUpdate}">
+ <input type="text" size="20" name="condValue" value="${productPriceCond.condValue?if_exists}" />
+ <input type="submit" value="${uiLabelMap.CommonUpdate}" />
</form>
</td>
<td align="center">
<form name="deleteProductPriceCond_${productPriceCond_index}" method= "post" action= "<@o...@ofbizUrl>">
- <input type="hidden" name="productPriceRuleId" value="${productPriceCond.productPriceRuleId}">
- <input type="hidden" name="productPriceCondSeqId" value="${productPriceCond.productPriceCondSeqId}">
+ <input type="hidden" name="productPriceRuleId" value="${productPriceCond.productPriceRuleId}" />
+ <input type="hidden" name="productPriceCondSeqId" value="${productPriceCond.productPriceCondSeqId}" />
<a href="javascript:document.deleteProductPriceCond_${productPriceCond_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a>
</form>
</td>
@@ -127,7 +127,7 @@ under the License.
<tr>
<td colspan="3">
<form method="post" action="<@o...@ofbizUrl>">
- <input type="hidden" name="productPriceRuleId" value="${productPriceRule.productPriceRuleId}">
+ <input type="hidden" name="productPriceRuleId" value="${productPriceRule.productPriceRuleId}" />
<span class="label"><b>${uiLabelMap.CommonNew}</b> </span>
<select name="inputParamEnumId" size="1">
<#list inputParamEnums as inputParamEnum>
@@ -139,8 +139,8 @@ under the License.
<option value="${condOperEnum.enumId}">${condOperEnum.get("description",locale)}<#--[${condOperEnum.enumId}]--></option>
</#list>
</select>
- <input type="text" size="20" name="condValue">
- <input type="submit" value="${uiLabelMap.CommonCreate}">
+ <input type="text" size="20" name="condValue" />
+ <input type="submit" value="${uiLabelMap.CommonCreate}" />
</form>
</td>
</tr>
@@ -162,8 +162,8 @@ under the License.
<td class="label"><b>${productPriceAction.productPriceActionSeqId}</b></td>
<td>
<form method="post" action="<@o...@ofbizUrl>">
- <input type="hidden" name="productPriceRuleId" value="${productPriceAction.productPriceRuleId}">
- <input type="hidden" name="productPriceActionSeqId" value="${productPriceAction.productPriceActionSeqId}">
+ <input type="hidden" name="productPriceRuleId" value="${productPriceAction.productPriceRuleId}" />
+ <input type="hidden" name="productPriceActionSeqId" value="${productPriceAction.productPriceActionSeqId}" />
<select name="productPriceActionTypeId" size="1">
<#if productPriceAction.productPriceActionTypeId?has_content>
<#assign productPriceActionType = productPriceAction.getRelatedOneCache("ProductPriceActionType")>
@@ -176,14 +176,14 @@ under the License.
<option value="${productPriceActionType.productPriceActionTypeId}">${productPriceActionType.get("description",locale)}<#--[${productPriceActionType.productPriceActionTypeId}]--></option>
</#list>
</select>
- <input type="text" size="8" name="amount" value="${productPriceAction.amount?if_exists}">
- <input type="submit" value="${uiLabelMap.CommonUpdate}">
+ <input type="text" size="8" name="amount" value="${productPriceAction.amount?if_exists}" />
+ <input type="submit" value="${uiLabelMap.CommonUpdate}" />
</form>
</td>
<td align="center">
<form name="deleteProductPriceAction_${productPriceAction_index}" method="post" action="<@o...@ofbizUrl>">
- <input type="hidden" name="productPriceRuleId" value="${productPriceAction.productPriceRuleId}">
- <input type="hidden" name="productPriceActionSeqId" value="${productPriceAction.productPriceActionSeqId}">
+ <input type="hidden" name="productPriceRuleId" value="${productPriceAction.productPriceRuleId}" />
+ <input type="hidden" name="productPriceActionSeqId" value="${productPriceAction.productPriceActionSeqId}" />
<a href="javascript:document.deleteProductPriceAction_${productPriceAction_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a>
</form>
</td>
@@ -198,15 +198,15 @@ under the License.
<tr>
<td colspan="3">
<form method="post" action="<@o...@ofbizUrl>">
- <input type="hidden" name="productPriceRuleId" value="${productPriceRule.productPriceRuleId}">
+ <input type="hidden" name="productPriceRuleId" value="${productPriceRule.productPriceRuleId}" />
<span class="label"><b>${uiLabelMap.CommonNew}</b> </span>
<select name="productPriceActionTypeId" size="1">
<#list productPriceActionTypes as productPriceActionType>
<option value="${productPriceActionType.productPriceActionTypeId}">${productPriceActionType.get("description",locale)}<#--[${productPriceActionType.productPriceActionTypeId}]--></option>
</#list>
</select>
- <input type="text" size="8" name="amount">
- <input type="submit" value="${uiLabelMap.CommonCreate}">
+ <input type="text" size="8" name="amount" />
+ <input type="submit" value="${uiLabelMap.CommonCreate}" />
</form>
</td>
</tr>
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=931700&r1=931699&r2=931700&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl Wed Apr 7 21:50:56 2010
@@ -31,7 +31,7 @@ under the License.
<#assign selectedFeatureApplTypeId = selFeatureApplTypeId?if_exists>
<#if productId?has_content>
- <#assign productString = "&productId=" + productId>
+ <#assign productString = "&productId=" + productId>
</#if>
<table cellspacing="0" class="basic-table">
<tr>
@@ -39,11 +39,11 @@ under the License.
<span>
<b>
<#if (viewIndex > 0)>
- <a href="<@o...@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonPrevious}]</a> |
+ <a href="<@o...@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonPrevious}]</a> |
</#if>
${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}
<#if (listSize > highIndex)>
- | <a href="<@o...@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonNext}]</a>
+ | <a href="<@o...@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonNext}]</a>
</#if>
</b>
</span>
@@ -53,9 +53,9 @@ under the License.
</#if>
<table cellspacing="0" class="basic-table">
<form method="post" action="<@o...@ofbizUrl>" name="selectAllForm">
- <input type="hidden" name="_useRowSubmit" value="Y">
- <input type="hidden" name="_checkGlobalScope" value="Y">
- <input type="hidden" name="productId" value="${productId}">
+ <input type="hidden" name="_useRowSubmit" value="Y" />
+ <input type="hidden" name="_checkGlobalScope" value="Y" />
+ <input type="hidden" name="productId" value="${productId}" />
<tr class="header-row">
<td><b>${uiLabelMap.CommonId}</b></td>
<td><b>${uiLabelMap.CommonDescription}</b></td>
@@ -65,7 +65,7 @@ under the License.
<td><b>${uiLabelMap.CommonThruDate}</b></td>
<td><b>${uiLabelMap.ProductAmount}</b></td>
<td><b>${uiLabelMap.CommonSequence}</b></td>
- <td><b>${uiLabelMap.CommonAll}<input type="checkbox" name="selectAll" value="${uiLabelMap.CommonY}" onclick="javascript:toggleAll(this, 'selectAllForm');highlightAllRows(this, 'productFeatureId_tableRow_', 'selectAllForm');"></td>
+ <td><b>${uiLabelMap.CommonAll}<input type="checkbox" name="selectAll" value="${uiLabelMap.CommonY}" onclick="javascript:toggleAll(this, 'selectAllForm');highlightAllRows(this, 'productFeatureId_tableRow_', 'selectAllForm');" /></td>
</tr>
<#assign rowCount = 0>
<#assign rowClass = "2">
@@ -73,7 +73,7 @@ under the License.
<#list productFeatures as productFeature>
<#assign curProductFeatureType = productFeature.getRelatedOneCache("ProductFeatureType")>
<tr id="productFeatureId_tableRow_${rowCount}" valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
- <input type="hidden" name="productFeatureId_o_${rowCount}" value="${productFeature.productFeatureId}">
+ <input type="hidden" name="productFeatureId_o_${rowCount}" value="${productFeature.productFeatureId}" />
<td><a href="<@o...@ofbizUrl>" class="buttontext">${productFeature.productFeatureId}</a></td>
<td>${productFeature.description}</td>
<td><#if curProductFeatureType?exists>${curProductFeatureType.description}<#else> [${productFeature.productFeatureTypeId}]</#if></td>
@@ -84,12 +84,12 @@ under the License.
</#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="<@o...@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="<@o...@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><input type="text" size="25" name="fromDate_o_${rowCount}" /><a href="javascript:call_cal(document.selectAllForm.fromDate_o_${rowCount}, '${nowTimestampString}');"><img src="<@o...@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="<@o...@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">
- <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');highlightRow(this,'productFeatureId_tableRow_${rowCount}');">
+ <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');highlightRow(this,'productFeatureId_tableRow_${rowCount}');" />
</td>
</tr>
<#assign rowCount = rowCount + 1>
@@ -100,7 +100,7 @@ under the License.
<#assign rowClass = "2">
</#if>
</#list>
-<tr><td colspan="9" align="center"><input type="submit" value="${uiLabelMap.CommonApply}"></td></tr>
+<tr><td colspan="9" align="center"><input type="submit" value="${uiLabelMap.CommonApply}" /></td></tr>
</#if>
<input type="hidden" name="_rowCount" value="${rowCount?if_exists}"/>
</form>
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=931700&r1=931699&r2=931700&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl Wed Apr 7 21:50:56 2010
@@ -22,22 +22,22 @@ under the License.
</div>
<div class="screenlet-body">
<form action="<@o...@ofbizUrl>" method="post" style="margin: 0;" name="editProductAssocForm">
- <input type="hidden" name="productId" value="${productId?if_exists}">
+ <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">
+ <input type="hidden" name="UPDATE_MODE" value="CREATE" />
<tr>
<td align="right" class="label">${uiLabelMap.ProductProductId}</td>
<td> </td>
- <td><input type="text" name="PRODUCT_ID" size="20" maxlength="40" value="${productId?if_exists}"></td>
+ <td><input type="text" name="PRODUCT_ID" size="20" maxlength="40" value="${productId?if_exists}" /></td>
</tr>
<tr>
<td align="right" class="label">${uiLabelMap.ProductProductIdTo}</td>
<td> </td>
- <td><input type="text" name="PRODUCT_ID_TO" size="20" maxlength="40" value="${productIdTo?if_exists}"></td>
+ <td><input type="text" name="PRODUCT_ID_TO" size="20" maxlength="40" value="${productIdTo?if_exists}" /></td>
</tr>
<tr>
<td align="right" class="label">${uiLabelMap.ProductAssociationTypeId}</td>
@@ -62,23 +62,23 @@ under the License.
<td> </td>
<td>
<div>
- <input type="text" name="FROM_DATE" size="25" maxlength="40" value="${fromDate?if_exists}">
+ <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="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
${uiLabelMap.CommonSetNowEmpty}
</div>
</td>
</tr>
<#else>
- <input type="hidden" name="UPDATE_MODE" value="CREATE">
+ <input type="hidden" name="UPDATE_MODE" value="CREATE" />
<tr>
<td align="right" class="label">${uiLabelMap.ProductProductId}</td>
<td> </td>
- <td><input type="text" name="PRODUCT_ID" size="20" maxlength="40" value="${productId?if_exists}"></td>
+ <td><input type="text" name="PRODUCT_ID" size="20" maxlength="40" value="${productId?if_exists}" /></td>
</tr>
<tr>
<td align="right" class="label">${uiLabelMap.ProductProductIdTo}</td>
<td> </td>
- <td><input type="text" name="PRODUCT_ID_TO" size="20" maxlength="40" value="${productIdTo?if_exists}">
+ <td><input type="text" name="PRODUCT_ID_TO" size="20" maxlength="40" value="${productIdTo?if_exists}" />
<a href="javascript:call_fieldlookup2(document.editProductAssocForm.PRODUCT_ID_TO,'LookupProduct');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a></td>
</tr>
<tr>
@@ -98,7 +98,7 @@ under the License.
<td> </td>
<td>
<div>
- <input type="text" name="FROM_DATE" size="25" maxlength="40" value="">
+ <input type="text" name="FROM_DATE" size="25" maxlength="40" value="" />
<a href="javascript:call_cal(document.editProductAssocForm.FROM_DATE, '${nowTimestampString}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
${uiLabelMap.CommonSetNowEmpty}
</div>
@@ -108,11 +108,11 @@ under the License.
<#else>
<#assign isCreate = false>
<#assign curProductAssocType = productAssoc.getRelatedOneCache("ProductAssocType")>
- <input type="hidden" name="UPDATE_MODE" value="UPDATE">
- <input type="hidden" name="PRODUCT_ID" value="${productId?if_exists}">
- <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}">
+ <input type="hidden" name="UPDATE_MODE" value="UPDATE" />
+ <input type="hidden" name="PRODUCT_ID" value="${productId?if_exists}" />
+ <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}" />
<tr>
<td align="right" class="label">${uiLabelMap.ProductProductId}</td>
<td> </td>
@@ -139,7 +139,7 @@ under the License.
<td> </td>
<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">
+ <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="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
</div>
</td>
@@ -147,28 +147,28 @@ under the License.
<tr>
<td width="26%" align="right" class="label">${uiLabelMap.ProductSequenceNum}</td>
<td> </td>
- <td width="74%"><input type="text" name="SEQUENCE_NUM" <#if useValues>value="${(productAssoc.sequenceNum)?if_exists}"<#else>value="${(request.getParameter("SEQUENCE_NUM"))?if_exists}"</#if> size="5" maxlength="10"></td>
+ <td width="74%"><input type="text" name="SEQUENCE_NUM" <#if useValues>value="${(productAssoc.sequenceNum)?if_exists}"<#else>value="${(request.getParameter("SEQUENCE_NUM"))?if_exists}"</#if> size="5" maxlength="10" /></td>
</tr>
<tr>
<td width="26%" align="right" class="label">${uiLabelMap.ProductReason}</td>
<td> </td>
- <td width="74%"><input type="text" name="REASON" <#if useValues>value="${(productAssoc.reason)?if_exists}"<#else>value="${(request.getParameter("REASON"))?if_exists}"</#if> size="60" maxlength="255"></td>
+ <td width="74%"><input type="text" name="REASON" <#if useValues>value="${(productAssoc.reason)?if_exists}"<#else>value="${(request.getParameter("REASON"))?if_exists}"</#if> size="60" maxlength="255" /></td>
</tr>
<tr>
<td width="26%" align="right" class="label">${uiLabelMap.ProductInstruction}</td>
<td> </td>
- <td width="74%"><input type="text" name="INSTRUCTION" <#if useValues>value="${(productAssoc.instruction)?if_exists}"<#else>value="${(request.getParameter("INSTRUCTION"))?if_exists}"</#if> size="60" maxlength="255"></td>
+ <td width="74%"><input type="text" name="INSTRUCTION" <#if useValues>value="${(productAssoc.instruction)?if_exists}"<#else>value="${(request.getParameter("INSTRUCTION"))?if_exists}"</#if> size="60" maxlength="255" /></td>
</tr>
<tr>
<td width="26%" align="right" class="label">${uiLabelMap.ProductQuantity}</td>
<td> </td>
- <td width="74%"><input type="text" name="QUANTITY" <#if useValues>value="${(productAssoc.quantity)?if_exists}"<#else>value="${(request.getParameter("QUANTITY"))?if_exists}"</#if> size="10" maxlength="15"></td>
+ <td width="74%"><input type="text" name="QUANTITY" <#if useValues>value="${(productAssoc.quantity)?if_exists}"<#else>value="${(request.getParameter("QUANTITY"))?if_exists}"</#if> size="10" maxlength="15" /></td>
</tr>
<tr>
<td colspan="2"> </td>
- <td><input type="submit" <#if isCreate>value="${uiLabelMap.CommonCreate}"<#else>value="${uiLabelMap.CommonUpdate}"</#if>></td>
+ <td><input type="submit" <#if isCreate>value="${uiLabelMap.CommonCreate}"<#else>value="${uiLabelMap.CommonUpdate}"</#if> /></td>
</tr>
</table>
</form>
@@ -207,11 +207,11 @@ under the License.
<td> ${(assocFromProduct.quantity)?if_exists}</td>
<td><#if curProductAssocType?exists> ${(curProductAssocType.get("description",locale))?if_exists}<#else>${(assocFromProduct.productAssocTypeId)?if_exists}</#if></td>
<td>
- <a href="<@o...@ofbizUrl>" class="buttontext">
+ <a href="<@o...@ofbizUrl>" class="buttontext">
${uiLabelMap.CommonDelete}</a>
</td>
<td>
- <a href="<@o...@ofbizUrl>" class="buttontext">
+ <a href="<@o...@ofbizUrl>" class="buttontext">
${uiLabelMap.CommonEdit}</a>
</td>
</tr>
@@ -250,7 +250,7 @@ under the License.
<td>${(assocToProduct.getTimestamp("thruDate"))?if_exists} </td>
<td><#if curProductAssocType?exists> ${(curProductAssocType.get("description",locale))?if_exists}<#else> ${(assocToProduct.productAssocTypeId)?if_exists}</#if></td>
<td>
- <a href="<@o...@ofbizUrl>" class="buttontext">
+ <a href="<@o...@ofbizUrl>" class="buttontext">
${uiLabelMap.CommonDelete}</a>
</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=931700&r1=931699&r2=931700&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductFeatures.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductFeatures.ftl Wed Apr 7 21:50:56 2010
@@ -41,15 +41,15 @@ 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>>
- <input type="hidden" name="productId_o_${productFeatureAndAppl_index}" value="${(productFeatureAndAppl.productId)?if_exists}">
+ <tr id="productFeatureId_tableRow_${productFeatureAndAppl_index}" valign="middle"<#if rowClass == "1"> class="alternate-row"</#if> />
+ <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="fromDate_o_${productFeatureAndAppl_index}" value="${(productFeatureAndAppl.fromDate)?if_exists}">
+ <input type="hidden" name="fromDate_o_${productFeatureAndAppl_index}" value="${(productFeatureAndAppl.fromDate)?if_exists}" />
<td><a href="<@o...@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>
- <td><a href="<@o...@ofbizUrl>" class="buttontext">
+ <td><a href="<@o...@ofbizUrl>" class="buttontext">
${(curProductFeatureCategory.description)?if_exists}
[${(productFeatureAndAppl.productFeatureCategoryId)?if_exists}]</a></td>
<#assign hasntStarted = false>
@@ -58,10 +58,10 @@ under the License.
<td>
<#assign hasExpired = false>
<#if (productFeatureAndAppl.getTimestamp("thruDate"))?exists && Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().after(productFeatureAndAppl.getTimestamp("thruDate"))> <#assign hasExpired = true></#if>
- <input type='text' size='25' name='thruDate_o_${productFeatureAndAppl_index}' value='${(productFeatureAndAppl.thruDate)?if_exists}' <#if hasExpired> style='color: red;'</#if>>
+ <input type='text' size='25' name='thruDate_o_${productFeatureAndAppl_index}' value='${(productFeatureAndAppl.thruDate)?if_exists}' <#if hasExpired> style='color: red;'</#if> />
<a href="javascript:call_cal(document.selectAllForm.thruDate_o_${productFeatureAndAppl_index}, '${(productFeatureAndAppl.thruDate)?default(nowTimestamp?string)}');"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'/></a>
- <input type="text" size='6' name='amount_o_${productFeatureAndAppl_index}' value='${(productFeatureAndAppl.amount)?if_exists}'>
- <input type="text" size='5' name='sequenceNum_o_${productFeatureAndAppl_index}' value='${(productFeatureAndAppl.sequenceNum)?if_exists}'>
+ <input type="text" size='6' name='amount_o_${productFeatureAndAppl_index}' value='${(productFeatureAndAppl.amount)?if_exists}' />
+ <input type="text" size='5' name='sequenceNum_o_${productFeatureAndAppl_index}' value='${(productFeatureAndAppl.sequenceNum)?if_exists}' />
<select name='productFeatureApplTypeId_o_${productFeatureAndAppl_index}' size="1">
<#if (productFeatureAndAppl.productFeatureApplTypeId)?exists>
<option value='${(productFeatureAndAppl.productFeatureApplTypeId)?if_exists}'><#if curProductFeatureApplType?exists> ${(curProductFeatureApplType.get("description",locale))?if_exists} <#else> [${productFeatureAndAppl.productFeatureApplTypeId}]</#if></option>
@@ -73,7 +73,7 @@ under the License.
</select>
</td>
<td align="right">
- <input type="checkbox" name="_rowSubmit_o_${productFeatureAndAppl_index}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');highlightRow(this,'productFeatureId_tableRow_${productFeatureAndAppl_index}');">
+ <input type="checkbox" name="_rowSubmit_o_${productFeatureAndAppl_index}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');highlightRow(this,'productFeatureId_tableRow_${productFeatureAndAppl_index}');" />
</td>
<td>
<a href="javascript:document.RemoveFeatureFromProduct_o_${productFeatureAndAppl_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a>
Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl?rev=931700&r1=931699&r2=931700&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl Wed Apr 7 21:50:56 2010
@@ -16,7 +16,7 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<#assign externalKeyParam = "&externalLoginKey=" + requestAttributes.externalLoginKey?if_exists>
+<#assign externalKeyParam = "&externalLoginKey=" + requestAttributes.externalLoginKey?if_exists>
<div class="screenlet">
<#if product?exists>
<div class="screenlet-title-bar">
@@ -28,7 +28,7 @@ under the License.
<#if showEmpty>
<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.ProductHideEmptyItems}</a>
<#else>
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.ProductShowEmptyItems}</a>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.ProductShowEmptyItems}</a>
</#if>
</#if>
<br />
@@ -86,7 +86,7 @@ under the License.
<#else>
<td> </td>
</#if>
- <td><a href="/facility/control/EditFacilityLocation?facilityId=${(inventoryItem.facilityId)?if_exists}&locationSeqId=${(inventoryItem.locationSeqId)?if_exists}${externalKeyParam}" class="linktext"><#if facilityLocation?exists>${facilityLocation.areaId?if_exists}:${facilityLocation.aisleId?if_exists}:${facilityLocation.sectionId?if_exists}:${facilityLocation.levelId?if_exists}:${facilityLocation.positionId?if_exists}</#if><#if facilityLocationTypeEnum?has_content> (${facilityLocationTypeEnum.get("description",locale)})</#if> [${(inventoryItem.locationSeqId)?if_exists}]</a></td>
+ <td><a href="/facility/control/EditFacilityLocation?facilityId=${(inventoryItem.facilityId)?if_exists}&locationSeqId=${(inventoryItem.locationSeqId)?if_exists}${externalKeyParam}" class="linktext"><#if facilityLocation?exists>${facilityLocation.areaId?if_exists}:${facilityLocation.aisleId?if_exists}:${facilityLocation.sectionId?if_exists}:${facilityLocation.levelId?if_exists}:${facilityLocation.positionId?if_exists}</#if><#if facilityLocationTypeEnum?has_content> (${facilityLocationTypeEnum.get("description",locale)})</#if> [${(inventoryItem.locationSeqId)?if_exists}]</a></td>
<td> ${(inventoryItem.lotId)?if_exists}</td>
<td> ${(inventoryItem.binNumber)?if_exists}</td>
<td align="right"><@ofbizCurrency amount=inventoryItem.unitCost isoCode=inventoryItem.currencyUomId/></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=931700&r1=931699&r2=931700&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl Wed Apr 7 21:50:56 2010
@@ -41,22 +41,22 @@ under the License.
<form method="post" action="<@o...@ofbizUrl>" name="lineForm${line}">
<#assign hasExpired = false>
<#if (productRole.getTimestamp("thruDate"))?exists && (Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().after(productRole.getTimestamp("thruDate")))> <#assign hasExpired = true></#if>
- <input type="hidden" name="productId" value="${(productRole.productId)?if_exists}">
- <input type="hidden" name="partyId" value="${(productRole.partyId)?if_exists}">
- <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>>
+ <input type="hidden" name="productId" value="${(productRole.productId)?if_exists}" />
+ <input type="hidden" name="partyId" value="${(productRole.partyId)?if_exists}" />
+ <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="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
- <input type="submit" value="${uiLabelMap.CommonUpdate}">
+ <input type="submit" value="${uiLabelMap.CommonUpdate}" />
</form>
</td>
<td align="center">
<form action="<@o...@ofbizUrl>" method="post">
- <input type="hidden" name="partyId" value="${(productRole.partyId)?if_exists}">
- <input type="hidden" name="productId" value="${(productRole.productId)?if_exists}">
- <input type="hidden" name="roleTypeId" value="${(productRole.roleTypeId)?if_exists}">
- <input type="hidden" name="fromDate" value="${productRole.getString("fromDate")}">
- <input type="submit" value="${uiLabelMap.CommonDelete}">
+ <input type="hidden" name="partyId" value="${(productRole.partyId)?if_exists}" />
+ <input type="hidden" name="productId" value="${(productRole.productId)?if_exists}" />
+ <input type="hidden" name="roleTypeId" value="${(productRole.roleTypeId)?if_exists}" />
+ <input type="hidden" name="fromDate" value="${productRole.getString("fromDate")}" />
+ <input type="submit" value="${uiLabelMap.CommonDelete}" />
</form>
</td>
</tr>
@@ -72,8 +72,8 @@ under the License.
<h2>${uiLabelMap.ProductAssociatePartyToProduct}:</h2>
<br />
<form method="post" action="<@o...@ofbizUrl>" name="addNewForm">
- <input type="hidden" name="productId" value="${productId}">
- <input type="text" size="20" maxlength="20" name="partyId" value="">
+ <input type="hidden" name="productId" value="${productId}" />
+ <input type="text" size="20" maxlength="20" name="partyId" value="" />
<#-- TODO: Add PartyId lookup screen
<a href="javascript:call_fieldlookup2(document.addNewForm.partyId,'LookupCustomerName');">
<img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/>
@@ -83,8 +83,8 @@ under the License.
<option value="${(roleType.roleTypeId)?if_exists}" <#if roleType.roleTypeId.equals("_NA_")> ${uiLabelMap.ProductSelected}</#if>>${(roleType.get("description",locale))?if_exists}</option>
</#list>
</select>
- <input type="text" size="25" name="fromDate">
+ <input type="text" size="25" name="fromDate" />
<a href="javascript:call_cal(document.addNewForm.fromDate, '${nowTimestamp?string}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
- <input type="submit" value="${uiLabelMap.CommonAdd}">
+ <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=931700&r1=931699&r2=931700&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl Wed Apr 7 21:50:56 2010
@@ -16,7 +16,7 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<#assign externalKeyParam = "&externalLoginKey=" + requestAttributes.externalLoginKey?if_exists>
+<#assign externalKeyParam = "&externalLoginKey=" + requestAttributes.externalLoginKey?if_exists>
<#if product?has_content>
<!-- First some general forms and scripts -->
<form name="removeAssocForm" action="<@o...@ofbizUrl>">
@@ -123,7 +123,7 @@ function doPublish() {
<#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><a class="buttontext" href="<@o...@ofbizUrl>">${assocProduct.productId?if_exists}</a></td>
+ <td nowrap="nowrap"><a class="buttontext" href="<@o...@ofbizUrl>">${assocProduct.productId?if_exists}</a></td>
<td width="100%"><a class="buttontext" href="<@o...@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}"/>
@@ -182,7 +182,7 @@ function doPublish() {
<#assign rowClass = "2">
<#list distinguishingFeatures as distinguishingFeature>
<tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
- <td><a href="<@o...@ofbizUrl>" class="buttontext">x</a>
+ <td><a href="<@o...@ofbizUrl>" class="buttontext">x</a>
${distinguishingFeature.productFeatureId} ${productFeatureTypeLookup.get(distinguishingFeature.productFeatureId).get("description",locale)}: ${distinguishingFeature.get("description",locale)}
</td>
@@ -257,20 +257,20 @@ function doPublish() {
</tr>
<#else>
<tr>
- <td><input type="text" name="productHeight" size="6" maxlength="20" value="${product.productHeight?if_exists}"></td>
- <td><input type="text" name="productWidth" size="6" maxlength="20" value="${product.productWidth?if_exists}"></td>
- <td><input type="text" name="productDepth" size="6" maxlength="20" value="${product.productDepth?if_exists}"></td>
- <td><input type="text" name="weight" size="6" maxlength="20" value="${product.weight?if_exists}"></td>
- <td><input type="text" name="~floz" size="6" maxlength="20" value="${floz?if_exists}"></td>
- <td><input type="text" name="~ml" size="6" maxlength="20" value="${ml?if_exists}"></td>
- <td><input type="text" name="~ntwt" size="6" maxlength="20" value="${ntwt?if_exists}"></td>
- <td><input type="text" name="~grams" size="6" maxlength="20" value="${grams?if_exists}"></td>
+ <td><input type="text" name="productHeight" size="6" maxlength="20" value="${product.productHeight?if_exists}" /></td>
+ <td><input type="text" name="productWidth" size="6" maxlength="20" value="${product.productWidth?if_exists}" /></td>
+ <td><input type="text" name="productDepth" size="6" maxlength="20" value="${product.productDepth?if_exists}" /></td>
+ <td><input type="text" name="weight" size="6" maxlength="20" value="${product.weight?if_exists}" /></td>
+ <td><input type="text" name="~floz" size="6" maxlength="20" value="${floz?if_exists}" /></td>
+ <td><input type="text" name="~ml" size="6" maxlength="20" value="${ml?if_exists}" /></td>
+ <td><input type="text" name="~ntwt" size="6" maxlength="20" value="${ntwt?if_exists}" /></td>
+ <td><input type="text" name="~grams" size="6" maxlength="20" value="${grams?if_exists}" /></td>
<td><a class="buttontext" href="<@o...@ofbizUrl>">${StringUtil.wrapString(hazmat?if_exists)}</a></td>
<td><a class="buttontext" href="<@o...@ofbizUrl>">${StringUtil.wrapString(salesthru?if_exists)}</a></td>
<td><a class="buttontext" href="<@o...@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>
@@ -326,7 +326,7 @@ function doPublish() {
<#list standardFeatureAppls as standardFeatureAppl>
<#assign featureId = standardFeatureAppl.productFeatureId/>
<tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
- <td colspan="2"><a href='<@o...@ofbizUrl>' class="buttontext">x</a>
+ <td colspan="2"><a href='<@o...@ofbizUrl>' class="buttontext">x</a>
${productFeatureTypeLookup.get(featureId).description}: ${standardFeatureLookup.get(featureId).description}
</td>
</tr>
Modified: ofbiz/trunk/applications/product/webapp/catalog/product/ProductInventorySummary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/ProductInventorySummary.ftl?rev=931700&r1=931699&r2=931700&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/ProductInventorySummary.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/ProductInventorySummary.ftl Wed Apr 7 21:50:56 2010
@@ -58,7 +58,7 @@ under the License.
<#assign outgoingQuantityTotal = manufacturingOutQuantitySummary.estimatedQuantityTotal?if_exists>
<tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
<td>${(facility.facilityName)?if_exists} [${facilityId?default("[No Facility]")}]
- <a href="/facility/control/ReceiveInventory?facilityId=${facilityId}&productId=${productId}&externLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.ProductInventoryReceive}</a></td>
+ <a href="/facility/control/ReceiveInventory?facilityId=${facilityId}&productId=${productId}&externLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.ProductInventoryReceive}</a></td>
<td><#if totalAvailableToPromise?exists>${totalAvailableToPromise}<#else> </#if></td>
<td><#if totalQuantityOnHand?exists>${totalQuantityOnHand}<#else> </#if></td>
<#if isMarketingPackage == "true">
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=931700&r1=931699&r2=931700&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/QuickAddVariants.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/QuickAddVariants.ftl Wed Apr 7 21:50:56 2010
@@ -52,9 +52,9 @@ function clickAll(e) {
<table cellspacing="0" class="basic-table">
<#assign rowCount = 0>
<form method="post" action="<@o...@ofbizUrl>" name="selectAllForm">
- <input type="hidden" name="productId" value="${productId}">
- <input type="hidden" name="_useRowSubmit" value="Y">
- <input type="hidden" name="_checkGlobalScope" value="Y">
+ <input type="hidden" name="productId" value="${productId}" />
+ <input type="hidden" name="_useRowSubmit" value="Y" />
+ <input type="hidden" name="_checkGlobalScope" value="Y" />
<tr class="header-row">
<#list featureTypes as featureType>
<td><b>${featureType}</b></td>
@@ -62,7 +62,7 @@ function clickAll(e) {
<td><b>${uiLabelMap.ProductNewProductCreate} !</b></td>
<td><b>${uiLabelMap.ProductSequenceNum}</b></td>
<td><b>${uiLabelMap.ProductExistingVariant} :</b></td>
- <td align="right"><b>${uiLabelMap.CommonAll}<input type="checkbox" name="selectAll" value="${uiLabelMap.CommonY}" onclick="javascript:clickAll(this);"></b></td>
+ <td align="right"><b>${uiLabelMap.CommonAll}<input type="checkbox" name="selectAll" value="${uiLabelMap.CommonY}" onclick="javascript:clickAll(this);" /></b></td>
</tr>
<#assign defaultSequenceNum = 10>
@@ -94,7 +94,7 @@ function clickAll(e) {
</div>
</td>
<td align="right">
- <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:setProductVariantId(this, '${defaultVariantProductId}', 'productVariantId_o_${rowCount}');">
+ <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:setProductVariantId(this, '${defaultVariantProductId}', 'productVariantId_o_${rowCount}');" />
</td>
</tr>
<#assign defaultSequenceNum = defaultSequenceNum + 10>
@@ -109,7 +109,7 @@ function clickAll(e) {
<tr>
<#assign columns = featureTypes.size() + 4>
<td colspan="${columns}" align="center">
- <input type="hidden" name="_rowCount" value="${rowCount}">
+ <input type="hidden" name="_rowCount" value="${rowCount}" />
<input type="submit" class="smallSubmit" value="${uiLabelMap.CommonCreate}"/>
</td>
</tr>
Modified: ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoCode.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoCode.ftl?rev=931700&r1=931699&r2=931700&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoCode.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoCode.ftl Wed Apr 7 21:50:56 2010
@@ -23,14 +23,14 @@ under the License.
</div>
<div class="screenlet-body">
<#list productPromoCodeEmails as productPromoCodeEmail>
- <div><a href="<@o...@ofbizUrl>" class="buttontext">X</a> ${productPromoCodeEmail.emailAddress}</div>
+ <div><a href="<@o...@ofbizUrl>" class="buttontext">X</a> ${productPromoCodeEmail.emailAddress}</div>
</#list>
<div>
<form method="post" action="<@o...@ofbizUrl>" style="margin: 0;">
<input type="hidden" name="productPromoCodeId" value="${productPromoCodeId?if_exists}"/>
<input type="hidden" name="productPromoId" value="${productPromoId}"/>
- <span class="label">${uiLabelMap.ProductAddEmail}:</span><input type="text" size="40" name="emailAddress">
- <input type="submit" value="${uiLabelMap.CommonAdd}">
+ <span class="label">${uiLabelMap.ProductAddEmail}:</span><input type="text" size="40" name="emailAddress" />
+ <input type="submit" value="${uiLabelMap.CommonAdd}" />
</form>
<#if productPromoCode.requireEmailOrParty?if_exists == "N">
<div class="tooltip">${uiLabelMap.ProductNoteRequireEmailParty}</div>
@@ -38,8 +38,8 @@ under the License.
<form method="post" action="<@o...@ofbizUrl>" enctype="multipart/form-data" style="margin: 0;">
<input type="hidden" name="productPromoCodeId" value="${productPromoCodeId?if_exists}"/>
<input type="hidden" name="productPromoId" value="${productPromoId}"/>
- <input type="file" size="40" name="uploadedFile">
- <input type="submit" value="${uiLabelMap.CommonUpload}">
+ <input type="file" size="40" name="uploadedFile" />
+ <input type="submit" value="${uiLabelMap.CommonUpload}" />
</form>
</div>
</div>
@@ -50,14 +50,14 @@ under the License.
</div>
<div class="screenlet-body">
<#list productPromoCodeParties as productPromoCodeParty>
- <div><a href="<@o...@ofbizUrl>" class="buttontext">X</a> ${productPromoCodeParty.partyId}</div>
+ <div><a href="<@o...@ofbizUrl>" class="buttontext">X</a> ${productPromoCodeParty.partyId}</div>
</#list>
<div>
<form method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="productPromoCodeId" value="${productPromoCodeId?if_exists}"/>
<input type="hidden" name="productPromoId" value="${productPromoId}"/>
- <span class="label">${uiLabelMap.ProductAddPartyId}:</span><input type="text" size="10" name="partyId">
- <input type="submit" value="${uiLabelMap.CommonAdd}">
+ <span class="label">${uiLabelMap.ProductAddPartyId}:</span><input type="text" size="10" name="partyId" />
+ <input type="submit" value="${uiLabelMap.CommonAdd}" />
</form>
</div>
</div>