svn commit: r958236 [2/3] - in /ofbiz/branches/jquery: applications/manufacturing/web
Locked
svn commit: r958236 [2/3] - in /ofbiz/branches/jquery: applications/manufacturing/web
 
|
Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/product/EditProductAssoc.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/product/EditProductAssoc.ftl?rev=958236&r1=958235&r2=958236&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/catalog/product/EditProductAssoc.ftl (original) +++ ofbiz/branches/jquery/applications/product/webapp/catalog/product/EditProductAssoc.ftl Sat Jun 26 15:30:32 2010 @@ -62,8 +62,7 @@ under the License. <td> </td> <td> <div> - <input type="text" name="FROM_DATE" size="25" maxlength="40" value="${fromDate?if_exists}" /> - <a href="javascript:call_cal(document.editProductAssocForm.FROM_DATE, '${fromDate?default(nowTimestampString)}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a> + <@htmlTemplate.renderDateTimeField name="FROM_DATE" value="${fromDate?if_exists}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" 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=""/> ${uiLabelMap.CommonSetNowEmpty} </div> </td> @@ -100,8 +99,8 @@ under the License. <td> </td> <td> <div> - <input type="text" name="FROM_DATE" size="25" maxlength="40" value="" /> - <a href="javascript:call_cal(document.editProductAssocForm.FROM_DATE, '${nowTimestampString}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a> + ${fromDate?if_exists} + <@htmlTemplate.renderDateTimeField name="FROM_DATE" value="${fromDate?if_exists}" 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=""/> ${uiLabelMap.CommonSetNowEmpty} </div> </td> @@ -142,8 +141,7 @@ under the License. <td> </td> <td width="74%"> <div> - <input type="text" name="THRU_DATE" <#if useValues> value="${productAssoc.thruDate?if_exists}"<#else>value="${(request.getParameter("THRU_DATE"))?if_exists}"</#if> size="30" maxlength="30" /> - <a href="javascript:call_cal(document.editProductAssocForm.THRU_DATE, <#if useValues>'${productAssoc.thruDate?if_exists}'<#elseif (request.getParameter("THRU_DATE"))?exists>'${request.getParameter("THRU_DATE")}'<#else>'${nowTimestampString}'</#if>);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a> + <@htmlTemplate.renderDateTimeField name="THRU_DATE" <#if useValues> value="${productAssoc.thruDate?if_exists}"<#else>value="${(request.getParameter("THRU_DATE"))?if_exists}"</#if> className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" 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=""/> </div> </td> </tr> Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/product/EditProductFeatures.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/product/EditProductFeatures.ftl?rev=958236&r1=958235&r2=958236&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/catalog/product/EditProductFeatures.ftl (original) +++ ofbiz/branches/jquery/applications/product/webapp/catalog/product/EditProductFeatures.ftl Sat Jun 26 15:30:32 2010 @@ -59,8 +59,8 @@ under the License. <td> <#assign hasExpired = false> <#if (productFeatureAndAppl.getTimestamp("thruDate"))?exists && Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().after(productFeatureAndAppl.getTimestamp("thruDate"))> <#assign hasExpired = true></#if> - <input type='text' size='25' name='thruDate_o_${productFeatureAndAppl_index}' value='${(productFeatureAndAppl.thruDate)?if_exists}' <#if hasExpired> style='color: red;'</#if> /> - <a href="javascript:call_cal(document.selectAllForm.thruDate_o_${productFeatureAndAppl_index}, '${(productFeatureAndAppl.thruDate)?default(nowTimestamp?string)}');"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'/></a> + <#if hasExpired><#assign class="alert"></#if> + <@htmlTemplate.renderDateTimeField name="thruDate_o_${productFeatureAndAppl_index}" className="${class!''}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(productFeatureAndAppl.thruDate)?if_exists}" size="25" maxlength="30" id="thruDate_o_${productFeatureAndAppl_index}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <input type="text" size='6' name='amount_o_${productFeatureAndAppl_index}' value='${(productFeatureAndAppl.amount)?if_exists}' /> <input type="text" size='5' name='sequenceNum_o_${productFeatureAndAppl_index}' value='${(productFeatureAndAppl.sequenceNum)?if_exists}' /> <select name='productFeatureApplTypeId_o_${productFeatureAndAppl_index}' size="1"> @@ -162,10 +162,10 @@ under the License. </#list> </select> <br /> - <span class='label'>${uiLabelMap.CommonFrom} : </span><input type="text" size='25' name='fromDate'/> - <a href="javascript:call_cal(document.addFeatureByTypeIdCode.fromDate, '${nowTimestamp?string}');"><img src='/images/cal.gif' 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.addFeatureByTypeIdCode.thruDate, '${nowTimestamp?string}');"><img src='/images/cal.gif' 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=""/> + <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=""/> <span class='label'>${uiLabelMap.CommonSequence} : </span><input type="text" size='5' name='sequenceNum'/> <input type="submit" value="${uiLabelMap.CommonAdd}"/> </form> @@ -192,10 +192,8 @@ under the License. </#list> </select> <br /> - <span class="label">${uiLabelMap.CommonFrom} : </span><input type="text" size="25" name="fromDate"/> - <a href="javascript:call_cal(document.addFeatureById.fromDate, '${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@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.addFeatureById.thruDate, '${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@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=""/> <span class="label">${uiLabelMap.CommonSequence} : </span><input type="text" size="5" name="sequenceNum"/> <input type="submit" value="${uiLabelMap.CommonAdd}"/> </form> Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/product/EditProductParties.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/product/EditProductParties.ftl?rev=958236&r1=958235&r2=958236&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/catalog/product/EditProductParties.ftl (original) +++ ofbiz/branches/jquery/applications/product/webapp/catalog/product/EditProductParties.ftl Sat Jun 26 15:30:32 2010 @@ -50,8 +50,8 @@ under the License. <input type="hidden" name="partyId" value="${(productRole.partyId)?if_exists}" /> <input type="hidden" name="roleTypeId" value="${(productRole.roleTypeId)?if_exists}" /> <input type="hidden" name="fromDate" value="${(productRole.getTimestamp("fromDate"))?if_exists}" /> - <input type="text" size="25" name="thruDate" value="${(productRole. getTimestamp("thruDate"))?if_exists}"<#if hasExpired> class="alert"</#if> /> - <a href="javascript:call_cal(document.lineForm${line}.thruDate, '${(productRole.getTimestamp("thruDate"))?default(nowTimestamp?string)}');"><img src="<@ofbizContentUrl>/images/cal.gif</@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="${(productRole.getTimestamp('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=""/> </td> <td><input type="submit" value="${uiLabelMap.CommonUpdate}" /></td> </form> Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl?rev=958236&r1=958235&r2=958236&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl (original) +++ ofbiz/branches/jquery/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl Sat Jun 26 15:30:32 2010 @@ -431,10 +431,7 @@ function doPublish() { <table cellspacing="0" class="basic-table"> <tr> <td> - <input type="text" size="25" name="fromDate"/> - <a href="javascript:call_cal(document.publish.fromDate,'${nowTimestampString}');"> - <img src="<@ofbizContentUrl>/images/cal.gif</@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="fromDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <input type="button" value="${uiLabelMap.ProductPublishAndView}" onclick="doPublish();"/> </td> </tr> @@ -447,10 +444,7 @@ function doPublish() { <table cellspacing="0" class="basic-table"> <tr> <td> - <input type="text" size="25" name="thruDate"/> - <a href="javascript:call_cal(document.unpublish.thruDate,'${nowTimestampString}');"> - <img src="<@ofbizContentUrl>/images/cal.gif</@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" 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="submit" value="${uiLabelMap.ProductRemoveFromSite}"/> </td> </tr> Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl?rev=958236&r1=958235&r2=958236&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl (original) +++ ofbiz/branches/jquery/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl Sat Jun 26 15:30:32 2010 @@ -46,8 +46,8 @@ under the License. <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)?if_exists}" <#if hasExpired>style="color: red;"</#if> /> - <a href="javascript:call_cal(document.lineForm${line}.thruDate, '${nowTimestamp}');"><img src="<@ofbizContentUrl>/images/cal.gif</@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="${(productStorePromoAppl.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=""/> <input type="text" size="5" name="sequenceNum" value="${(productStorePromoAppl.sequenceNum)?if_exists}" /> <input type="submit" value="${uiLabelMap.CommonUpdate}" /> </form> @@ -84,8 +84,7 @@ under the License. <option value="${(productStore.productStoreId)?if_exists}">${(productStore.storeName)?if_exists} [${(productStore.productStoreId)?if_exists}]</option> </#list> </select> - <input type="text" size="20" name="fromDate"/> - <a href="javascript:call_cal(document.addProductPromoToCatalog.fromDate, '${nowTimestamp}');"><img src="<@ofbizContentUrl>/images/cal.gif</@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="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.CommonAdd}"/> </form> </div> Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl?rev=958236&r1=958235&r2=958236&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl (original) +++ ofbiz/branches/jquery/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl Sat Jun 26 15:30:32 2010 @@ -107,15 +107,13 @@ under the License. <tr> <td class="label">${uiLabelMap.CommonFromDate}</td> <td> - <input type="text" size="25" name="fromDate" /> - <a href="javascript:call_cal(document.addSurvey.fromDate, '${nowTimestampString}');"><img src="<@ofbizContentUrl>/images/cal.gif</@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="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 class="label">${uiLabelMap.CommonThruDate}</td> <td> - <input type="text" size="25" name="thruDate" /> - <a href="javascript:call_cal(document.addSurvey.thruDate, '${nowTimestampString}');"><img src="<@ofbizContentUrl>/images/cal.gif</@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" 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=""/> </td> </tr> <tr> Modified: ofbiz/branches/jquery/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl?rev=958236&r1=958235&r2=958236&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl Sat Jun 26 15:30:32 2010 @@ -177,7 +177,7 @@ under the License. ${uiLabelMap.ProductShipmentUpsResidential}: <input type="checkbox" name="homeDeliveryType" value="Y" ${(shipmentRouteSegment.homeDeliveryType?has_content)?string("checked=\"checked\"","")} /> <#elseif "SHRSCS_CONFIRMED" == shipmentRouteSegment.carrierServiceStatusId?if_exists> - <a href="javascript:document.upsShipmentAccept_${shipmentRouteSegmentData_index}.submit()" class="buttontext">${uiLabelMap.ProductAcceptUpsShipmentConfirmation}</a> + <a href="javascript:document.upsShipmentAccept_${shipmentRouteSegmentData_index}.submit()" class="buttontext">${uiLabelMap.ProductAcceptUpsShipmentConfirmation}</a> <br /> <a href="javascript:document.upsVoidShipment_${shipmentRouteSegmentData_index}.submit()" class="buttontext">${uiLabelMap.ProductVoidUpsShipmentConfirmation}</a> <#elseif "SHRSCS_ACCEPTED" == shipmentRouteSegment.carrierServiceStatusId?if_exists> @@ -202,7 +202,7 @@ under the License. <option ${(shipmentRouteSegment.homeDeliveryType?default("")=="EVENING")?string("selected=\"selected\"","")} value="EVENING">${uiLabelMap.ProductShipmentFedexHomeEvening}</option> <option ${(shipmentRouteSegment.homeDeliveryType?default("")=="APPOINTMENT")?string("selected=\"selected\"","")} value="APPOINTMENT">${uiLabelMap.ProductShipmentFedexHomeAppointment}</option> </select> - <input type="text" size="25" name="homeDeliveryDate" value="${(shipmentRouteSegment.homeDeliveryDate.toString())?if_exists}"/><a href="javascript:call_cal(document.updateShipmentRouteSegmentForm${shipmentRouteSegmentData_index}.homeDeliveryDate, '${(shipmentRouteSegment.homeDeliveryDate.toString())?default(nowTimestampString)}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar' /></a> + <@htmlTemplate.renderDateTimeField name="homeDeliveryDate" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(shipmentRouteSegment.homeDeliveryDate.toString())?if_exists}" size="25" maxlength="30" id="homeDeliveryDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> </#if> <#else> <#-- Todo: implement closeout with Fedex --> @@ -230,11 +230,11 @@ under the License. <br /> <input type="text" size="24" name="trackingIdNumber" value="${shipmentRouteSegment.trackingIdNumber?if_exists}"/> <br /> - <input type="text" size="25" name="estimatedStartDate" value="${(shipmentRouteSegment.estimatedStartDate.toString())?if_exists}"/><a href="javascript:call_cal(document.updateShipmentRouteSegmentForm${shipmentRouteSegmentData_index}.estimatedStartDate, '${(shipmentRouteSegment.estimatedStartDate.toString())?default(nowTimestampString)}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar' /></a> - <input type="text" size="25" name="estimatedArrivalDate" value="${(shipmentRouteSegment.estimatedArrivalDate.toString())?if_exists}"/><a href="javascript:call_cal(document.updateShipmentRouteSegmentForm${shipmentRouteSegmentData_index}.estimatedArrivalDate, '${(shipmentRouteSegment.estimatedArrivalDate.toString())?default(nowTimestampString)}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar' /></a> + <@htmlTemplate.renderDateTimeField name="estimatedStartDate" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(shipmentRouteSegment.estimatedStartDate.toString())?if_exists}" size="25" maxlength="30" id="estimatedStartDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <@htmlTemplate.renderDateTimeField name="estimatedArrivalDate" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(shipmentRouteSegment.estimatedArrivalDate.toString())?if_exists}" size="25" maxlength="30" id="estimatedArrivalDate1" 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="25" name="actualStartDate" value="${(shipmentRouteSegment.actualStartDate.toString())?if_exists}"/><a href="javascript:call_cal(document.updateShipmentRouteSegmentForm${shipmentRouteSegmentData_index}.actualStartDate, '${(shipmentRouteSegment.actualStartDate.toString())?default(nowTimestampString)}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar' /></a> - <input type="text" size="25" name="actualArrivalDate" value="${(shipmentRouteSegment.actualArrivalDate.toString())?if_exists}"/><a href="javascript:call_cal(document.updateShipmentRouteSegmentForm${shipmentRouteSegmentData_index}.actualArrivalDate, '${(shipmentRouteSegment.actualArrivalDate.toString())?default(nowTimestampString)}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar' /></a> + <@htmlTemplate.renderDateTimeField name="actualStartDate" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(shipmentRouteSegment.actualStartDate.toString())?if_exists}" size="25" maxlength="30" id="actualStartDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <@htmlTemplate.renderDateTimeField name="actualArrivalDate" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(shipmentRouteSegment.actualArrivalDate.toString())?if_exists}" size="25" maxlength="30" id="actualArrivalDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> </div> </td> <td valign="top"> @@ -431,11 +431,11 @@ under the License. <br /> <input type="text" size="24" name="trackingIdNumber" value=""/> <br /> - <input type="text" size="25" name="estimatedStartDate" value=""/><a href="javascript:call_cal(document.createShipmentRouteSegmentForm.estimatedStartDate, '${nowTimestampString}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar' /></a> - <input type="text" size="25" name="estimatedArrivalDate" value=""/><a href="javascript:call_cal(document.createShipmentRouteSegmentForm.estimatedArrivalDate, '${nowTimestampString}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar' /></a> + <@htmlTemplate.renderDateTimeField name="estimatedStartDate" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="estimatedStartDate3" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <@htmlTemplate.renderDateTimeField name="estimatedArrivalDate" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="estimatedArrivalDate3" 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="25" name="actualStartDate" value=""/><a href="javascript:call_cal(document.createShipmentRouteSegmentForm.actualStartDate, '${nowTimestampString}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar' /></a> - <input type="text" size="25" name="actualArrivalDate" value=""/><a href="javascript:call_cal(document.createShipmentRouteSegmentForm.actualArrivalDate, '${nowTimestampString}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar' /></a> + <@htmlTemplate.renderDateTimeField name="actualStartDate" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="actualArrivalDate3" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <@htmlTemplate.renderDateTimeField name="actualArrivalDate" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="actualArrivalDate3" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> </td> <td valign="top"> <input type="text" size="5" name="billingWeight" value="${(shipmentRouteSegment.billingWeight)?if_exists}"/> Modified: ofbiz/branches/jquery/applications/product/webapp/facility/shipment/FindShipment.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/shipment/FindShipment.ftl?rev=958236&r1=958235&r2=958236&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/shipment/FindShipment.ftl (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/shipment/FindShipment.ftl Sat Jun 26 15:30:32 2010 @@ -126,15 +126,13 @@ function lookupShipments() { <table cellspacing="0" class="basic-table"> <tr> <td> - <input type="text" size="25" name="minDate" value="${requestParameters.minDate?if_exists}" /> - <a href="javascript:call_cal(document.lookupShipmentForm.minDate, '${fromDateStr}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a> + <@htmlTemplate.renderDateTimeField name="minDate" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${requestParameters.minDate?if_exists}" 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> - <input type="text" size="25" name="maxDate" value="${requestParameters.maxDate?if_exists}" /> - <a href="javascript:call_cal(document.lookupShipmentForm.maxDate, '${thruDateStr}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a> + <@htmlTemplate.renderDateTimeField name="maxDate" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${requestParameters.maxDate?if_exists}" 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/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl?rev=958236&r1=958235&r2=958236&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl (original) +++ ofbiz/branches/jquery/applications/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl Sat Jun 26 15:30:32 2010 @@ -109,15 +109,13 @@ under the License. <table class="basic-table" cellspacing="0"> <tr> <td nowrap="nowrap"> - <input type='text' size='25' name='fromDate' value='${requestParameters.fromDate?if_exists}'/> - <a href="javascript:call_cal(document.advToKeyWordSearchForm.fromDate,'${fromDateStr}');"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'/></a> - <span>${uiLabelMap.CommonFrom}</span> + <@htmlTemplate.renderDateTimeField name="fromDate" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${requestParameters.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=""/> + <span>${uiLabelMap.CommonFrom}</span> </td> </tr> <tr> <td nowrap="nowrap"> - <input type='text' size='25' name='thruDate' value='${requestParameters.thruDate?if_exists}'/> - <a href="javascript:call_cal(document.advToKeyWordSearchForm.thruDate,'${thruDateStr}');"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'/></a> + <@htmlTemplate.renderDateTimeField name="thruDate" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${requestParameters.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=""/> <span>${uiLabelMap.CommonThru}</span> </td> </tr> Modified: ofbiz/branches/jquery/framework/common/webcommon/includes/commonMacros.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/webcommon/includes/commonMacros.ftl?rev=958236&r1=958235&r2=958236&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/webcommon/includes/commonMacros.ftl (original) +++ ofbiz/branches/jquery/framework/common/webcommon/includes/commonMacros.ftl Sat Jun 26 15:30:32 2010 @@ -31,10 +31,10 @@ your template file: <#macro NullMacro></#macro> <#macro DateField formName="" fieldName="" fieldValue="" fieldClass=""> - <input type="text" name="${fieldName}"<#if fieldValue?has_content> value="${fieldValue}"</#if><#if fieldClass?has_content> class="${fieldClass}"</#if> maxlength="25" size="25"/> <#if javaScriptEnabled> - <a href="javascript:call_cal(document.${formName}.${fieldName},'${fieldValue}');"> - <img src="/images/cal.gif" width="16" height="16" border="0" alt="${uiLabelMap.CommonViewCalendar}" title="${uiLabelMap.CommonViewCalendar}"/></a> + <@htmlTemplate.renderDateTimeField name="${fieldName}" className="${fieldClass!''}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${fieldValue!''}" size="25" maxlength="30" id="${fieldName}1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <#else> + <input type="text" name="${fieldName}"<#if fieldValue?has_content> value="${fieldValue}"</#if><#if fieldClass?has_content> class="${fieldClass}"</#if> maxlength="25" size="25"/> </#if> <span class="tooltip">${uiLabelMap.CommonFormatDateTime}</span> <#if fieldClass == "required"> Modified: ofbiz/branches/jquery/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl?rev=958236&r1=958235&r2=958236&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl (original) +++ ofbiz/branches/jquery/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl Sat Jun 26 15:30:32 2010 @@ -137,11 +137,9 @@ function ShowTab(lname) { <td class="label">${field.name}</td> <td> <#if field.fieldType == 'DateTime'> - DateTime(YYYY-MM-DD HH:mm:SS.sss):<input type="text" name="${field.name}" size="24" value="${field.value}" /> - <a href="javascript:call_cal(document.updateForm.${field.name}, '${field.value}');" onmouseover="window.status='Date Picker';return true;" onmouseout="window.status='';return true;"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Click here For Calendar' /></a> + DateTime(YYYY-MM-DD HH:mm:SS.sss):<@htmlTemplate.renderDateTimeField name="${field.name}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${field.value}" size="25" maxlength="30" id="${field.name}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <#elseif field.fieldType == 'Date'> - Date(YYYY-MM-DD):<input type="text" name="${field.name}" size="11" value="${field.value}" /> - <a href="javascript:call_cal(document.updateForm.${field.name}, '${field.value}');" onmouseover="window.status='Date Picker';return true;" onmouseout="window.status='';return true;"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Click here For Calendar' /></a> + Date(YYYY-MM-DD):<@htmlTemplate.renderDateTimeField name="${field.name}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${field.value}" size="25" maxlength="30" id="${field.name}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <#elseif field.fieldType == 'Time'> Time(HH:mm:SS.sss):<input type="text" size="6" maxlength="10" name="${field.name}" value="${field.value}" /> <#elseif field.fieldType == 'Integer'> @@ -179,11 +177,9 @@ function ShowTab(lname) { <td class="label">${field.name}</td> <td> <#if field.fieldType == 'DateTime'> - DateTime(YYYY-MM-DD HH:mm:SS.sss):<input type="text" name="${field.name}" size="24" value="${field.value}" /> - <a href="javascript:call_cal(document.updateForm.${field.name}, '${field.value}');" onmouseover="window.status='Date Picker';return true;" onmouseout="window.status='';return true;"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Click here For Calendar' /></a> + DateTime(YYYY-MM-DD HH:mm:SS.sss):<@htmlTemplate.renderDateTimeField name="${field.name}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${field.value}" size="25" maxlength="30" id="${field.name}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <#elseif field.fieldType == 'Date'> - Date(YYYY-MM-DD):<input type="text" name="${field.name}" size="11" value="${field.value}" /> - <a href="javascript:call_cal(document.updateForm.${field.name}, '${field.value}');" onmouseover="window.status='Date Picker';return true;" onmouseout="window.status='';return true;"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Click here For Calendar' /></a> + Date(YYYY-MM-DD):<@htmlTemplate.renderDateTimeField name="${field.name}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${field.value}" size="25" maxlength="30" id="${field.name}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <#elseif field.fieldType == 'Time'> Time(HH:mm:SS.sss):<input type="text" size="6" maxlength="10" name="${field.name}" value="${field.value}" /> <#elseif field.fieldType == 'Integer'> Modified: ofbiz/branches/jquery/framework/webtools/webapp/webtools/entity/xmldsdump.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webtools/webapp/webtools/entity/xmldsdump.ftl?rev=958236&r1=958235&r2=958236&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/webtools/webapp/webtools/entity/xmldsdump.ftl (original) +++ ofbiz/branches/jquery/framework/webtools/webapp/webtools/entity/xmldsdump.ftl Sat Jun 26 15:30:32 2010 @@ -72,13 +72,15 @@ under the License. </tr> <tr> <td class="label">${uiLabelMap.WebtoolsRecordsUpdatedSince}</td> - <td><input type="text" size="25" name="entityFrom" /> - <a href="javascript:call_cal(document.entityExport.entityFrom, null);" title="View Calendar"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="View Calendar"/></a></td> + <td> + <@htmlTemplate.renderDateTimeField name="entityFrom" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="entityFrom1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + </td> </tr> <tr> <td class="label">${uiLabelMap.WebtoolsRecordsUpdatedBefore} </td> - <td><input type="text" size="25" name="entityThru" /> - <a href="javascript:call_cal(document.entityExport.entityThru, null);" title="View Calendar"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="View Calendar"/></a></td> + <td> + <@htmlTemplate.renderDateTimeField name="entityThru" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="entityThru1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + </td> </tr> <tr> <td class="label">${uiLabelMap.WebtoolsOutToBrowser}</td> Modified: ofbiz/branches/jquery/framework/widget/templates/htmlFormMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=958236&r1=958235&r2=958236&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/widget/templates/htmlFormMacroLibrary.ftl (original) +++ ofbiz/branches/jquery/framework/widget/templates/htmlFormMacroLibrary.ftl Sat Jun 26 15:30:32 2010 @@ -90,11 +90,11 @@ under the License. <#if maxlength?has_content> maxlength="${maxlength}"</#if> <#if id?has_content> id="${id}"</#if>/><#rt/> <#if dateType!="time" > - <script type="application/javascript"> + <script type="text/javascript"> <#if shortDateInput?exists && shortDateInput> $("#${id}").datepicker({ <#else> - $("#${id}").datetimepicker({ + $("#${id}").datetimepicker({ showSecond: true, timeFormat: 'hh:mm:ss', stepHour: 1, @@ -102,7 +102,8 @@ under the License. stepSecond: 10, </#if> showOn: 'button', - buttonImage: '/images/cal.gif', + buttonImage: '', + buttonText: '', buttonImageOnly: false, dateFormat: 'yy-mm-dd' }); @@ -353,13 +354,26 @@ ${item.description}</span> <#macro renderDateFindField className alert name localizedInputTitle value size maxlength dateType formName defaultDateTimeString imgSrc localizedIconTitle titleStyle defaultOptionFrom defaultOptionThru opEquals opSameDay opGreaterThanFromDayStart opGreaterThan opGreaterThan opLessThan opUpToDay opUpThruDay opIsEmpty> <span class="view-calendar"> -<input type="text" <@renderClass className alert /><#if name?has_content> name="${name?html}_fld0_value"</#if><#if localizedInputTitle?has_content> title="${localizedInputTitle}"</#if><#if value?has_content> value="${value}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if>/><#rt/> +<input id="${name?html}_fld0_value" type="text" <@renderClass className alert /><#if name?has_content> name="${name?html}_fld0_value"</#if><#if localizedInputTitle?has_content> title="${localizedInputTitle}"</#if><#if value?has_content> value="${value}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if>/><#rt/> <#if dateType != "time"> -<#if dateType == "date"> -<a href="javascript:call_cal_notime(document.<#rt/> -<#else> -<a href="javascript:call_cal(document.<#rt/> -</#if> + <script type="text/javascript"> + <#if dateType == "date"> + $("#${name?html}_fld0_value").datepicker({ + <#else> + $("#${name?html}_fld0_value").datetimepicker({ + showSecond: true, + timeFormat: 'hh:mm:ss', + stepHour: 1, + stepMinute: 5, + stepSecond: 10, + </#if> + showOn: 'button', + buttonImage: '', + buttonText: '', + buttonImageOnly: false, + dateFormat: 'yy-mm-dd' + }); + </script> <#if formName?has_content>${formName}.</#if><#if name?has_content>${name}_fld0_value,</#if>'<#if defaultDateTimeString?has_content>${defaultDateTimeString}</#if>');" title="${localizedIconTitle}"><#rt/> </a><#rt/> </#if> @@ -376,13 +390,26 @@ ${item.description}</span> </span><#rt/> </#if> <#rt/> -<input type="text" <@renderClass className alert /><#if name?has_content> name="${name}_fld1_value"</#if><#if localizedInputTitle?exists> title="${localizedInputTitle?html}"</#if><#if value2?has_content> value="${value2}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if>/><#rt/> +<input id="${name?html}_fld1_value" type="text" <@renderClass className alert /><#if name?has_content> name="${name}_fld1_value"</#if><#if localizedInputTitle?exists> title="${localizedInputTitle?html}"</#if><#if value2?has_content> value="${value2}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if>/><#rt/> <#if dateType != "time"> -<#if dateType == "date"> -<a href="javascript:call_cal_notime(document.<#rt/> -<#else> -<a href="javascript:call_cal(document.<#rt/> -</#if> + <script type="text/javascript"> + <#if dateType == "date"> + $("#${name?html}_fld1_value").datepicker({ + <#else> + $("#${name?html}_fld1_value").datetimepicker({ + showSecond: true, + timeFormat: 'hh:mm:ss', + stepHour: 1, + stepMinute: 5, + stepSecond: 10, + </#if> + showOn: 'button', + buttonImage: '', + buttonText: '', + buttonImageOnly: false, + dateFormat: 'yy-mm-dd' + }); + </script> <#if formName?has_content>${formName}.</#if><#if name?has_content>${name}_fld1_value,'</#if><#if defaultDateTimeString?has_content>${defaultDateTimeString}</#if>');" title="${localizedIconTitle}"><#rt/> </a><#rt/> </#if> Modified: ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl?rev=958236&r1=958235&r2=958236&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl (original) +++ ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl Sat Jun 26 15:30:32 2010 @@ -542,8 +542,8 @@ ${virtualJavaScript?if_exists} </div> <#if product.productTypeId?if_exists == "ASSET_USAGE"> <div class="inline"> - <label>Start Date(yyyy-mm-dd)</label><input type="text" size="10" name="reservStart"/><a href="javascript:call_cal_notime(document.addform.reservStart, '${nowTimestamp.toString().substring(0,10)}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" alt="Calendar" alt="" /></a> - <label>End Date(yyyy-mm-dd)</label><input type="text" size="10" name="reservEnd"/><a href="javascript:call_cal_notime(document.addform.reservEnd, '${nowTimestamp.toString().substring(0,10)}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" alt="Calendar" alt="" /></a> + <label>Start Date(yyyy-mm-dd)</label><@htmlTemplate.renderDateTimeField name="reservStart" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="reservStart1" dateType="date" shortDateInput=true timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <label>End Date(yyyy-mm-dd)</label><@htmlTemplate.renderDateTimeField name="reservEnd" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="reservEnd1" dateType="date" shortDateInput=true timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> </div> <div> <#--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="nowrap"> </td--> Modified: ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl?rev=958236&r1=958235&r2=958236&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl (original) +++ ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl Sat Jun 26 15:30:32 2010 @@ -197,14 +197,12 @@ under the License. <td> </td> <td><div class="tableheadtext">${uiLabelMap.CommonStartDate}</div></td> <td> - <input type="text" class="textBox" name="startDateTime" size="22" value="${(recurrenceInfo.startDateTime)?if_exists}" /> - <a href="javascript:call_cal(document.reorderinfo.startDateTime, '${nowTimestamp.toString()}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a> + <@htmlTemplate.renderDateTimeField name="startDateTime" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(recurrenceInfo.startDateTime)?if_exists}" size="25" maxlength="30" id="startDateTime1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> </td> <td> </td> <td><div class="tableheadtext">${uiLabelMap.CommonEndDate}</div></td> <td> - <input type="text" class="textBox" name="endDateTime" size="22" value="${(recurrenceRule.untilDateTime)?if_exists}" /> - <a href="javascript:call_cal(document.reorderinfo.endDateTime, '${nowTimestamp.toString()}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a> + <@htmlTemplate.renderDateTimeField name="endDateTime" className="textBox" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(recurrenceRule.untilDateTime)?if_exists}" size="25" maxlength="30" id="endDateTime1" 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/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl?rev=958236&r1=958235&r2=958236&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl (original) +++ ofbiz/branches/jquery/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl Sat Jun 26 15:30:32 2010 @@ -168,44 +168,43 @@ under the License. <td class="label">${uiLabelMap.WorkEffortEstimatedStartDate}</td> <td> <#if task?exists> - <input type="text" name="estimatedStartDate" value="${task.estimatedStartDate?if_exists}"/> + <@htmlTemplate.renderDateTimeField name="estimatedStartDate" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${task.estimatedStartDate?if_exists}" size="25" maxlength="30" id="estimatedStartDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <#else> - <input type="text" name="estimatedStartDate" value=""/> + <@htmlTemplate.renderDateTimeField name="estimatedStartDate" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="estimatedStartDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> </#if> - <a href="javascript:call_cal(document.addTaskAndAssocForm.estimatedStartDate,'${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a> </td> </tr> <tr> <td class="label">${uiLabelMap.WorkEffortEstimatedCompletionDate}</td> <td> <#if task?exists> - <input type="text" name="estimatedCompletionDate" value="${task.estimatedCompletionDate?if_exists}"/> + <@htmlTemplate.renderDateTimeField name="estimatedCompletionDate" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${task.estimatedCompletionDate?if_exists}" size="25" maxlength="30" id="estimatedCompletionDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <#else> - <input type="text" name="estimatedCompletionDate" value=""/> + <@htmlTemplate.renderDateTimeField name="estimatedCompletionDate" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="estimatedCompletionDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> </#if> - <a href="javascript:call_cal(document.addTaskAndAssocForm.estimatedCompletionDate,'${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a> </td> </tr> <tr> <td class="label">${uiLabelMap.FormFieldTitle_actualStartDate}</td> <td> + + <#if task?exists> - <input type="text" name="actualStartDate" value="${task.actualStartDate?if_exists}"/> + <@htmlTemplate.renderDateTimeField name="actualStartDate" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${task.actualStartDate?if_exists}" size="25" maxlength="30" id="actualStartDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <#else> - <input type="text" name="actualStartDate" value=""/> + <@htmlTemplate.renderDateTimeField name="actualStartDate" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="actualStartDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> </#if> - <a href="javascript:call_cal(document.addTaskAndAssocForm.actualStartDate,'${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a> </td> </tr> <tr> <td class="label">${uiLabelMap.FormFieldTitle_actualCompletionDate}</td> <td> + <#if task?exists> - <input type="text" name="actualCompletionDate" value="${task.actualCompletionDate?if_exists}"/> + <@htmlTemplate.renderDateTimeField name="actualCompletionDate" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${task.actualCompletionDate?if_exists}" size="25" maxlength="30" id="actualCompletionDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <#else> - <input type="text" name="actualCompletionDate" value=""/> + <@htmlTemplate.renderDateTimeField name="actualCompletionDate" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="actualCompletionDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> </#if> - <a href="javascript:call_cal(document.addTaskAndAssocForm.actualCompletionDate,'${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a> </td> </tr> <tr> Modified: ofbiz/branches/jquery/specialpurpose/projectmgr/webapp/projectmgr/survey/ListSurveys.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/projectmgr/webapp/projectmgr/survey/ListSurveys.ftl?rev=958236&r1=958235&r2=958236&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/projectmgr/webapp/projectmgr/survey/ListSurveys.ftl (original) +++ ofbiz/branches/jquery/specialpurpose/projectmgr/webapp/projectmgr/survey/ListSurveys.ftl Sat Jun 26 15:30:32 2010 @@ -44,8 +44,7 @@ under the License. <td><a href="/content/control/EditSurvey?surveyId=${workEffortSurveyAppl.surveyId?if_exists}" class="buttontext">${workEffortSurveyAppl.surveyId?if_exists} - ${survey.surveyName?if_exists}</a></td> <td>${workEffortSurveyAppl.fromDate?if_exists}</td> <td> - <input type="text" size="20" name="thruDate" value="${(workEffortSurveyAppl.thruDate)?if_exists}" <#if isReadable?exists> readonly="readonly"</#if> /> - <a href="javascript:call_cal(document.editWorkEffortSurveyAppl_${workEffortSurveyAppl_index}.thruDate, '${nowTimeStampString}');"><img src="<@ofbizContentUrl>/images/cal.gif</@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" value="${(workEffortSurveyAppl.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=""/> </td> <td><a href="<@ofbizUrl>testWorkEffortSurvey?productStoreSurveyId=${productStoreSurveyAppl.productStoreSurveyId?if_exists}&workEffortId=${workEffortSurveyAppl.workEffortId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceTakeSurvey}</a></td> <#if !isReadable?exists> Modified: ofbiz/branches/jquery/themes/bizznesstime/webapp/bizznesstime/css/style.css URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/themes/bizznesstime/webapp/bizznesstime/css/style.css?rev=958236&r1=958235&r2=958236&view=diff ============================================================================== --- ofbiz/branches/jquery/themes/bizznesstime/webapp/bizznesstime/css/style.css (original) +++ ofbiz/branches/jquery/themes/bizznesstime/webapp/bizznesstime/css/style.css Sat Jun 26 15:30:32 2010 @@ -2040,6 +2040,16 @@ button.ui-button::-moz-focus-inner { bor .ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; } .ui-datepicker-row-break { clear:both; width:100%; } +/* Calendar Button and Image */ +.view-calendar button { +background: url(../images/cal.gif) no-repeat !important; +display: inline-block; +border: none; +margin-left:10px; +width:22px; +height:22px; +} + /* RTL support */ .ui-datepicker-rtl { direction: rtl; } .ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; } Added: ofbiz/branches/jquery/themes/bizznesstime/webapp/bizznesstime/images/cal.gif URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/themes/bizznesstime/webapp/bizznesstime/images/cal.gif?rev=958236&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/branches/jquery/themes/bizznesstime/webapp/bizznesstime/images/cal.gif ------------------------------------------------------------------------------ svn:mime-type = image/gif Added: ofbiz/branches/jquery/themes/bluelight/webapp/bluelight/images/cal.gif URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/themes/bluelight/webapp/bluelight/images/cal.gif?rev=958236&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/branches/jquery/themes/bluelight/webapp/bluelight/images/cal.gif ------------------------------------------------------------------------------ svn:mime-type = image/gif Modified: ofbiz/branches/jquery/themes/bluelight/webapp/bluelight/style.css URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/themes/bluelight/webapp/bluelight/style.css?rev=958236&r1=958235&r2=958236&view=diff ============================================================================== --- ofbiz/branches/jquery/themes/bluelight/webapp/bluelight/style.css (original) +++ ofbiz/branches/jquery/themes/bluelight/webapp/bluelight/style.css Sat Jun 26 15:30:32 2010 @@ -1914,155 +1914,6 @@ width:16px; height:16px; } -/* ================================= */ - /* ===== Calendar Date Select ====== */ - /* ================================= */ -.calendar_date_select { - color: #fff; - border: #777 1px solid; - display: block; - width: 200px; - z-index: 1000; -} - -/* this is a fun ie6 hack to get drop downs to stay behind the popup window. This should always be just underneath .calendar_date_select */ -iframe.ie6_blocker { - position: absolute; - z-index: 999; -} - -.calendar_date_select thead th { - font-weight: bold; - background-color: #4682B4; - border-top: 1px solid #777; - border-bottom: 2px solid #777; - color: white !important; -} - -.calendar_date_select .cds_buttons { - text-align: center; - padding: 5px 0px; - background-color: #4682B4; -} - -.calendar_date_select .cds_footer { - background-color: #4682B4; - padding: 3px; - font-size: 12px; - text-align: center; -} - -.calendar_date_select table { - margin: 0px; - padding: 0px; -} - -.calendar_date_select .cds_header { - background-color: #87CEEB; - border-bottom: 2px solid #87CEEB; - text-align: center; -} - -.calendar_date_select .cds_header span { - font-size: 15px; - color: #000; - font-weight: bold; -} - -.calendar_date_select select { - font-size: 11px; -} - -.calendar_date_select .cds_header a:hover { - color: #fff; -} - -.calendar_date_select .cds_header a { - width: 22px; - height: 20px; - text-decoration: none; - font-size: 14px; - color: #000 !important; - background: none; -} - -.calendar_date_select .cds_header a.prev { - float: left; -} - -.calendar_date_select .cds_header a.next { - float: right; -} - -.calendar_date_select .cds_header a.close { - float: right; - display: none; -} - -.calendar_date_select .cds_header select.month { - width: 90px; -} - -.calendar_date_select .cds_header select.year { - width: 61px; -} - -.calendar_date_select .cds_buttons a { - color: #fff; - font-size: 9px; - background: none; - display: inline !important; -} - -.calendar_date_select td { - font-size: 12px; - width: 24px; - height: 21px; - text-align: center; - vertical-align: middle; - background-color: #87CEEB; -} - -.calendar_date_select td.weekend { - background-color: #ADD8E6; -} - -.calendar_date_select td div { - color: #fff; -} - -.calendar_date_select td div.other { - color: #888; -} - -.calendar_date_select td.selected div { - color: #000; -} - -.calendar_date_select tbody td { - border-bottom: 1px solid #FFD700; -} - -.calendar_date_select td.selected { - background-color: #fff; -} - -.calendar_date_select td:hover { - background-color: #00BFFF; -} - -.calendar_date_select td.today { - border: 1px dashed #FFFF00; -} - -.calendar_date_select td.disabled div { - color: #454545; -} - -.fieldWithErrors .calendar_date_select { - border: 2px solid #FF0000; -} - /* ============================= */ /* ===== FieldGroup Styles ===== */ /* ============================= */ @@ -2745,6 +2596,17 @@ button.ui-button::-moz-focus-inner { bor .ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; } .ui-datepicker-row-break { clear:both; width:100%; } +/* Calendar Button and Image */ +.view-calendar button { + background: url(../images/cal.gif) no-repeat !important; + display: inline-block; + border: none; + vertical-align:top; + margin-top:3px; + width:22px; + height:22px; +} + /* RTL support */ .ui-datepicker-rtl { direction: rtl; } .ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; } Modified: ofbiz/branches/jquery/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css?rev=958236&r1=958235&r2=958236&view=diff ============================================================================== --- ofbiz/branches/jquery/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css (original) +++ ofbiz/branches/jquery/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css Sat Jun 26 15:30:32 2010 @@ -1899,154 +1899,6 @@ padding-left:10px; color:#FFFFFF; } -/* ================================= */ -/* ===== Calendar Date Select ====== */ -/* ================================= */ -.calendar_date_select { -color: #fff; -border: #777 1px solid; -display: block; -width: 200px; -z-index: 1000; -} - -/* this is a fun ie6 hack to get drop downs to stay behind the popup window. This should always be just underneath .calendar_date_select */ -iframe.ie6_blocker { -position: absolute; -z-index: 999; -} - -.calendar_date_select thead th { -font-weight: bold; -background-color: #4682B4; -border-top: 1px solid #777; -border-bottom: 2px solid #777; -color: white !important; -} - -.calendar_date_select .cds_buttons { -text-align: center; -padding: 5px 0px; -background-color: #4682B4; -} - -.calendar_date_select .cds_footer { -background-color: #4682B4; -padding: 3px; -font-size: 12px; -text-align: center; -} - -.calendar_date_select table { -margin: 0px; -padding: 0px; -} - -.calendar_date_select .cds_header { -background-color: #87CEEB; -border-bottom: 2px solid #87CEEB; -text-align: center; -} - -.calendar_date_select .cds_header span { -font-size: 15px; -color: #000; -font-weight: bold; -} - -.calendar_date_select select { -font-size: 11px; -} - -.calendar_date_select .cds_header a:hover { -color: #fff; -} - -.calendar_date_select .cds_header a { -width: 22px; -height: 20px; -text-decoration: none; -font-size: 14px; -color: #000 !important; -background: none !important; -} - -.calendar_date_select .cds_header a.prev { -float: left; -} - -.calendar_date_select .cds_header a.next { -float: right; -} - -.calendar_date_select .cds_header a.close { -float: right; -display: none; -} - -.calendar_date_select .cds_header select.month { -width: 90px; -} - -.calendar_date_select .cds_header select.year { -width: 61px; -} - -.calendar_date_select .cds_buttons a { -color: #fff; -font-size: 9px; -background: none !important; -display: inline !important; -} - -.calendar_date_select td { -font-size: 12px; -width: 24px; -height: 21px; -text-align: center; -vertical-align: middle; -background-color: #87CEEB; -} - -.calendar_date_select td.weekend { -background-color: #ADD8E6; -} - -.calendar_date_select td div { -color: #fff; -} - -.calendar_date_select td div.other { -color: #888; -} - -.calendar_date_select td.selected div { -color: #000; -} - -.calendar_date_select tbody td { -border-bottom: 1px solid #FFD700; -} - -.calendar_date_select td.selected { -background-color: #fff; -} - -.calendar_date_select td:hover { -background-color: #00BFFF; -} - -.calendar_date_select td.today { -border: 1px dashed #FFFF00; -} - -.calendar_date_select td.disabled div { -color: #454545; -} - -.fieldWithErrors .calendar_date_select { -border: 2px solid #FF0000; -} /* ============================= */ /* ===== FieldGroup Styles ===== */ @@ -2723,6 +2575,17 @@ button.ui-button::-moz-focus-inner { bor .ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; } .ui-datepicker-row-break { clear:both; width:100%; } +/* Calendar Button and Image */ +.view-calendar button { + background: url(../images/cal.gif) no-repeat !important; + display: inline-block; + border: none; + vertical-align:top; + margin-top:3px; + width:22px; + height:22px; +} + /* RTL support */ .ui-datepicker-rtl { direction: rtl; } .ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; } Added: ofbiz/branches/jquery/themes/droppingcrumbs/webapp/droppingcrumbs/images/cal.gif URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/themes/droppingcrumbs/webapp/droppingcrumbs/images/cal.gif?rev=958236&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/branches/jquery/themes/droppingcrumbs/webapp/droppingcrumbs/images/cal.gif ------------------------------------------------------------------------------ svn:mime-type = image/gif Added: ofbiz/branches/jquery/themes/flatgrey/webapp/flatgrey/images/cal.gif URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/themes/flatgrey/webapp/flatgrey/images/cal.gif?rev=958236&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/branches/jquery/themes/flatgrey/webapp/flatgrey/images/cal.gif ------------------------------------------------------------------------------ svn:mime-type = image/gif Modified: ofbiz/branches/jquery/themes/flatgrey/webapp/flatgrey/maincss.css URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/themes/flatgrey/webapp/flatgrey/maincss.css?rev=958236&r1=958235&r2=958236&view=diff ============================================================================== --- ofbiz/branches/jquery/themes/flatgrey/webapp/flatgrey/maincss.css (original) +++ ofbiz/branches/jquery/themes/flatgrey/webapp/flatgrey/maincss.css Sat Jun 26 15:30:32 2010 @@ -1952,149 +1952,6 @@ width:16px; height:16px; } -/* ================================= */ -/* ===== Calendar Date Select ====== */ -/* ================================= */ - -.calendar_date_select { - color: #fff; - border: #777 1px solid; - display: block; - width: 200px; - z-index: 1000; -} -/* this is a fun ie6 hack to get drop downs to stay behind the popup window. This should always be just underneath .calendar_date_select */ -iframe.ie6_blocker { - position: absolute; - z-index: 999; -} - -.calendar_date_select thead th { - font-weight:bold; - background-color: #4682B4; - border-top:1px solid #777; - border-bottom:2px solid #777; - color: white !important; -} - -.calendar_date_select .cds_buttons { - text-align:center; - padding:5px 0px; - background-color: #4682B4; -} - -.calendar_date_select .cds_footer { - background-color: #4682B4; - padding:3px; - font-size:12px; - text-align:center; -} - -.calendar_date_select table { - margin: 0px; - padding: 0px; -} - -.calendar_date_select .cds_header { - background-color: #87CEEB; - border-bottom: 2px solid #87CEEB; - text-align:center; -} - -.calendar_date_select .cds_header span { - font-size:15px; - color: #000; - font-weight: bold; -} - -.calendar_date_select select { font-size:11px;} - -.calendar_date_select .cds_header a:hover { - color: #fff; -} -.calendar_date_select .cds_header a { - width:22px; - height:20px; - text-decoration: none; - font-size:14px; - color: #000 !important; - background: none !important; -} - -.calendar_date_select .cds_header a.prev { - float:left; -} -.calendar_date_select .cds_header a.next { - float:right; -} -.calendar_date_select .cds_header a.close { - float:right; - display:none; -} - -.calendar_date_select .cds_buttons a { - background: none !important; -} - -.calendar_date_select .cds_header select.month { - width:90px; -} - -.calendar_date_select .cds_header select.year { - width:61px; -} - -.calendar_date_select .cds_buttons a { - color: #fff; - font-size: 9px; - background: none; - display: inline !important; -} -.calendar_date_select td { - font-size:12px; - width: 24px; - height: 21px; - text-align:center; - vertical-align: middle; - background-color: #87CEEB; -} -.calendar_date_select td.weekend { - background-color: #ADD8E6; -} - -.calendar_date_select td div { - color: #fff; -} -.calendar_date_select td div.other { - color: #888; -} -.calendar_date_select td.selected div { - color: #000; -} - -.calendar_date_select tbody td { - border-bottom: 1px solid #FFD700; -} -.calendar_date_select td.selected { - background-color: #fff; -} - -.calendar_date_select td:hover { - background-color:#00BFFF; -} - -.calendar_date_select td.today { - border: 1px dashed #FFFF00; -} - -.calendar_date_select td.disabled div { - color: #454545; -} - - -.fieldWithErrors .calendar_date_select { - border: 2px solid #FF0000; -} /* ============================= */ /* ===== FieldGroup Styles ===== */ Added: ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/cal.gif URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/cal.gif?rev=958236&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/cal.gif ------------------------------------------------------------------------------ svn:mime-type = image/gif Added: ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-anim_basic_16x16.gif URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-anim_basic_16x16.gif?rev=958236&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-anim_basic_16x16.gif ------------------------------------------------------------------------------ svn:mime-type = image/gif Added: ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-bg_diagonals-thick_18_b81900_40x40.png URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-bg_diagonals-thick_18_b81900_40x40.png?rev=958236&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-bg_diagonals-thick_18_b81900_40x40.png ------------------------------------------------------------------------------ svn:mime-type = image/png Added: ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-bg_diagonals-thick_20_666666_40x40.png URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-bg_diagonals-thick_20_666666_40x40.png?rev=958236&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-bg_diagonals-thick_20_666666_40x40.png ------------------------------------------------------------------------------ svn:mime-type = image/png Added: ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-bg_flat_10_000000_40x100.png URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-bg_flat_10_000000_40x100.png?rev=958236&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-bg_flat_10_000000_40x100.png ------------------------------------------------------------------------------ svn:mime-type = image/png Added: ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-bg_glass_100_f6f6f6_1x400.png URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-bg_glass_100_f6f6f6_1x400.png?rev=958236&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-bg_glass_100_f6f6f6_1x400.png ------------------------------------------------------------------------------ svn:mime-type = image/png Added: ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-bg_glass_100_fdf5ce_1x400.png URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-bg_glass_100_fdf5ce_1x400.png?rev=958236&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-bg_glass_100_fdf5ce_1x400.png ------------------------------------------------------------------------------ svn:mime-type = image/png Added: ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-bg_glass_65_ffffff_1x400.png URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-bg_glass_65_ffffff_1x400.png?rev=958236&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-bg_glass_65_ffffff_1x400.png ------------------------------------------------------------------------------ svn:mime-type = image/png Added: ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-bg_gloss-wave_35_f6a828_500x100.png URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-bg_gloss-wave_35_f6a828_500x100.png?rev=958236&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-bg_gloss-wave_35_f6a828_500x100.png ------------------------------------------------------------------------------ svn:mime-type = image/png Added: ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-bg_highlight-soft_100_eeeeee_1x100.png URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-bg_highlight-soft_100_eeeeee_1x100.png?rev=958236&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-bg_highlight-soft_100_eeeeee_1x100.png ------------------------------------------------------------------------------ svn:mime-type = image/png Added: ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-bg_highlight-soft_75_ffe45c_1x100.png URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-bg_highlight-soft_75_ffe45c_1x100.png?rev=958236&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/images/ui-bg_highlight-soft_75_ffe45c_1x100.png ------------------------------------------------------------------------------ svn:mime-type = image/png |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |