You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jo...@apache.org on 2009/02/14 22:52:16 UTC
svn commit: r744574 - in /ofbiz/trunk:
applications/ecommerce/webapp/ecommerce/catalog/
applications/ecommerce/webapp/ecommerce/customer/
applications/manufacturing/webapp/manufacturing/bom/
applications/manufacturing/webapp/manufacturing/reports/ appl...
Author: jonesde
Date: Sat Feb 14 21:52:16 2009
New Revision: 744574
URL: http://svn.apache.org/viewvc?rev=744574&view=rev
Log:
A number of cleanups for double encoding, encoding that is not wanted (like for surveys, 2 places used toString() and others didn't so were fine), using always there nowTimestamp
Modified:
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/productdetail.ftl
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/customersurvey.ftl
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsComponentsByFeature.fo.ftl
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsByFeature.fo.ftl
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsStacks.fo.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/survey.ftl
ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl
ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryParties.ftl
ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl
ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl
ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl
ofbiz/trunk/applications/product/webapp/catalog/product/EditProductFeatures.ftl
ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl
ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl
ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl
ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl
ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatBinsHistory.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatsSinceStart.ftl
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/productdetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/productdetail.ftl?rev=744574&r1=744573&r2=744574&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/productdetail.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/productdetail.ftl Sat Feb 14 21:52:16 2009
@@ -507,8 +507,8 @@
</div>
<#if product.productTypeId?if_exists == "ASSET_USAGE">
<table width="100%"><tr>
- <td nowrap align="right">Start Date<br/>(yyyy-mm-dd)</td><td><input type="text" size="10" name="reservStart"/><a href="javascript:call_cal_notime(document.addform.reservStart, '${Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString().substring(0,10)}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a></td>
- <td nowrap align="right">End Date<br/>(yyyy-mm-dd)</td><td><input type="text" size="10" name="reservEnd"/><a href="javascript:call_cal_notime(document.addform.reservEnd, '${Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString().substring(0,10)}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a></td></tr>
+ <td nowrap align="right">Start Date<br/>(yyyy-mm-dd)</td><td><input type="text" size="10" name="reservStart"/><a href="javascript:call_cal_notime(document.addform.reservStart, '${nowTimestamp.toString().substring(0,10)}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a></td>
+ <td nowrap align="right">End Date<br/>(yyyy-mm-dd)</td><td><input type="text" size="10" name="reservEnd"/><a href="javascript:call_cal_notime(document.addform.reservEnd, '${nowTimestamp.toString().substring(0,10)}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a></td></tr>
<tr>
<#--td nowrap align="right">Number<br/>of days</td><td><input type="textt" size="4" name="reservLength"/></td></tr><tr><td> </td><td align="right" nowrap> </td-->
<td nowrap align="right">Number of persons</td><td><input type="text" size="4" name="reservPersons" value="2"/></td>
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/customersurvey.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/customersurvey.ftl?rev=744574&r1=744573&r2=744574&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/customersurvey.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/customersurvey.ftl Sat Feb 14 21:52:16 2009
@@ -25,7 +25,7 @@
<#-- Render the survey -->
<#if surveyWrapper?has_content>
<form method="post" enctype="multipart/form-data" action="<@o...@ofbizUrl>" style="margin: 0;">
- ${surveyWrapper.render().toString()}
+ ${surveyWrapper.render()}
</form>
<#else>
<h1>${uiLabelMap.OrderNothingToDoHere}</h1>
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=744574&r1=744573&r2=744574&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl Sat Feb 14 21:52:16 2009
@@ -268,12 +268,10 @@
<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 -->
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsComponentsByFeature.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsComponentsByFeature.fo.ftl?rev=744574&r1=744573&r2=744574&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsComponentsByFeature.fo.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsComponentsByFeature.fo.ftl Sat Feb 14 21:52:16 2009
@@ -95,7 +95,7 @@
<fo:table-cell>
<fo:block line-height="12pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
<fo:inline font-size="10pt">${uiLabelMap.ManufacturingPrintoutDate}:</fo:inline>
- <fo:inline font-weight="bold" font-size="10pt">${Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString()}</fo:inline>
+ <fo:inline font-weight="bold" font-size="10pt">${nowTimestamp}</fo:inline>
</fo:block>
</fo:table-cell>
<fo:table-cell>
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsByFeature.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsByFeature.fo.ftl?rev=744574&r1=744573&r2=744574&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsByFeature.fo.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsByFeature.fo.ftl Sat Feb 14 21:52:16 2009
@@ -89,7 +89,7 @@
<fo:table-cell>
<fo:block line-height="12pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
<fo:inline font-size="10pt">${uiLabelMap.ManufacturingPrintoutDate}:</fo:inline>
- <fo:inline font-weight="bold" font-size="10pt">${Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString()}</fo:inline>
+ <fo:inline font-weight="bold" font-size="10pt">${nowTimestamp}</fo:inline>
</fo:block>
</fo:table-cell>
<fo:table-cell>
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsStacks.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsStacks.fo.ftl?rev=744574&r1=744573&r2=744574&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsStacks.fo.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsStacks.fo.ftl Sat Feb 14 21:52:16 2009
@@ -174,7 +174,7 @@
</fo:table-cell>
<fo:table-cell>
<fo:block line-height="13pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
- <fo:inline font-weight="bold" font-size="12pt">${Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString()}</fo:inline>
+ <fo:inline font-weight="bold" font-size="12pt">${nowTimestamp}</fo:inline>
</fo:block>
</fo:table-cell>
</fo:table-row>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl?rev=744574&r1=744573&r2=744574&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl Sat Feb 14 21:52:16 2009
@@ -500,8 +500,8 @@
</div>
<#if product.productTypeId?if_exists == "ASSET_USAGE">
<table width="100%"><tr>
- <td nowrap align="right">Start Date<br/>(yyyy-mm-dd)</td><td><input type="text" size="10" name="reservStart"/><a href="javascript:call_cal_notime(document.addform.reservStart, '${Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString().substring(0,10)}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a></td>
- <td nowrap align="right">End Date<br/>(yyyy-mm-dd)</td><td><input type="text" size="10" name="reservEnd"/><a href="javascript:call_cal_notime(document.addform.reservEnd, '${Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString().substring(0,10)}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a></td></tr>
+ <td nowrap align="right">Start Date<br/>(yyyy-mm-dd)</td><td><input type="text" size="10" name="reservStart"/><a href="javascript:call_cal_notime(document.addform.reservStart, '${nowTimestamp.toString().substring(0,10)}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a></td>
+ <td nowrap align="right">End Date<br/>(yyyy-mm-dd)</td><td><input type="text" size="10" name="reservEnd"/><a href="javascript:call_cal_notime(document.addform.reservEnd, '${nowTimestamp.toString().substring(0,10)}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a></td></tr>
<tr>
<#--td nowrap align="right">Number<br/>of days</td><td><input type="textt" size="4" name="reservLength"/></td></tr><tr><td> </td><td align="right" nowrap> </td-->
<td nowrap align="right">Number of persons</td><td><input type="text" size="4" name="reservPersons" value="2"/></td>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/survey.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/survey.ftl?rev=744574&r1=744573&r2=744574&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/survey.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/survey.ftl Sat Feb 14 21:52:16 2009
@@ -20,7 +20,7 @@
<#-- Render the survey -->
<#if requestAttributes.surveyWrapper?exists && requestAttributes.surveyAction?exists>
<form method="post" enctype="multipart/form-data" action="<@o...@ofbizUrl>" style="margin: 0;">
- ${requestAttributes.surveyWrapper.renderSurvey().toString()}
+ ${requestAttributes.surveyWrapper.renderSurvey()}
</form>
<#else>
<h1>${uiLabelMap.OrderNothingToDoHere}</h1>
Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl?rev=744574&r1=744573&r2=744574&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl Sat Feb 14 21:52:16 2009
@@ -54,8 +54,7 @@
</form>
</td>
<td align="center">
- <a href="<@o...@ofbizUrl>" class="buttontext">
- ${uiLabelMap.CommonDelete}</a>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a>
</td>
</tr>
<#-- toggle the row color -->
@@ -126,8 +125,7 @@
</form>
</td>
<td align="center">
- <a href="<@o...@ofbizUrl>" class="buttontext">
- ${uiLabelMap.CommonDelete}</a>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a>
</td>
</tr>
<#-- toggle the row color -->
Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryParties.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryParties.ftl?rev=744574&r1=744573&r2=744574&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryParties.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryParties.ftl Sat Feb 14 21:52:16 2009
@@ -56,8 +56,7 @@
</FORM>
</td>
<td align="center">
- <a href="<@o...@ofbizUrl>" class="buttontext">
- ${uiLabelMap.CommonDelete}</a>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a>
</td>
</tr>
<#-- toggle the row color -->
Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl?rev=744574&r1=744573&r2=744574&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl Sat Feb 14 21:52:16 2009
@@ -72,7 +72,7 @@
</form>
</td>
<td align="center">
- <a href="<@o...@ofbizUrl>" class="buttontext">
+ <a href="<@o...@ofbizUrl>" class="buttontext">
${uiLabelMap.CommonDelete}</a>
</td>
</tr>
Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl?rev=744574&r1=744573&r2=744574&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl Sat Feb 14 21:52:16 2009
@@ -81,7 +81,7 @@
<textarea name="comments${suffix}" rows="2" cols="40">${(productCategoryMember.comments)?if_exists}</textarea>
</td>
<td align="center">
- <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/EditProductAssoc.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl?rev=744574&r1=744573&r2=744574&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl Sat Feb 14 21:52:16 2009
@@ -207,11 +207,11 @@
<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 @@
<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=744574&r1=744573&r2=744574&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductFeatures.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductFeatures.ftl Sat Feb 14 21:52:16 2009
@@ -77,8 +77,7 @@
<input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');highlightRow(this,'productFeatureId_tableRow_${rowCount}');">
</td>
<td>
- <a href='<@o...@ofbizUrl>' class="buttontext">
- ${uiLabelMap.CommonDelete}</a>
+ <a href='<@o...@ofbizUrl>' class="buttontext">${uiLabelMap.CommonDelete}</a>
</td>
</tr>
<#assign rowCount = rowCount + 1>
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=744574&r1=744573&r2=744574&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl Sat Feb 14 21:52:16 2009
@@ -51,8 +51,7 @@
</form>
</td>
<td align="center">
- <a href="<@o...@ofbizUrl>" class="buttontext">
- ${uiLabelMap.CommonDelete}</a>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a>
</td>
</tr>
<#-- toggle the row color -->
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=744574&r1=744573&r2=744574&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl Sat Feb 14 21:52:16 2009
@@ -326,7 +326,7 @@
<#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>
@@ -391,7 +391,7 @@
<#list productCategoryMembers as prodCatMemb>
<#assign prodCat = prodCatMemb.getRelatedOne("ProductCategory")/>
<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>
${prodCat.description?if_exists} ${prodCat.productCategoryId}</td>
</tr>
<#-- toggle the row color -->
Modified: ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl?rev=744574&r1=744573&r2=744574&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl Sat Feb 14 21:52:16 2009
@@ -46,14 +46,14 @@
<input type="hidden" name="productStoreId" value="${productStorePromoAppl.productStoreId}">
<input type="hidden" name="productPromoId" value="${productStorePromoAppl.productPromoId}">
<input type="hidden" name="fromDate" value="${productStorePromoAppl.fromDate}">
- <input type="text" size="20" name="thruDate" value="${(productStorePromoAppl.thruDate.toString())?if_exists}" <#if hasExpired>style="color: red;"</#if>>
- <a href="javascript:call_cal(document.lineForm${line}.thruDate, '${nowTimestamp.toString()}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
+ <input type="text" size="20" name="thruDate" value="${(productStorePromoAppl.thruDate)?if_exists}" <#if hasExpired>style="color: red;"</#if>>
+ <a href="javascript:call_cal(document.lineForm${line}.thruDate, '${nowTimestamp}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
<input type="text" size="5" name="sequenceNum" value="${(productStorePromoAppl.sequenceNum)?if_exists}">
<input type="submit" value="${uiLabelMap.CommonUpdate}">
</form>
</td>
<td align="center">
- <a href="<@o...@ofbizUrl>" class="buttontext">
+ <a href="<@o...@ofbizUrl>" class="buttontext">
${uiLabelMap.CommonDelete}</a>
</td>
</tr>
@@ -81,7 +81,7 @@
</#list>
</select>
<input type="text" size="20" name="fromDate"/>
- <a href="javascript:call_cal(document.addProductPromoToCatalog.fromDate, '${nowTimestamp.toString()}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
+ <a href="javascript:call_cal(document.addProductPromoToCatalog.fromDate, '${nowTimestamp}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
<input type="submit" value="${uiLabelMap.CommonAdd}"/>
</form>
</div>
Modified: ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl?rev=744574&r1=744573&r2=744574&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl Sat Feb 14 21:52:16 2009
@@ -46,7 +46,7 @@
</#if>
<script language="JavaScript" type="text/javascript">
- function setNow(field) { eval('document.transferform.' + field + '.value="${Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString()}"'); }
+ function setNow(field) { eval('document.transferform.' + field + '.value="${nowTimestamp}"'); }
</script>
<table cellspacing="0" class="basic-table">
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=744574&r1=744573&r2=744574&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl Sat Feb 14 21:52:16 2009
@@ -17,7 +17,7 @@
under the License.
-->
<script language="JavaScript">
- function setNow(field) { eval('document.selectAllForm.' + field + '.value="${Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString()}"'); }
+ function setNow(field) { eval('document.selectAllForm.' + field + '.value="${nowTimestamp}"'); }
</script>
<h1>${title}</h1>
<#if invalidProductId?exists>
@@ -152,7 +152,7 @@
<td width="6%" align="right" nowrap class="label">${uiLabelMap.ProductDateReceived}</td>
<td width="6%"> </td>
<td width="74%">
- <input type="text" name="datetimeReceived" size="24" value="${Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString()}">
+ <input type="text" name="datetimeReceived" size="24" value="${nowTimestamp}">
<#-- <a href="#" onclick="setNow("datetimeReceived")" class="buttontext">[Now]</a> -->
</td>
</tr>
@@ -296,7 +296,6 @@
<input type="hidden" name="shipmentIdReceived" value="${shipment.shipmentId}"/>
</#if>
<input type="hidden" name="_useRowSubmit" value="Y"/>
- <#assign now = Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString()/>
<#assign rowCount = 0/>
<table class="basic-table" cellspacing="0">
<#if !purchaseOrderItems?exists || purchaseOrderItemsSize == 0>
@@ -330,7 +329,7 @@
<input type="hidden" name="orderId_o_${rowCount}" value="${orderItem.orderId}"/>
<input type="hidden" name="orderItemSeqId_o_${rowCount}" value="${orderItem.orderItemSeqId}"/>
<input type="hidden" name="facilityId_o_${rowCount}" value="${requestParameters.facilityId?if_exists}"/>
- <input type="hidden" name="datetimeReceived_o_${rowCount}" value="${now}"/>
+ <input type="hidden" name="datetimeReceived_o_${rowCount}" value="${nowTimestamp}"/>
<#if shipment?exists && shipment.shipmentId?has_content>
<input type="hidden" name="shipmentId_o_${rowCount}" value="${shipment.shipmentId}"/>
</#if>
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatBinsHistory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatBinsHistory.ftl?rev=744574&r1=744573&r2=744574&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatBinsHistory.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatBinsHistory.ftl Sat Feb 14 21:52:16 2009
@@ -22,7 +22,7 @@
</div>
<div class="button-bar"><a href="<@o...@ofbizUrl>" class="smallSubmit">${uiLabelMap.WebtoolsStatsMainPageTitle}</a>
<a href="<@o...@ofbizUrl>" class="smallSubmit">${uiLabelMap.WebtoolsStatsReloadPage}</a></div>
- <p><span class="label">${uiLabelMap.WebtoolsStatsCurrentTime}</span> ${Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString()}</p>
+ <p><span class="label">${uiLabelMap.WebtoolsStatsCurrentTime}</span> ${nowTimestamp}</p>
</div>
<#if security.hasPermission("SERVER_STATS_VIEW", session)>
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatsSinceStart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatsSinceStart.ftl?rev=744574&r1=744573&r2=744574&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatsSinceStart.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatsSinceStart.ftl Sat Feb 14 21:52:16 2009
@@ -22,7 +22,7 @@
</div>
<div class="button-bar"><a href="<@o...@ofbizUrl>" class="smallSubmit">${uiLabelMap.WebtoolsStatsClearSince}</a>
<a href="<@o...@ofbizUrl>" class="smallSubmit">${uiLabelMap.WebtoolsStatsReloadPage}</a></div>
- <p><span class="label">${uiLabelMap.WebtoolsStatsCurrentTime}</span> ${Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString()}</p>
+ <p><span class="label">${uiLabelMap.WebtoolsStatsCurrentTime}</span> ${nowTimestamp}</p>
</div>
<#if security.hasPermission("SERVER_STATS_VIEW", session)>
<#-- Request Table -->