You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by er...@apache.org on 2010/06/26 17:30:34 UTC
svn commit: r958236 [1/3] - in /ofbiz/branches/jquery:
applications/manufacturing/webapp/manufacturing/bom/
applications/manufacturing/webapp/manufacturing/mrp/
applications/manufacturing/webapp/manufacturing/routing/
applications/order/webapp/ordermgr...
Author: erwan
Date: Sat Jun 26 15:30:32 2010
New Revision: 958236
URL: http://svn.apache.org/viewvc?rev=958236&view=rev
Log:
a new patch from Sascha, OFBIZ-3830 jQuery calendar implementation
Added:
ofbiz/branches/jquery/themes/bizznesstime/webapp/bizznesstime/images/cal.gif (with props)
ofbiz/branches/jquery/themes/bluelight/webapp/bluelight/images/cal.gif (with props)
ofbiz/branches/jquery/themes/droppingcrumbs/webapp/droppingcrumbs/images/cal.gif (with props)
ofbiz/branches/jquery/themes/flatgrey/webapp/flatgrey/images/cal.gif (with props)
ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/
ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/cal.gif (with props)
ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-anim_basic_16x16.gif (with props)
ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-bg_diagonals-thick_18_b81900_40x40.png (with props)
ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-bg_diagonals-thick_20_666666_40x40.png (with props)
ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-bg_flat_10_000000_40x100.png (with props)
ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-bg_glass_100_f6f6f6_1x400.png (with props)
ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-bg_glass_100_fdf5ce_1x400.png (with props)
ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-bg_glass_65_ffffff_1x400.png (with props)
ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-bg_gloss-wave_35_f6a828_500x100.png (with props)
ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-bg_highlight-soft_100_eeeeee_1x100.png (with props)
ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-bg_highlight-soft_75_ffe45c_1x100.png (with props)
ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-icons_222222_256x240.png (with props)
ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-icons_228ef1_256x240.png (with props)
ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-icons_ef8c08_256x240.png (with props)
ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-icons_ffd27a_256x240.png (with props)
ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-icons_ffffff_256x240.png (with props)
Modified:
ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl
ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl
ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/routing/EditRoutingTaskAssoc.ftl
ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/cart/showcart.ftl
ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl
ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl
ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/optionsettings.ftl
ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/orderagreements.ftl
ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/appendorderitem.ftl
ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/editorderitems.ftl
ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/findOrders.ftl
ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
ofbiz/branches/jquery/applications/order/webapp/ordermgr/reports/reportlist.ftl
ofbiz/branches/jquery/applications/order/webapp/ordermgr/return/returnHeader.ftl
ofbiz/branches/jquery/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl
ofbiz/branches/jquery/applications/product/webapp/catalog/category/EditCategoryParties.ftl
ofbiz/branches/jquery/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl
ofbiz/branches/jquery/applications/product/webapp/catalog/category/EditCategoryProducts.ftl
ofbiz/branches/jquery/applications/product/webapp/catalog/category/EditCategoryRollup.ftl
ofbiz/branches/jquery/applications/product/webapp/catalog/find/keywordsearchactions.ftl
ofbiz/branches/jquery/applications/product/webapp/catalog/price/EditProductPriceRules.ftl
ofbiz/branches/jquery/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl
ofbiz/branches/jquery/applications/product/webapp/catalog/product/EditProductAssoc.ftl
ofbiz/branches/jquery/applications/product/webapp/catalog/product/EditProductFeatures.ftl
ofbiz/branches/jquery/applications/product/webapp/catalog/product/EditProductParties.ftl
ofbiz/branches/jquery/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl
ofbiz/branches/jquery/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl
ofbiz/branches/jquery/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl
ofbiz/branches/jquery/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl
ofbiz/branches/jquery/applications/product/webapp/facility/shipment/FindShipment.ftl
ofbiz/branches/jquery/applications/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl
ofbiz/branches/jquery/framework/common/webcommon/includes/commonMacros.ftl
ofbiz/branches/jquery/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl
ofbiz/branches/jquery/framework/webtools/webapp/webtools/entity/xmldsdump.ftl
ofbiz/branches/jquery/framework/widget/templates/htmlFormMacroLibrary.ftl
ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl
ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl
ofbiz/branches/jquery/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl
ofbiz/branches/jquery/specialpurpose/projectmgr/webapp/projectmgr/survey/ListSurveys.ftl
ofbiz/branches/jquery/themes/bizznesstime/webapp/bizznesstime/css/style.css
ofbiz/branches/jquery/themes/bluelight/webapp/bluelight/style.css
ofbiz/branches/jquery/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css
ofbiz/branches/jquery/themes/flatgrey/webapp/flatgrey/maincss.css
ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/style.css
ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/css/style.css
Modified: ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl?rev=958236&r1=958235&r2=958236&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl (original)
+++ ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl Sat Jun 26 15:30:32 2010
@@ -121,8 +121,7 @@ function lookupBom() {
<td align="right">${uiLabelMap.CommonFromDate}</td>
<td> </td>
<td>
- <input type="text" name="fromDate" size="25" maxlength="40" value=""/>
- <a href="javascript:call_cal(document.editProductAssocForm.fromDate,'${nowTimestampString}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
+ <@htmlTemplate.renderDateTimeField name="fromDate" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="50" id="fromDate_1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<span class="tooltip">(${uiLabelMap.ManufacturingWillBeSetToNow})</span>
</td>
</tr>
@@ -159,8 +158,7 @@ function lookupBom() {
<td width="26%" align="right">${uiLabelMap.CommonThruDate}</td>
<td> </td>
<td width="74%">
- <input type="text" name="thruDate" <#if useValues> value="${productAssoc.thruDate?if_exists}"<#else>value="${(request.getParameter("thruDate"))?if_exists}"</#if> size="30" maxlength="30"/>
- <a href="javascript:call_cal(document.editProductAssocForm.thruDate,<#if useValues>'${productAssoc.thruDate?if_exists}'<#elseif (request.getParameter("thruDate"))?exists>'${request.getParameter("thruDate")}'<#else>'${nowTimestampString}'</#if>);"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
+ <@htmlTemplate.renderDateTimeField name="thruDate" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" <#if useValues> value="${productAssoc.thruDate?if_exists}"<#else>value="${(request.getParameter("thruDate"))?if_exists}"</#if> size="30" maxlength="30" id="fromDate_2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</td>
</tr>
<tr>
Modified: ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl?rev=958236&r1=958235&r2=958236&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl (original)
+++ ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl Sat Jun 26 15:30:32 2010
@@ -73,10 +73,7 @@ function lookupInventory() {
<td width='20%' align='right' class="label">${uiLabelMap.CommonFromDate}</td>
<td width='5%'> </td>
<td>
- <input type='text' size='25' name='eventDate' value='${requestParameters.eventDate?if_exists}'/>
- <a href="javascript:call_cal(document.lookupinventory.eventDate,'');">
- <img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'/>
- </a>
+ <@htmlTemplate.renderDateTimeField name="eventDate" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${requestParameters.eventDate?if_exists}" size="25" maxlength="30" id="fromDate_2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</td>
</tr>
<tr>
Modified: ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/routing/EditRoutingTaskAssoc.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/routing/EditRoutingTaskAssoc.ftl?rev=958236&r1=958235&r2=958236&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/routing/EditRoutingTaskAssoc.ftl (original)
+++ ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/routing/EditRoutingTaskAssoc.ftl Sat Jun 26 15:30:32 2010
@@ -48,8 +48,7 @@ function addRoutingTask() {
${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>
+ <@htmlTemplate.renderDateTimeField name="fromDate" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="fromDate_1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</td>
<td align="center" width="40%"> </td>
</tr>
@@ -64,8 +63,7 @@ function addRoutingTask() {
${uiLabelMap.CommonThruDate}
</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>
+ <@htmlTemplate.renderDateTimeField name="thruDate" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="thruDate_1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</td>
<td> </td>
</tr>
Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/cart/showcart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/cart/showcart.ftl?rev=958236&r1=958235&r2=958236&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/cart/showcart.ftl (original)
+++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/cart/showcart.ftl Sat Jun 26 15:30:32 2010
@@ -110,8 +110,7 @@ under the License.
<td align="right"><div>${uiLabelMap.OrderDesiredDeliveryDate} :</div></td>
<td>
<div>
- <input type="text" size="25" maxlength="30" name="itemDesiredDeliveryDate"<#if useAsDefaultDesiredDeliveryDate?exists> value="${defaultDesiredDeliveryDate}"</#if>/>
- <a href="javascript:call_cal(document.quickaddform.itemDesiredDeliveryDate,'${defaultDesiredDeliveryDate} 00:00:00.0');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.OrderCalendarClickHereForCalendar}"/></a>
+ <@htmlTemplate.renderDateTimeField name="itemDesiredDeliveryDate"<#if useAsDefaultDesiredDeliveryDate?exists> value="${defaultDesiredDeliveryDate}" <#else> value=""</#if> className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="item1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<input type="checkbox" name="useAsDefaultDesiredDeliveryDate" value="true"<#if useAsDefaultDesiredDeliveryDate?exists> checked="checked"</#if>/>
${uiLabelMap.OrderUseDefaultDesiredDeliveryDate}
</div>
@@ -121,8 +120,7 @@ under the License.
<td align="right"><div>${uiLabelMap.OrderShipAfterDate} :</div></td>
<td>
<div>
- <input type="text" size="20" maxlength="30" name="shipAfterDate" value="${shoppingCart.getDefaultShipAfterDate()?default("")}"/>
- <a href="javascript:call_cal(document.quickaddform.shipAfterDate,'${shoppingCart.getDefaultShipAfterDate()?default("")}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.OrderCalendarClickHereForCalendar}"/></a>
+ <@htmlTemplate.renderDateTimeField name="shipAfterDate" value="${shoppingCart.getDefaultShipAfterDate()?default("")}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="item2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</div>
</td>
</tr>
@@ -130,8 +128,7 @@ under the License.
<td align="right"><div>${uiLabelMap.OrderShipBeforeDate} :</div></td>
<td>
<div>
- <input type="text" size="20" maxlength="30" name="shipBeforeDate" value="${shoppingCart.getDefaultShipBeforeDate()?default("")}"/>
- <a href="javascript:call_cal(document.quickaddform.shipBeforeDate,'${shoppingCart.getDefaultShipBeforeDate()?default("")}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.OrderCalendarClickHereForCalendar}"/></a>
+ <@htmlTemplate.renderDateTimeField name="shipBeforeDate" value="${shoppingCart.getDefaultShipBeforeDate()?default("")}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="item3" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</div>
</td>
</tr>
Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl?rev=958236&r1=958235&r2=958236&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl (original)
+++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl Sat Jun 26 15:30:32 2010
@@ -196,24 +196,20 @@ under the License.
<tr>
<td>
<div>${uiLabelMap.OrderShipAfterDate}
- <input type="text" size="20" maxlength="30" name="shipAfterDate_${cartLineIndex}"
- value="${cartLine.getShipAfterDate()?default("")}"/>
- <a href="javascript:call_cal(document.cartform.shipAfterDate_${cartLineIndex},'${shoppingCart.getShipAfterDate()?default("")}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.OrderCalendarClickHereForCalendar}"/></a>
+ <@htmlTemplate.renderDateTimeField name="shipAfterDate_${cartLineIndex}" value="${cartLine.getShipAfterDate()?default('')}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="shipAfterDate_${cartLineIndex}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</div>
</td>
<td> </td>
<td>
<div>${uiLabelMap.OrderShipBeforeDate}
- <input type="text" size="20" maxlength="30" name="shipBeforeDate_${cartLineIndex}"
- value="${cartLine.getShipBeforeDate()?default("")}"/>
- <a href="javascript:call_cal(document.cartform.shipBeforeDate_${cartLineIndex},'${shoppingCart.getShipBeforeDate()?default("")}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.OrderCalendarClickHereForCalendar}"/></a>
+ <@htmlTemplate.renderDateTimeField name="shipBeforeDate_${cartLineIndex}" value="${cartLine.getShipBeforeDate()?default('')}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="shipBeforeDate_${cartLineIndex}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</div>
</td>
</tr>
</table>
</td>
</tr>
-
+
<#-- Show Associated Products (not for Variants) -->
<#assign itemProductAssocList = cartLine.getProduct().getRelated("MainProductAssoc",
Static["org.ofbiz.base.util.UtilMisc"].toList("productAssocTypeId", "sequenceNum"))?if_exists/>
Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl?rev=958236&r1=958235&r2=958236&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl (original)
+++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl Sat Jun 26 15:30:32 2010
@@ -505,8 +505,8 @@ ${virtualJavaScript?if_exists}
</div>
<#if product.productTypeId?if_exists == "ASSET_USAGE">
<table width="100%"><tr>
- <td nowrap="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="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>
+ <@htmlTemplate.renderDateTimeField name="reservStart" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="startDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+ <@htmlTemplate.renderDateTimeField name="reservEnd" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="endDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<tr>
<#--td nowrap="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="nowrap" align="right">Number of persons</td><td><input type="text" size="4" name="reservPersons" value="2"/></td>
Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/optionsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/optionsettings.ftl?rev=958236&r1=958235&r2=958236&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/optionsettings.ftl (original)
+++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/optionsettings.ftl Sat Jun 26 15:30:32 2010
@@ -149,8 +149,7 @@ under the License.
<tr>
<td colspan="2">
<div>
- <input type="text" size="25" maxlength="30" name="sgi${shipGroupIndex?default('0')}_shipBeforeDate"/>
- <a href="javascript:call_cal(document.checkoutsetupform.sgi${shipGroupIndex?default("0")}_shipBeforeDate,'');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.OrderCalendarClickHereForCalendar}"/></a>
+ <@htmlTemplate.renderDateTimeField name="sgi${shipGroupIndex?default('0')}_shipBeforeDate" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="sgi${shipGroupIndex?default('0')}_shipBeforeDate" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</div>
</td>
</tr>
@@ -162,8 +161,7 @@ under the License.
<tr>
<td colspan="2">
<div>
- <input type="text" size="25" maxlength="30" name="sgi${shipGroupIndex?default('0')}_shipAfterDate"/>
- <a href="javascript:call_cal(document.checkoutsetupform.sgi${shipGroupIndex?default("0")}_shipAfterDate,'');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.OrderCalendarClickHereForCalendar}"/></a>
+ <@htmlTemplate.renderDateTimeField name="sgi${shipGroupIndex?default('0')}_shipAfterDate" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="sgi${shipGroupIndex?default('0')}_shipAfterDate" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</div>
</td>
</tr>
Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/orderagreements.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/orderagreements.ftl?rev=958236&r1=958235&r2=958236&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/orderagreements.ftl (original)
+++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/orderagreements.ftl Sat Jun 26 15:30:32 2010
@@ -175,10 +175,8 @@ under the License.
</div>
</td>
<td> </td>
- <td><input type="text" name="shipAfterDate" size="20" maxlength="30"/>
- <a href="javascript:call_cal(document.agreementForm.shipAfterDate,'');">
- <img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'/>
- </a>
+ <td>
+ <@htmlTemplate.renderDateTimeField name="shipAfterDate" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="shipAfterDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</td>
</tr>
@@ -190,10 +188,8 @@ under the License.
</div>
</td>
<td> </td>
- <td><input type="text" name="shipBeforeDate" size="20" maxlength="30"/>
- <a href="javascript:call_cal(document.agreementForm.shipBeforeDate,'');">
- <img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'/>
- </a>
+ <td>
+ <@htmlTemplate.renderDateTimeField name="shipBeforeDate" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="shipBeforeDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</td>
</tr>
@@ -206,10 +202,8 @@ under the License.
</div>
</td>
<td> </td>
- <td><input type="text" name="cancelBackOrderDate" size="20" maxlength="30"/>
- <a href="javascript:call_cal(document.agreementForm.cancelBackOrderDate,'');">
- <img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'/>
- </a>
+ <td>
+ <@htmlTemplate.renderDateTimeField name="cancelBackOrderDate" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="cancelBackOrderDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</td>
</tr>
</#if>
Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/appendorderitem.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/appendorderitem.ftl?rev=958236&r1=958235&r2=958236&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/appendorderitem.ftl (original)
+++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/appendorderitem.ftl Sat Jun 26 15:30:32 2010
@@ -91,8 +91,7 @@ under the License.
<tr>
<td class="label">${uiLabelMap.OrderDesiredDeliveryDate}</td>
<td>
- <input type="text" size="25" maxlength="30" name="itemDesiredDeliveryDate"/>
- <a href="javascript:call_cal(document.appendItemForm.itemDesiredDeliveryDate,'${todayDate} 00:00:00.0');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.OrderCalendarClickHereForCalendar}"/></a>
+ <@htmlTemplate.renderDateTimeField name="itemDesiredDeliveryDate" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="itemDesiredDeliveryDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</td>
</tr>
<tr>
Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/editorderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/editorderitems.ftl?rev=958236&r1=958235&r2=958236&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/editorderitems.ftl (original)
+++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/editorderitems.ftl Sat Jun 26 15:30:32 2010
@@ -196,11 +196,9 @@ under the License.
<input type="text" name="icm_${orderItem.orderItemSeqId}" value="" size="30" maxlength="60"/>
<#if (orderHeader.orderTypeId == 'PURCHASE_ORDER')>
<span class="label">${uiLabelMap.OrderEstimatedShipDate}</span>
- <input type="text" name="isdm_${orderItem.orderItemSeqId}" value="${orderItem.estimatedShipDate?if_exists}" size="25" maxlength="30"/>
- <a href="javascript:call_cal(document.updateItemInfo.isdm_${orderItem.orderItemSeqId},'${todayDate} 00:00:00.0');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.OrderCalendarClickHereForCalendar}"/></a>
+ <@htmlTemplate.renderDateTimeField name="isdm_${orderItem.orderItemSeqId}" value="${orderItem.estimatedShipDate?if_exists}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="isdm_${orderItem.orderItemSeqId}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<span class="label">${uiLabelMap.OrderOrderQuoteEstimatedDeliveryDate}</span>
- <input type="text" name="iddm_${orderItem.orderItemSeqId}" value="${orderItem.estimatedDeliveryDate?if_exists}" size="25" maxlength="30"/>
- <a href="javascript:call_cal(document.updateItemInfo.iddm_${orderItem.orderItemSeqId},'${todayDate} 00:00:00.0');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.OrderCalendarClickHereForCalendar}"/></a>
+ <@htmlTemplate.renderDateTimeField name="iddm_${orderItem.orderItemSeqId}" value="${orderItem.estimatedDeliveryDate?if_exists}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="iddm_${orderItem.orderItemSeqId}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</#if>
</td>
</tr>
Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/findOrders.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/findOrders.ftl?rev=958236&r1=958235&r2=958236&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/findOrders.ftl (original)
+++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/findOrders.ftl Sat Jun 26 15:30:32 2010
@@ -325,7 +325,7 @@ function toggleOrderIdList() {
</#if>
<option value="">${uiLabelMap.OrderSelectShippingMethod}</option>
<#list carrierShipmentMethods as carrierShipmentMethod>
- <#assign shipmentMethodType = carrierShipmentMethod.getRelatedOne("ShipmentMethodType")>
+ <#assign shipmentMethodType = carrierShipmentMethod.getRelatedOne("ShipmentMethodType")>
<option value="${carrierShipmentMethod.partyId}@${carrierShipmentMethod.shipmentMethodTypeId}">${carrierShipmentMethod.partyId?if_exists} ${shipmentMethodType.description?if_exists}</option>
</#list>
</select>
@@ -363,15 +363,13 @@ function toggleOrderIdList() {
<table class="basic-table" cellspacing='0'>
<tr>
<td nowrap="nowrap">
- <input type='text' size='25' name='minDate' value='${requestParameters.minDate?if_exists}'/>
- <a href="javascript:call_cal(document.lookuporder.minDate,'${fromDateStr}');"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'/></a>
+ <@htmlTemplate.renderDateTimeField name="minDate" value="${requestParameters.minDate?if_exists}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="minDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<span class='label'>${uiLabelMap.CommonFrom}</span>
</td>
</tr>
<tr>
<td nowrap="nowrap">
- <input type='text' size='25' name='maxDate' value='${requestParameters.maxDate?if_exists}'/>
- <a href="javascript:call_cal(document.lookuporder.maxDate,'${thruDateStr}');"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'/></a>
+ <@htmlTemplate.renderDateTimeField name="maxDate" value="${requestParameters.maxDate?if_exists}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="maxDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<span class='label'>${uiLabelMap.CommonThru}</span>
</td>
</tr>
Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?rev=958236&r1=958235&r2=958236&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original)
+++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Sat Jun 26 15:30:32 2010
@@ -533,11 +533,9 @@ under the License.
<form name="setShipGroupDates_${shipGroup.shipGroupSeqId}" method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="orderId" value="${orderHeader.orderId}"/>
<input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/>
- <input type="text" size="23" name="shipAfterDate" value="${shipGroup.shipAfterDate?if_exists}"/>
- <a href="javascript:call_cal(document.setShipGroupDates_${shipGroup.shipGroupSeqId}.shipAfterDate,'');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.OrderCalendarClickHereForCalendar}"/></a>
+ <@htmlTemplate.renderDateTimeField name="shipAfterDate" value="${shipGroup.shipAfterDate?if_exists}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="shipAfterDate" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<br/>
- <input type="text" size="23" name="shipByDate" value="${shipGroup.shipByDate?if_exists}"/>
- <a href="javascript:call_cal(document.setShipGroupDates_${shipGroup.shipGroupSeqId}.shipByDate,'');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.OrderCalendarClickHereForCalendar}"/></a>
+ <@htmlTemplate.renderDateTimeField name="shipByDate" value="${shipGroup.shipByDate?if_exists}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="shipByDate" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<input type="submit" value="${uiLabelMap.CommonUpdate}"/>
</form>
</td>
Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/reports/reportlist.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/reports/reportlist.ftl?rev=958236&r1=958235&r2=958236&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/order/webapp/ordermgr/reports/reportlist.ftl (original)
+++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/reports/reportlist.ftl Sat Jun 26 15:30:32 2010
@@ -28,18 +28,14 @@ these reports and helping to improve the
<table>
<tr>
<td><div>From Date:</div></td>
-<td><input type="text" name="fromDate" tabindex="10" size="22" maxlength="25" align="middle">
- <a tabindex="10" target="_self" href="javascript:call_cal(document.orderreportform.fromDate, '${fromStr}');" onfocus="checkForChanges = true;" onblur="checkForChanges = true;">
- <img src='/images/cal.gif' width='16' height='16' border='0' alt='Click here For Calendar' />
- </a>
+<td>
+ <@htmlTemplate.renderDateTimeField name="fromDate" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="22" maxlength="25" id="fromDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</td>
</tr>
<tr>
<td><div>To Date:</div></td>
-<td><input type="text" name="toDate" tabindex="12" size="22" maxlength="25" align="middle">
- <a tabindex="12" target="_self" href="javascript:call_cal(document.orderreportform.toDate, '${toStr}');" onfocus="checkForChanges = true;" onblur="checkForChanges = true;">
- <img src='/images/cal.gif' width='16' height='16' border='0' alt='Click here For Calendar' />
- </a>
+<td>
+ <@htmlTemplate.renderDateTimeField name="tpDate" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="22" maxlength="25" id="t" oDate1dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</td>
</tr>
<#--
@@ -66,18 +62,14 @@ these reports and helping to improve the
<table>
<tr>
<td><div>From Date:</div></td>
-<td><input type="text" name="fromDate" tabindex="10" size="22" maxlength="25" align="middle">
- <a tabindex="10" target="_self" href="javascript:call_cal(document.itemreportform.fromDate, '${fromStr}');" onfocus="checkForChanges = true;" onblur="checkForChanges = true;">
- <img src='/images/cal.gif' width='16' height='16' border='0' alt='Click here For Calendar' />
- </a>
+<td>
+ <@htmlTemplate.renderDateTimeField name="fromDate" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="22" maxlength="25" id="fromDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</td>
</tr>
<tr>
<td><div>To Date:</div></td>
-<td><input type="text" name="toDate" tabindex="12" size="22" maxlength="25" align="middle">
- <a tabindex="12" target="_self" href="javascript:call_cal(document.itemreportform.toDate, '${toStr}');" onfocus="checkForChanges = true;" onblur="checkForChanges = true;">
- <img src='/images/cal.gif' width='16' height='16' border='0' alt='Click here For Calendar' />
- </a>
+<td>
+ <@htmlTemplate.renderDateTimeField name="toDate" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="22" maxlength="25" id="toDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</td>
</tr>
<#--
Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/return/returnHeader.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/return/returnHeader.ftl?rev=958236&r1=958235&r2=958236&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/order/webapp/ordermgr/return/returnHeader.ftl (original)
+++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/return/returnHeader.ftl Sat Jun 26 15:30:32 2010
@@ -77,8 +77,7 @@ under the License.
<#if returnInfo.entryDate?exists>
<#assign entryDate = returnInfo.get("entryDate").toString()>
</#if>
- <input type='text' size='25' name='entryDate' value='${entryDate?if_exists}' />
- <a href="javascript:call_cal(document.returnhead.entryDate, '');"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar' /></a>
+ <@htmlTemplate.renderDateTimeField name="entryDate" value="${entryDate?if_exists}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="entryDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</td>
</tr>
<tr>
Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl?rev=958236&r1=958235&r2=958236&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl (original)
+++ ofbiz/branches/jquery/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl Sat Jun 26 15:30:32 2010
@@ -48,8 +48,8 @@ under the License.
<input type="hidden" name="productCategoryId" value="${(productFeatureCatGrpAppl.productCategoryId)?if_exists}" />
<input type="hidden" name="productFeatureGroupId" value="${(productFeatureCatGrpAppl.productFeatureGroupId)?if_exists}" />
<input type="hidden" name="fromDate" value="${(productFeatureCatGrpAppl.fromDate)?if_exists}" />
- <input type="text" size="25" name="thruDate" value="${(productFeatureCatGrpAppl.thruDate)?if_exists}" <#if hasExpired>style="color: red;"</#if> />
- <a href="javascript:call_cal(document.lineFormGrp${line}.thruDate, '${(productFeatureCatGrpAppl.thruDate)?default(nowTimestamp?string)}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a>
+ <#if hasExpired><#assign class="alert"></#if>
+ <@htmlTemplate.renderDateTimeField name="thruDate" value="${(productFeatureCatGrpAppl.thruDate)?if_exists}" className="${class!''}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="22" maxlength="25" id="fromDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<input type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;" />
</form>
</td>
@@ -87,8 +87,7 @@ under the License.
<option value="${(productFeatureGroup.productFeatureGroupId)?if_exists}">${(productFeatureGroup.description)?if_exists} [${(productFeatureGroup.productFeatureGroupId)?if_exists}]</option>
</#list>
</select>
- <input type="text" size="25" name="fromDate" />
- <a href="javascript:call_cal(document.addNewGroupForm.fromDate, '${nowTimestamp?string}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a>
+ <@htmlTemplate.renderDateTimeField name="fromDate" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="fromDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<input type="submit" value="${uiLabelMap.CommonAdd}" />
</form>
</td></tr>
@@ -128,8 +127,8 @@ under the License.
<input type="hidden" name="productCategoryId" value="${(productFeatureCategoryAppl.productCategoryId)?if_exists}" />
<input type="hidden" name="productFeatureCategoryId" value="${(productFeatureCategoryAppl.productFeatureCategoryId)?if_exists}" />
<input type="hidden" name="fromDate" value="${(productFeatureCategoryAppl.fromDate)?if_exists}" />
- <input type="text" size="25" name="thruDate" value="${(productFeatureCategoryAppl.thruDate)?if_exists}" <#if hasExpired>style="color: red;"</#if> />
- <a href="javascript:call_cal(document.lineForm${line}.thruDate, '${(productFeatureCategoryAppl.thruDate)?default(nowTimestamp?string)}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a>
+ <#if hasExpired><#assign class="alert"></#if>
+ <@htmlTemplate.renderDateTimeField name="thruDate" value="${(productFeatureCategoryAppl.thruDate)?if_exists}" className="${class!''}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="thruDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<input type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;" />
</form>
</td>
@@ -166,8 +165,7 @@ under the License.
<option value="${(productFeatureCategory.productFeatureCategoryId)?if_exists}">${(productFeatureCategory.description)?if_exists} [${(productFeatureCategory.productFeatureCategoryId)?if_exists}]</option>
</#list>
</select>
- <input type="text" size="25" name="fromDate" />
- <a href="javascript:call_cal(document.addNewCategoryForm.fromDate, '${nowTimestamp?string}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a>
+ <@htmlTemplate.renderDateTimeField name="fromDate" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="fromDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<input type="submit" value="${uiLabelMap.CommonAdd}" />
</form>
</td></tr>
Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/category/EditCategoryParties.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/category/EditCategoryParties.ftl?rev=958236&r1=958235&r2=958236&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/catalog/category/EditCategoryParties.ftl (original)
+++ ofbiz/branches/jquery/applications/product/webapp/catalog/category/EditCategoryParties.ftl Sat Jun 26 15:30:32 2010
@@ -50,8 +50,8 @@ under the License.
<input type="hidden" name="partyId" value="${(productCategoryRole.partyId)?if_exists}" />
<input type="hidden" name="roleTypeId" value="${(productCategoryRole.roleTypeId)?if_exists}" />
<input type="hidden" name="fromDate" value="${(productCategoryRole.getTimestamp("fromDate"))?if_exists}" />
- <input type="text" size="25" name="thruDate" value="${(productCategoryRole. getTimestamp("thruDate"))?if_exists}" <#if hasExpired> style="color: red;"</#if> />
- <a href="javascript:call_cal(document.lineForm_update${line}.thruDate, '${(productCategoryRole.getTimestamp("thruDate"))?default(nowTimestamp?string)}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a>
+ <#if hasExpired><#assign class="alert"></#if>
+ <@htmlTemplate.renderDateTimeField name="thruDate" className="${class!''}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(productCategoryRole. getTimestamp('thruDate'))?if_exists}" size="25" maxlength="30" id="thruDate_1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<input type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;" />
</form>
</td>
@@ -92,8 +92,8 @@ under the License.
<option value="${(roleType.roleTypeId)?if_exists}" <#if roleType.roleTypeId.equals("_NA_")> selected="selected"</#if>>${(roleType.get("description",locale))?if_exists}</option>
</#list>
</select>
- <input type="text" size="25" name="fromDate" />
- <a href="javascript:call_cal(document.addNewForm.fromDate, '${nowTimestamp?string}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a>
+
+ <@htmlTemplate.renderDateTimeField name="fromDate" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="fromDate_1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<input type="submit" value="${uiLabelMap.CommonAdd}" />
</form>
</td>
Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl?rev=958236&r1=958235&r2=958236&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl (original)
+++ ofbiz/branches/jquery/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl Sat Jun 26 15:30:32 2010
@@ -53,8 +53,8 @@ under the License.
<input type="hidden" name="productCategoryId" value="${(prodCatalogCategory.productCategoryId)?if_exists}"/>
<input type="hidden" name="prodCatalogCategoryTypeId" value="${prodCatalogCategory.prodCatalogCategoryTypeId}"/>
<input type="hidden" name="fromDate" value="${(prodCatalogCategory.fromDate)?if_exists}"/>
- <input type="text" size="25" name="thruDate" value="${(prodCatalogCategory.thruDate)?if_exists}" style="<#if (hasExpired) >color: red;</#if>"/>
- <a href="javascript:call_cal(document.lineForm_update${line}.thruDate, '${(prodCatalogCategory.thruDate)?default(nowTimestamp?string)}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
+ <#if hasExpired><#assign class="alert"></#if>
+ <@htmlTemplate.renderDateTimeField name="thruDate" className="${class!''}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(prodCatalogCategory.thruDate)?if_exists}" size="25" maxlength="30" id="thruDate_1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<input type="text" size="5" name="sequenceNum" value="${(prodCatalogCategory.sequenceNum)?if_exists}"/>
<#-- the prodCatalogCategoryTypeId field is now part of the PK, so it can't be changed, must be re-created
<select name="prodCatalogCategoryTypeId" size="1">
@@ -111,8 +111,7 @@ under the License.
<option value="${(prodCatalogCategoryType.prodCatalogCategoryTypeId)?if_exists}">${(prodCatalogCategoryType.get("description",locale))?if_exists}</option>
</#list>
</select>
- <input type="text" size="25" name="fromDate"/>
- <a href="javascript:call_cal(document.addNewForm.fromDate, '${nowTimestamp?string}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
+ <@htmlTemplate.renderDateTimeField name="fromDate" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="fromDate_1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<input type="submit" value="${uiLabelMap.CommonAdd}"/>
</form>
</td></tr>
Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/category/EditCategoryProducts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/category/EditCategoryProducts.ftl?rev=958236&r1=958235&r2=958236&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/catalog/category/EditCategoryProducts.ftl (original)
+++ ofbiz/branches/jquery/applications/product/webapp/catalog/category/EditCategoryProducts.ftl Sat Jun 26 15:30:32 2010
@@ -84,8 +84,8 @@ under the License.
<input type="hidden" name="productId${suffix}" value="${(productCategoryMember.productId)?if_exists}" />
<input type="hidden" name="productCategoryId${suffix}" value="${(productCategoryMember.productCategoryId)?if_exists}" />
<input type="hidden" name="fromDate${suffix}" value="${(productCategoryMember.fromDate)?if_exists}" />
- <input type="text" size="25" name="thruDate${suffix}" value="${(productCategoryMember.thruDate)?if_exists}" <#if hasExpired>style="color: red;"</#if> />
- <a href="javascript:call_cal(document.updateCategoryProductForm.thruDate${suffix}, '${(productCategoryMember.thruDate)?default(nowTimestamp?string)}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a>
+ <#if hasExpired><#assign class="alert"></#if>
+ <@htmlTemplate.renderDateTimeField name="thruDate${suffix}" className="${class!''}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(productCategoryMember.thruDate)?if_exists}" size="25" maxlength="30" id="thruDate${suffix}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<input type="text" size="5" name="sequenceNum${suffix}" value="${(productCategoryMember.sequenceNum)?if_exists}" />
<input type="text" size="5" name="quantity${suffix}" value="${(productCategoryMember.quantity)?if_exists}" />
<br />
@@ -158,8 +158,8 @@ under the License.
<span class="label">${uiLabelMap.ProductProductId}</span>
<@htmlTemplate.lookupField formName="addProductCategoryMemberForm" name="productId" id="productId" fieldFormName="LookupProduct"/>
<br/>
- <span class="label">${uiLabelMap.CommonFromDate}</span> <input type="text" size="22" name="fromDate" />
- <a href="javascript:call_cal(document.addProductCategoryMemberForm.fromDate, '${nowTimestamp?string}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a>
+ <span class="label">${uiLabelMap.CommonFromDate}</span>
+ <@htmlTemplate.renderDateTimeField name="fromDate" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="fromDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<br />
<span class="label">${uiLabelMap.CommonComments}</span> <textarea name="comments" rows="2" cols="40"></textarea>
<input type="submit" value="${uiLabelMap.CommonAdd}" />
@@ -183,8 +183,8 @@ under the License.
<span class="label">${uiLabelMap.ProductTargetProductCategory}</span>
<@htmlTemplate.lookupField formName="copyCategoryProductMembersForm" name="productCategoryIdTo" id="productCategoryIdTo" fieldFormName="LookupProductCategory"/>
<br />
- <span class="label">${uiLabelMap.ProductOptionalFilterWithDate}</span> <input type="text" size="20" name="validDate" />
- <a href="javascript:call_cal(document.copyCategoryProductMembersForm.validDate, '${nowTimestamp?string}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a>
+ <span class="label">${uiLabelMap.ProductOptionalFilterWithDate}</span>
+ <@htmlTemplate.renderDateTimeField name="validDate" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="validDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<br />
<span class="label">${uiLabelMap.ProductIncludeSubCategories}?</span>
<select name="recurse">
@@ -209,8 +209,8 @@ under the License.
<input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}" />
<input type="hidden" name="activeOnly" value="${activeOnly.toString()}" />
<div>
- <span class="label">${uiLabelMap.ProductOptionalExpirationDate}</span> <input type="text" size="20" name="thruDate" />
- <a href="javascript:call_cal(document.expireAllCategoryProductMembersForm.thruDate, '${nowTimestamp?string}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a>
+ <span class="label">${uiLabelMap.ProductOptionalExpirationDate}</span>
+ <@htmlTemplate.renderDateTimeField name="thruDate" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="thruDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<input type="submit" value="${uiLabelMap.CommonExpireAll}" />
</div>
</form>
@@ -229,8 +229,8 @@ under the License.
<input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}" />
<input type="hidden" name="activeOnly" value="${activeOnly.toString()}" />
<div>
- <span class="label">${uiLabelMap.ProductOptionalExpiredBeforeDate}</span> <input type="text" size="20" name="validDate" />
- <a href="javascript:call_cal(document.removeExpiredCategoryProductMembersForm.validDate, '${nowTimestamp?string}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a>
+ <span class="label">${uiLabelMap.ProductOptionalExpiredBeforeDate}</span>
+ <@htmlTemplate.renderDateTimeField name="validDate" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="validDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<input type="submit" value="${uiLabelMap.CommonRemoveExpired}" />
</div>
</form>
Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/category/EditCategoryRollup.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/category/EditCategoryRollup.ftl?rev=958236&r1=958235&r2=958236&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/catalog/category/EditCategoryRollup.ftl (original)
+++ ofbiz/branches/jquery/applications/product/webapp/catalog/category/EditCategoryRollup.ftl Sat Jun 26 15:30:32 2010
@@ -72,8 +72,7 @@ under the License.
<input type="hidden" name="productCategoryId${suffix}" value="${productCategoryRollup.productCategoryId}" />
<input type="hidden" name="parentProductCategoryId${suffix}" value="${productCategoryRollup.parentProductCategoryId}" />
<input type="hidden" name="fromDate${suffix}" value="${productCategoryRollup.fromDate}" />
- <input type="text" size="25" name="thruDate${suffix}" value="${productCategoryRollup.thruDate?if_exists}" <#if hasExpired>style="color: red"</#if> />
- <a href="javascript:call_cal(document.updateProductCategoryForm.thruDate${suffix}, null);"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a>
+ <@htmlTemplate.renderDateTimeField name="thruDate${suffix}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${productCategoryRollup.thruDate!''}" size="25" maxlength="30" id="thruDate_1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<input type="text" size="5" name="sequenceNum${suffix}" value="${productCategoryRollup.sequenceNum?if_exists}" />
</td>
<td>
@@ -117,8 +116,8 @@ under the License.
<input type="hidden" name="productCategoryId" value="${productCategoryId}" />
<input type="hidden" name="showProductCategoryId" value="${productCategoryId}" />
<@htmlTemplate.lookupField value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}" formName="addParentForm" name="parentProductCategoryId" id="parentProductCategoryId" fieldFormName="LookupProductCategory"/>
- <input type="text" size="25" name="fromDate" />
- <a href="javascript:call_cal(document.addParentForm.fromDate, null);"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a>
+ <@htmlTemplate.renderDateTimeField name="fromDate" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="fromDate_1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+
<input type="submit" value="${uiLabelMap.CommonAdd}" />
</form>
</td></tr>
@@ -180,8 +179,8 @@ under the License.
<input type="hidden" name="productCategoryId${suffix}" value="${productCategoryRollup.productCategoryId}" />
<input type="hidden" name="parentProductCategoryId${suffix}" value="${productCategoryRollup.parentProductCategoryId}" />
<input type="hidden" name="fromDate${suffix}" value="${productCategoryRollup.fromDate}" />
- <input type="text" size="25" name="thruDate${suffix}" value="${productCategoryRollup.thruDate?if_exists}" <#if hasExpired>style="color: red;"</#if> />
- <a href="javascript:call_cal(document.updateProductCategoryToCategoryChild.thruDate${suffix}, null);"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a>
+ <@htmlTemplate.renderDateTimeField name="thruDate${suffix}" className="" alert="" title="Thru Date" value="${productCategoryRollup.thruDate!''}" size="25" maxlength="50" id="thruDatefromDate${suffix}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+
<input type="text" size="5" name="sequenceNum${suffix}" value="${productCategoryRollup.sequenceNum?if_exists}" />
</td>
<td>
@@ -225,8 +224,7 @@ under the License.
<input type="hidden" name="showProductCategoryId" value="${productCategoryId}" />
<input type="hidden" name="parentProductCategoryId" value="${productCategoryId}" />
<@htmlTemplate.lookupField value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}" formName="addChildForm" name="productCategoryId" id="productCategoryId" fieldFormName="LookupProductCategory"/>
- <input type="text" size="25" name="fromDate" />
- <a href="javascript:call_cal(document.addChildForm.fromDate, null);"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a>
+ <@htmlTemplate.renderDateTimeField name="fromDate" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="fromDate_2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<input type="submit" value="${uiLabelMap.CommonAdd}" />
</form>
</td></tr>
Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/find/keywordsearchactions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/find/keywordsearchactions.ftl?rev=958236&r1=958235&r2=958236&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/catalog/find/keywordsearchactions.ftl (original)
+++ ofbiz/branches/jquery/applications/product/webapp/catalog/find/keywordsearchactions.ftl Sat Jun 26 15:30:32 2010
@@ -42,7 +42,8 @@ under the License.
<form method="post" action="<@o...@ofbizUrl>" name="searchExpireFromCategory">
<span class="label">${uiLabelMap.ProductExpireResultsFrom} ${uiLabelMap.ProductCategory}:</span>
<@htmlTemplate.lookupField formName="searchExpireFromCategory" name="SE_SEARCH_CATEGORY_ID" id="SE_SEARCH_CATEGORY_ID" fieldFormName="LookupProductCategory"/>
- <span class="label">${uiLabelMap.CommonThru}</span><input type="text" size="25" name="thruDate" /><a href="javascript:call_cal(document.searchExpireFromCategory.thruDate, null);"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a>
+ <span class="label">${uiLabelMap.CommonThru}</span>
+ <@htmlTemplate.renderDateTimeField name="thruDate" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="thruDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<input type="hidden" name="clearSearch" value="N" />
<input type="submit" value="${uiLabelMap.CommonExpire}" class="smallSubmit" />
<br />
@@ -55,7 +56,8 @@ under the License.
<form method="post" action="<@o...@ofbizUrl>" name="searchAddToCategory">
<span class="label">${uiLabelMap.ProductAddResultsTo} ${uiLabelMap.ProductCategory}:</span>
<@htmlTemplate.lookupField formName="searchAddToCategory" name="SE_SEARCH_CATEGORY_ID" id="SE_SEARCH_CATEGORY_ID" fieldFormName="LookupProductCategory"/>
- <span class="label">${uiLabelMap.CommonFrom}</span><input type="text" size="25" name="fromDate" /><a href="javascript:call_cal(document.searchAddToCategory.fromDate, null);"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a>
+ <span class="label">${uiLabelMap.CommonFrom}</span>
+ <@htmlTemplate.renderDateTimeField name="fromDate" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="fromDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<input type="hidden" name="clearSearch" value="N" />
<input type="submit" value="${uiLabelMap.ProductAddToCategory}" class="smallSubmit" />
<br />
@@ -68,8 +70,10 @@ under the License.
<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.CommonFrom}</span>
+ <@htmlTemplate.renderDateTimeField name="fromDate" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="fromDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+ <span class="label">${uiLabelMap.CommonThru}</span>
+ <@htmlTemplate.renderDateTimeField name="thruDate" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="thruDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<br />
<span class="label">${uiLabelMap.CommonAmount}</span><input type="text" size="5" name="amount" value="" />
<span class="label">${uiLabelMap.CommonSequence}</span><input type="text" size="5" name="sequenceNum" value="" />
Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/price/EditProductPriceRules.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/price/EditProductPriceRules.ftl?rev=958236&r1=958235&r2=958236&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/catalog/price/EditProductPriceRules.ftl (original)
+++ ofbiz/branches/jquery/applications/product/webapp/catalog/price/EditProductPriceRules.ftl Sat Jun 26 15:30:32 2010
@@ -38,8 +38,8 @@ under the License.
<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>
+ <@htmlTemplate.renderDateTimeField name="fromDate" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${productPriceRule.fromDate?if_exists}" size="25" maxlength="30" id="fromDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+ <@htmlTemplate.renderDateTimeField name="thruDate" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${productPriceRule.thruDate?if_exists}" size="25" maxlength="30" id="thruDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<#assign saleRule = productPriceRule.isSale?exists && productPriceRule.isSale == "Y">
<div>
Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl?rev=958236&r1=958235&r2=958236&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl (original)
+++ ofbiz/branches/jquery/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl Sat Jun 26 15:30:32 2010
@@ -84,8 +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>
+ <@htmlTemplate.renderDateTimeField name="fromDate_o_${rowCount}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="fromDate_o_${rowCount}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+ </td>
+ <td>
+ <@htmlTemplate.renderDateTimeField name="thruDate_o_${rowCount}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="thruDate_o_${rowCount}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+ </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">